Commit Graph

615 Commits

Author SHA1 Message Date
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 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
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
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 3642163fd7 [refs #265] changed feed messages 2012-03-14 23:00:26 +06:00
Alexander Machehin 20079d4fc5 [refs #265] changed comments feed 2012-03-14 20:40:41 +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
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
Alexander Machehin 5b932879e2 [refs #265] fixed subscribe dublicates 2012-03-13 19:56:58 +06:00
Pavel Chipiga 51e2584995 Fix abilities for invites. Refs #174 2012-03-12 23:24:05 +02: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
Alexander Machehin 24639b8684 [refs 257] renamed to profile 2012-03-12 21:03:25 +06:00
Pavel Chipiga bb7cff5de8 Fix abilities - allow users search build_lists. Refs #223 2012-03-12 13:46:57 +02:00
George Vinogradov 535c075d3e [issue #279] Added platform main page, menu & sidebar 2012-03-12 03:08:50 +04:00
Pavel Chipiga a78b7b4155 Merge branch 'master' into 3.2-master 2012-03-11 23:39:11 +02:00
Alexander Machehin 6d5120e5cc Merge branch '3.2-master' into 265-new_design_for_activity_feed 2012-03-11 22:44:25 +06:00
Pavel Chipiga 1cf2660cda Fix search order. Refs #255 2012-03-08 02:32:12 +02:00
Pavel Chipiga 41ae79eb46 Add configurable arch parameter to project build_for method. Write rake task for projects build. Refs #282 2012-03-08 01:25:17 +02:00
Pavel Chipiga 41cd1ddaf3 Redo cusel assign to avoid side effects. Refactor and cleanup projects controller, routes, views. Apply new design and functionality for projcts list page. Add fork button and fix fork. Apply gap repo during repo fork. Apply attr_accessible for projects. Cleanup locales. Fix new_build link ability check. Refs #195 2012-03-07 23:34:49 +02:00
Alexander Machehin c657efc338 [refs #194] show all project labels without searching 2012-03-07 19:36:17 +06:00
Alexander Machehin 7588a318da Merge branch '3.2-master' into 265-new_design_for_activity_feed
Conflicts:
	app/models/user.rb
2012-03-07 03:58:35 +06:00
Alexander Machehin 13ba125dc0 [refs #265] add project_id to comment & fix email notification 2012-03-07 03:49:29 +06:00
Alexander Machehin 0f823bd9f3 [refs #265] fix security & commit to comments 2012-03-07 02:51:51 +06:00
Alexander Machehin 4b9d0616d6 Merge branch '3.2-master' into 194-issue_page
Conflicts:
	app/views/issues/_create_sidebar.html.haml
2012-03-07 01:19:34 +06:00
Pavel Chipiga 7308c4a0d2 Merge branch '3.2-master' into 255-search
Refactor avatars. Fix user bugs. Remove ssh_key delete migration

Conflicts:
	app/assets/stylesheets/design/custom.scss
	app/models/user.rb
2012-03-06 20:59:29 +02:00
Alexander Machehin 872132d8a6 [refs #265] fix find owner and project 2012-03-07 00:20:14 +06:00
Alexander Machehin 8ae7ebee2b Merge branch '3.2-master' into 194-issue_page 2012-03-06 22:51:13 +06:00
Pavel Chipiga d6f9b2c3e9 Minor gems update. Apply search design and controller. Add and refactor search scopes. Fix relations. Separate and refactor search translations. Refactor search form. Refs #255 2012-03-06 17:53:04 +02:00
Alexander Machehin b9de81f4df [refs #194] managing labels in the issue 2012-03-06 21:21:13 +06:00
konstantin.grabar 7e53a6c511 [refs #265] Fix git push and delete branch partials and logic 2012-03-06 18:57:05 +04:00