Commit Graph

354 Commits

Author SHA1 Message Date
George Vinogradov a8b457a173 [issue #279] Fixed translation typo 2012-03-20 20:46:50 +04:00
George Vinogradov 7c0585ee87 [issue #279] Added members and other changes. 2012-03-20 20:24:18 +04:00
George Vinogradov 155a46cce9 [issue #279] Fixed some bugs in connection info. 2012-03-19 19:56:40 +04:00
George Vinogradov ddc95c25fb [issue #279] Merge branch '3.2-master' into 279-new_design_for_platforms
Conflicts:
	app/assets/stylesheets/design/custom.scss
2012-03-19 18:56:04 +04:00
George Vinogradov 1cbc3f5b7a [issue #279] Added block of connection data for personal platform. 2012-03-19 18:46:12 +04:00
Vladimir Sharshov abe06b5068 Merge pull request #305 from warpc/223-monitoring_design
[Refs #223] monitoring design for current task
2012-03-19 03:28:30 -07:00
Alexander Machehin 296acd80da [refs #265] added build waiting message 2012-03-19 15:07:09 +06:00
konstantin.grabar b3d7091db0 Merge 3.2-master into 223-monitoring_design 2012-03-19 10:41:30 +04:00
konstantin.grabar 4b26eebeca [refs #223] Add new design to build list task page 2012-03-18 12:20:31 +04: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 dd5f51de71 [refs #265] added build tasks feed 2012-03-16 21:37:58 +06:00
George Vinogradov 3d9f9b5c73 [issue #279] Fixed permissions and moved some buttons.
Removed Freeze/Unfreeze actions from Platform.
2012-03-16 17:25:34 +04: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
Alexander Machehin dce26c79e0 [refs #265] fixed en locale 2012-03-16 00:25:05 +06:00
Alexander Machehin 4addff059b [refs #265] added activity feed tabs 2012-03-15 23:52:54 +06: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
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 3642163fd7 [refs #265] changed feed messages 2012-03-14 23:00:26 +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
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 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
Alexander Machehin a800b4364d [refs #257] fixed translation 2012-03-12 18:52:32 +06:00
Alexander Machehin 5f6ca140d9 [refs #257] add ability to destroy avatar 2012-03-12 18:51:07 +06:00
Vladimir Sharshov 04622790fc Merge pull request #289 from warpc/265-new_design_for_activity_feed
[refs #265] Work today builds statistics
2012-03-12 02:15:26 -07:00
Alexander Machehin ecfb4f81a0 [refs #265] fixed today builds 2012-03-12 14:52:38 +06:00
George Vinogradov 535c075d3e [issue #279] Added platform main page, menu & sidebar 2012-03-12 03:08:50 +04:00
Vladimir Sharshov 6f56a7787d Merge pull request #267 from warpc/265-new_design_for_activity_feed
[Refs #265] Add first version of new design to activity feed
2012-03-11 10:33:47 -07:00
Alexander Machehin 35d1323549 [refs #265] fixed message format 2012-03-11 23:30:14 +06:00
Vladimir Sharshov d86653e172 Split code and tracker options in notification center 2012-03-11 21:21:31 +04:00
Alexander Machehin 6d5120e5cc Merge branch '3.2-master' into 265-new_design_for_activity_feed 2012-03-11 22:44:25 +06:00
Vladimir Sharshov 11434ff423 [Refs #285] Fix css style, rename button 2012-03-11 20:38:28 +04: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 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 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 8ae7ebee2b Merge branch '3.2-master' into 194-issue_page 2012-03-06 22:51:13 +06:00
konstantin.grabar 9565d58e8f [refs #257] Merge 3.2-master into 257-new_design_for_profiles 2012-03-06 20:13:53 +04: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
konstantin.grabar f54d889f74 [refs #265] Fix activity partials messages and locales. Fix observer. 2012-03-06 18:04:05 +04:00
konstantin.grabar de6490346b [refs #257] Change error messages logic. Fix avatar ru translation 2012-03-06 15:24:42 +04:00
Alexander Machehin 9e6d06f1c9 [refs #194] manage issue executer 2012-03-06 00:28:55 +06:00
konstantin.grabar 637edabb4c [refs #257] Fix some locales and headers 2012-03-05 22:00:44 +04:00
Vladimir Sharshov 9d8eb8a3f2 Merge pull request #269 from warpc/195-new_design_for_projects
[Refs #195] Add blane functions. Fixed syntax highlighting. Stub for rpm-specs.
2012-03-05 09:07:36 -08:00
George Vinogradov 8845ec17ff [issue #195] Added translations. 2012-03-05 20:31:09 +04:00
konstantin.grabar 73296059eb [refs #257] Merge 3.2-master into 257-new_design_for_profiles 2012-03-05 13:42:39 +04:00
konstantin.grabar c176304088 Add first version of new design to activity feed. Add new scope to BuildList model. Fix one moment into observer. 2012-03-05 13:11:50 +04:00