Commit Graph

1222 Commits

Author SHA1 Message Date
Alexander Machehin 5e08b89f6a [refs #265] shoter commit hash in message 2012-03-19 15:23:59 +06:00
Alexander Machehin 296acd80da [refs #265] added build waiting message 2012-03-19 15:07:09 +06:00
Alexander Machehin 86871ab32d Merge branch '3.2-master' into 265-activity_feed_messages
Conflicts:
	config/locales/menu.en.yml
	config/locales/menu.ru.yml
2012-03-17 01:09:04 +06:00
Alexander Machehin fb89eedca3 [refs #265] forgot build list setup 2012-03-17 00:58:41 +06:00
Alexander Machehin 22d7f8d975 [refs #265] shit 2012-03-17 00:55:03 +06:00
Alexander Machehin dd5f51de71 [refs #265] added build tasks feed 2012-03-16 21:37:58 +06:00
Vladimir Sharshov 42eb250942 Merge pull request #302 from warpc/279-new_design_for_platforms
[issue #279] Fixed some bugs:
  *  Redirect to repositroies page when remove repository.
  *  Fixed sorting background in Datatables styles.
  *  Fixed save button translation in platforms form.
  *  Fixed platform save & create flashes.
  *  Fixed cancel buttons in platform, product & repository forms.
  *  Redirect to created product on creation.
  *  Redirect to platform's products page after product destruction.
  *  Fixed permissions to Build button on product page.
  *  Fixed permissions to Add button on repository page.
  *  Fixed forbidden redirect when trying to acces
  *  RepositoriesController#projects_list by unprivilleged user.
2012-03-15 16:15:58 -07:00
George Vinogradov cc68163238 [issue #279] Fixed some bugs:
*  Redirect to repositroies page when remove repository.
  *  Fixed sorting background in Datatables styles.
  *  Fixed save button translation in platforms form.
  *  Fixed platform save & create flashes.
  *  Fixed cancel buttons in platform, product & repository forms.
  *  Redirect to created product on creation.
  *  Redirect to platform's products page after product destruction.
  *  Fixed permissions to Build button on product page.
  *  Fixed permissions to Add button on repository page.
  *  Fixed forbidden redirect when trying to acces
     RepositoriesController#projects_list by unprivilleged user.
2012-03-16 02:56:12 +04:00
Vladimir Sharshov e719633862 Merge pull request #300 from warpc/279-new_design_for_platforms
[Refs #279] new design for platforms (bugfixes, ACL and filters)
2012-03-15 14:50:37 -07:00
George Vinogradov 9911d9f25e [issue #279] Removed can_clone? and can_build? from Product 2012-03-16 01:10:24 +04:00
Alexander Machehin 3719b40889 [refs #265] removed unused code 2012-03-16 00:22:56 +06:00
Alexander Machehin 4addff059b [refs #265] added activity feed tabs 2012-03-15 23:52:54 +06:00
Vladimir Sharshov 09dcb43da8 Merge pull request #301 from warpc/265-activity_feed_messages
[refs #265] Fixed check rails env
2012-03-15 07:08:23 -07:00
Vladimir Sharshov 7bab315b96 [Refs #279] Fix url and submit button size 2012-03-15 18:02:10 +04:00
George Vinogradov 548550d355 [issue #279] Added filtering to repositories projects. 2012-03-15 17:53:36 +04:00
Alexander Machehin e7ac387466 [refs #265] fixed check rails env 2012-03-15 18:10:10 +06:00
George Vinogradov 76af82805d [issue #279] Fixes.
*  Fixed permissions.
  *  Added pagination in repository view.
2012-03-15 04:07:53 +04:00
George Vinogradov 3c60347a23 [issue #279] Fixes.
*  Almost finished permissions fixes
  *  Removed is_template from product
  *  Some fixes in crontab_generator partial
2012-03-15 03:34:09 +04:00
Vladimir Sharshov 8acb512a2e Merge pull request #299 from warpc/279-new_design_for_platforms
[Refs #279] new design for platforms
2012-03-14 13:22:10 -07:00
Vladimir Sharshov 3761f0a7ff Merge pull request #297 from warpc/194-issue_page
[refs #194] Fix ACL issue executor bug
2012-03-14 12:07:22 -07:00
Alexander Machehin bce8618c30 [refs #194] removed reduntant check 2012-03-15 00:51:22 +06:00
George Vinogradov 747edb73a5 [issue #279] Merge branch '3.2-master' into 279-new_design_for_platforms
Conflicts:
	db/schema.rb
2012-03-14 21:43:08 +04:00
Vladimir Sharshov 79e56eec52 Merge pull request #298 from warpc/265-activity_feed_messages
[Refs #265] Restyle comments and issues feeds messages, refactoring, fix bugs
2012-03-14 10:29:10 -07:00
Alexander Machehin e30cc70728 [refs #265] some refactoring 2012-03-14 23:23:55 +06:00
George Vinogradov 5a77b17a43 [issue #279] Almost finished design for platforms
TODO:
  *  Add design for crontab generator
  *  Fix path generation
2012-03-14 21:22:47 +04:00
Alexander Machehin 51e4cafe4c Revert "[refs #194] fixed executor bug"
This reverts commit 9f5176fb9990e61e3ca7a14fe0a5346f042d36d6.
2012-03-14 23:18:37 +06:00
Alexander Machehin 6359acd917 [refs #194] fixed executor bug 2012-03-14 23:01:23 +06:00
Alexander Machehin 3642163fd7 [refs #265] changed feed messages 2012-03-14 23:00:26 +06:00
Alexander Machehin f11fc179d3 [refs #194] fixed executor bug 2012-03-14 22:05:08 +06:00
Alexander Machehin 20079d4fc5 [refs #265] changed comments feed 2012-03-14 20:40:41 +06:00
Alexander Machehin ffc1c6d0b7 [refs #265] fixed new issue feed 2012-03-14 20:33:51 +06:00
Alexander Machehin d9c3f9ddc8 [refs #265] fixed comment to commit feed 2012-03-14 20:33:16 +06:00
Vladimir Sharshov 9c429e893e Merge pull request #294 from warpc/265-activity_feed_messages
[refs #265] changed activity feed messages; fixed avatar sizes; fixed message for deleted branch
2012-03-14 05:20:48 -07:00
Vladimir Sharshov dc6e380647 Merge pull request #296 from warpc/194-issue_page
[refs #194] fixed remove executor from issue
2012-03-14 04:18:29 -07:00
Alexander Machehin 4b8e9682b5 [refs #194] some refactor 2012-03-14 16:53:23 +06:00
Alexander Machehin 5ffd976086 [refs #194] fixed remove executor from issue 2012-03-14 16:39:59 +06:00
Alexander Machehin 1ff3cf5662 [refs #265] fixed message for deleted branch 2012-03-14 15:38:22 +06:00
Vladimir Sharshov 9f9eb23e43 Merge pull request #293 from warpc/265-new_design_for_activity_feed
[Refs #265] Fix subscribe dublicates
2012-03-13 13:48:32 -07:00
Alexander Machehin b93032e226 [refs #265] fixed avatar sizes 2012-03-14 00:53:37 +06:00
Alexander Machehin ba437f7703 [refs #265] changed activity feed messages 2012-03-14 00:47:37 +06:00
George Vinogradov 304141b1ba [issue #279] Added views and removed datatables plugin
*  Datatables plugin moved to lib.
  *  Added views to platform and repositories.
2012-03-13 19:12:06 +04:00
George Vinogradov 952c9e46ea [issue #279] Added datatables pagination extension 2012-03-13 18:36:42 +04:00
Alexander Machehin 5b932879e2 [refs #265] fixed subscribe dublicates 2012-03-13 19:56:58 +06:00
Vladimir Sharshov 2153f66ab1 Merge branch '3.2-master' of github.com:warpc/rosa-build into 3.2-master 2012-03-13 15:05:09 +04:00
Vladimir Sharshov b07d81644a [Refs #223] Monitoring colors code in index page 2012-03-13 15:04:29 +04:00
Pavel Chipiga 51e2584995 Fix abilities for invites. Refs #174 2012-03-12 23:24:05 +02:00
Vladimir Sharshov 61b8c70f4b [Refs #257] Fix edit profile labels 2012-03-12 22:13:10 +04:00
Alexander Machehin f6dd072a24 Merge branch '3.2-master' into 257-new_design_for_profiles
Conflicts:
	config/locales/users.en.yml
	config/locales/users.ru.yml
2012-03-12 23:04:31 +06:00
Alexander Machehin 843d95b64e [refs #257] fixed 'big' geometry 2012-03-12 23:02:02 +06:00
Alexander Machehin 4fd91e2bfe [refs #257] force convert avatar to jpg 2012-03-12 22:28:56 +06:00