Commit Graph

669 Commits

Author SHA1 Message Date
Vladimir Sharshov f8edecc915 Merge branch 'master' of github.com:warpc/rosa-build 2012-05-28 23:28:09 +04:00
konstantin.grabar 5e9f348074 [ref #442] Add id column 2012-05-28 23:18:50 +04:00
Vladimir Sharshov 3fbd2ae79e Merge branch 'master' of github.com:warpc/rosa-build 2012-05-28 13:05:31 +04:00
Vladimir Sharshov 3ed195bb86 Merge pull request #502 from warpc/442-mass_build
[refs #442] Mass build refactor and fixes
2012-05-28 02:00:30 -07:00
Vladimir Sharshov 0f1c92cac2 Fix translation for build status 2012-05-26 00:22:23 +04:00
konstantin.grabar df82cf69ca [refs #442] Refactor mass_build 2012-05-25 21:31:57 +04:00
konstantin.grabar a79d946b6b [refs #442] Mass build refactor and fixes 2012-05-25 19:56:26 +04:00
Alexander Machehin df610931d7 [refs #90] commits tab 2012-05-25 16:48:44 +06:00
Alexander Machehin 4f1d23a2a4 [refs #90] branch, merge validation 2012-05-24 23:10:49 +06:00
Vladimir Sharshov 0d3e06b5d9 Merge pull request #499 from warpc/478-project_build_failed
[refs #478] Add js handler to disable frozen platforms and their reps
2012-05-24 03:39:55 -07:00
konstantin.grabar 3d2bcdd019 [refs #478] Add js handler to disable frozen platforms and their reps 2012-05-24 14:21:57 +04:00
konstantin.grabar 45ff187875 [refs #442] Remove button. Add tab. Fix locales. Fix schema 2012-05-23 20:44:04 +04:00
Alexander Machehin e211fa2fc3 [refs #90] fixed errors, add validations & tests 2012-05-23 22:09:11 +06:00
konstantin.grabar a83927c812 [refs #442] Fix mass_build_id locales 2012-05-23 18:19:04 +04:00
konstantin.grabar c74de8b84d [refs #442] Add new page for mass rebuild, new fields and new functional 2012-05-23 18:08:11 +04:00
Alexander Machehin 0c89ca6575 [refs #90] broken tests 2012-05-23 00:23:00 +06:00
konstantin.grabar 7c45263799 [refs #442] Add mass build select to monitoring. Remove build lists from build_all action 2012-05-22 17:40:27 +04:00
konstantin.grabar 9aefce6b68 [refs #442] Merge master into 442-mass_build 2012-05-21 18:33:12 +04:00
Alexander Machehin d643bb3cd0 [refs #90] try to prevent create same pull 2012-05-21 19:24:16 +06:00
Alexander Machehin 6b6887250b Merge branch 'master' into 90-pull
Conflicts:
	db/schema.rb
2012-05-21 17:31:49 +06:00
Alexander Machehin 1bcab2f7db [refs #443] remove old file, fixed ru translation 2012-05-21 16:46:08 +06:00
konstantin.grabar be2ab9154c [refs #442] Fix checkboxes styles. Return delay for build all. Add mass build select and more fixes 2012-05-21 14:18:29 +04:00
Vladimir Sharshov 5133fe6bc3 Merge pull request #487 from warpc/443-tour
[refs #443] invite localization
2012-05-18 11:10:15 -07:00
Alexander Machehin aad7a3a547 [refs #443] invite localization 2012-05-18 22:54:57 +06:00
konstantin.grabar cd3564bb81 [refs #442] Add mass build model and new build_all fixes 2012-05-18 19:12:51 +04:00
Vladimir Sharshov a804f3ef2c [refs #461] Correct translation for is_package option 2012-05-18 00:40:30 +04:00
Alexander Machehin fcffff4178 Merge branch 'master' into 90-pull
Conflicts:
	app/assets/stylesheets/design/custom.scss
	config/locales/title.en.yml
	config/locales/title.ru.yml
	config/routes.rb
	db/schema.rb
2012-05-17 22:58:29 +06:00
Alexander Machehin 74aee232f9 [refs #90] some fixes and merge button 2012-05-17 22:49:29 +06:00
konstantin.grabar 3e57359c96 [refs #442] Add mass build page functional 2012-05-17 19:20:03 +04:00
konstantin.grabar ec9c19352e [refs #461] Merge master into to 461-rename_is_rpm_to_is_package. Again 2012-05-17 12:00:21 +04:00
Vladimir Sharshov 2892689807 Merge pull request #469 from warpc/443-tour
[refs #466] Add localization for system tour. Fix for auto detecting users language.
2012-05-16 05:19:59 -07:00
konstantin.grabar 9d871af7ef Merge master into 461-rename_is_rpm_to_is_package 2012-05-16 14:40:10 +04:00
konstantin.grabar 1385133ed5 [refs #461] Merge master into 461-rename_is_rpm_to_is_package 2012-05-16 14:37:35 +04:00
konstantin.grabar 79a9b3d107 [refs #461] Fix is_package locale. Fix schema.rb and rename migration 2012-05-16 14:33:14 +04:00
konstantin.grabar 5ad43c684e Merge master into 429-uname_format_error_explain 2012-05-16 14:01:41 +04:00
Alexander Machehin 05746ea449 [refs #466] add i18n 2012-05-15 21:35:48 +06:00
konstantin.grabar e807e5f3ec [refs #429] Add format explain error message for uname 2012-05-15 15:11:18 +04:00
Vladimir Sharshov 56ad094b00 Merge pull request #463 from warpc/444-bl_package
[refs #444] Apply basic build list packages store functionality;
* Display build list package content;
* Write specs.
2012-05-14 13:12:37 -07:00
Pavel Chipiga 8470674c62 Apply basic build list packages store functionality. Display build list package content. Write specs. Refactor. Refs #444 2012-05-14 22:08:31 +03:00
Alexander Machehin aa38017daa [refs #340] restore page titles 2012-05-14 23:24:09 +06:00
Pavel Chipiga 52f5e01575 Fix build list controller bugs. Fix JS which controls checkboxes. Fix translations. Fix and refactor views. Refs #428 2012-05-06 00:43:04 +03:00
George Vinogradov 05ef799fa4 [issue #428] Added advisories list. Added translations. 2012-05-05 21:18:29 +04:00
Alexander Machehin 813afe53cf [refs #90] minor interface changes 2012-05-04 23:13:41 +06:00
Alexander Machehin c5731ff8dd [refs #90] fixed merging errors 2012-05-04 16:56:11 +06:00
Alexander Machehin 36b4ce2d99 Merge branch 'master' into 90-pull
Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/projects/issues_controller.rb
	app/models/project.rb
	config/locales/menu.en.yml
	config/routes.rb
	db/schema.rb
2012-05-03 23:19:43 +06:00
Pavel Chipiga 2539ef4795 Great controllers and routes refactor - separate them to namespaces. Add user/group routes in github style, refactor. Implement templates inheritance. Refactor and cleanup views. Fix specs. Other minor fixes. Refs #263 2012-05-02 12:18:07 +03:00
Alexander Machehin 4ad39b05c0 [refs #90] model PullRequest, tests 2012-04-28 23:30:54 +06:00
Alexander Machehin a8ccf454ee [refs #90] first steps of pull rendering 2012-04-23 23:34:11 +06:00
Alexander Machehin 628fed40ea [refs #90] issue status -> state 2012-04-23 23:34:11 +06:00
George Vinogradov 510b0c0c50 [issue #347] Merge branch 'master' into 347-javascript_refactoring
Conflicts:
	app/assets/stylesheets/design/custom.scss
	app/models/group.rb
	app/models/user.rb
2012-04-19 19:32:11 +04:00
Vladimir Sharshov 5b5aec490a Merge pull request #409 from warpc/396-rss_atom_feed
[refs #396] Add atom feed for activity feed
2012-04-19 07:08:59 -07:00
konstantin.grabar def76d134d [refs #396] Fix some atom locales 2012-04-19 15:05:17 +04:00
konstantin.grabar 2fc4e2db61 [refs #396] Fix token migration. Fix atom link tag title 2012-04-19 14:50:43 +04:00
George Vinogradov 721fa1b0c0 [issue #408] Fixed translations 2012-04-18 14:59:41 +04:00
George Vinogradov 6c64125787 [issue #408] Changed behavior of build list for released platform 2012-04-17 22:18:39 +04:00
konstantin.grabar 8d723ee0be [refs #396] Fix title truncate and strip. Add feed main title. 2012-04-17 19:38:02 +04:00
George Vinogradov 8204196275 [issue #347] Removed comments. Added filter field to collaborators
table.
2012-04-17 17:39:14 +04:00
konstantin.grabar 2c9d4583e8 [refs #404] Remove downloads from menu 2012-04-17 13:17:52 +04:00
Alexander Machehin 2dedbd92d0 [refs #194] assignee & user 2012-04-14 01:44:04 +06:00
Vladimir Sharshov 100a166699 [Refs #223] Refactoring for pull request 2012-04-13 17:24:43 +04:00
Vladimir Sharshov 8ffc6be347 Merge branch '223-change_build_lists_new_js_handlers' into 223-build_list_notify_and_duration_updates
Conflicts:
	app/models/build_list.rb
	config/locales/models/build_list.en.yml
	config/locales/models/build_list.ru.yml
2012-04-13 17:21:30 +04:00
Vladimir Sharshov 36447051ec [Refs #223] Small refactoring for pull request 2012-04-13 13:48:57 +04:00
konstantin.grabar 65f1cfc822 [refs #223] Add current duration and project average build time 2012-04-12 18:55:32 +04:00
konstantin.grabar 26a468f6e3 [refs #223] Replace notified_at by updated_at 2012-04-12 16:12:06 +04:00
konstantin.grabar 742603ab7e [refs #223] Add build list duration 2012-04-12 14:29:04 +04:00
konstantin.grabar 18bda07369 Merge master into 223-change_build_lists_new_js_handlers 2012-04-10 18:00:48 +04:00
konstantin.grabar c619aa44b7 [refs #223] Fix build list status 2012-04-10 17:11:36 +04:00
konstantin.grabar 3cff036508 [refs #223] Add new build btn to project page 2012-04-10 17:07:09 +04:00
Alexander Machehin dfddee82ab [refs #353] fixed english translation 2012-04-10 01:43:45 +06:00
Alexander Machehin cd938532d0 [refs #353] fixed russian translate 2012-04-10 01:10:44 +06:00
Alexander Machehin 5658707fe1 [refs #353] divide long string 2012-04-10 00:13:42 +06:00
Alexander Machehin e349a69883 [refs #353] can fork project to group 2012-04-09 23:56:03 +06:00
konstantin.grabar 39dd53ff9b [refs #358] Add git clone repo help hint 2012-04-05 11:26:03 +04:00
George Vinogradov 1e8021fe35 [issue #369] Added TOS page. 2012-03-31 17:18:22 +04:00
Vladimir Sharshov 0f597ad544 Merge pull request #368 from warpc/195-new_design_for_projects
[issue #195] Fixed access string in repo block
2012-03-31 03:39:52 -07:00
George Vinogradov 59f51d3b2f [issue #195] read_access: read -> read-only 2012-03-31 14:36:36 +04:00
George Vinogradov eb4679de0e [issue #195] Fixed access string in repo block 2012-03-31 14:27:20 +04:00
Pavel Chipiga d6e6959f46 Write basic robots.txt. Apply configurable anonymous access, hide some functionality from guests. Apply basic design for main page. Autoconfirm manually created users. Code refactor and cleanup. Remove unused code, routes, containers, rpms, personal_repositories. Redo product_build_lists monitoring and filtering. Fix add_project to repo bug. Add links to bottom menu. Switch off deploy assets sppedup. Refs #349, #263 2012-03-31 02:37:54 +03:00
Vladimir Sharshov 4ce18b017e Merge pull request #363 from warpc/195-new_design_for_projects
[issue #195] Added missed translations.
2012-03-30 13:51:07 -07:00
George Vinogradov c70a7136d6 [issue #195] Fixed translations. 2012-03-31 00:47:49 +04:00
George Vinogradov 4e701dbddb [issue #195] Added missed translations. 2012-03-31 00:20:23 +04:00
Alexander Machehin b8cadd8a22 [refs #340] changed translations for monitoring pages 2012-03-31 00:24:32 +06:00
Alexander Machehin 4db9bf4587 [refs #340] add title to products page 2012-03-30 23:41:22 +06:00
Alexander Machehin d18e55f180 [refs #340] titles - part2 2012-03-30 22:37:54 +06:00
Alexander Machehin e14e2db6c3 [refs #340] first part of titles 2012-03-30 22:36:20 +06:00
Vladimir Sharshov 3cedef5f07 Merge branch 'master' into 344-fix_products_monitoring
Conflicts:
	db/schema.rb
2012-03-30 20:30:06 +04:00
konstantin.grabar d3c2bac226 [refs #344] Add product buils list filter and search 2012-03-30 15:26:28 +04:00
Vladimir Sharshov 0c2d0f4612 [Refs #263] Delete Categories 2012-03-29 23:01:25 +04:00
Vladimir Sharshov 5db485a4c0 [Refs #263] Remove Aut BuildList. Part 2 2012-03-29 22:43:46 +04:00
Vladimir Sharshov eac5461a29 Merge pull request #355 from warpc/195-new_design_for_projects
[issue #195] Fixed leave button. Added participant icons.
2012-03-29 09:29:37 -07:00
George Vinogradov c03ae5015e [issue #195] Fixed leave button. Added participant icons. 2012-03-29 20:27:33 +04:00
Vladimir Sharshov 1d344f441f [Refs #263] Fix localization: mistakes, typos and missing translations. Special thanks to Eugeni Dodonov for help. 2012-03-29 14:48:15 +04:00
Alexander Machehin 69ccf18265 [refs #270] added statistics to admins menu 2012-03-28 19:19:42 +06:00
George Vinogradov baf35da99c [issue #195] Merge branch 'master' into 195-new_design_for_projects
Conflicts:
	app/controllers/projects_controller.rb
2012-03-27 21:23:09 +04:00
George Vinogradov 9bb1d80172 [issue #195] Added AJAX to /projects list. 2012-03-27 19:50:00 +04:00
Alexander Machehin c327ca8d61 [refs #270] fixed translation for admin menu 2012-03-27 21:28:22 +06:00
Alexander Machehin 6cac84e1bb [refs #270] added register requests page to admins menu 2012-03-27 18:55:08 +06:00
George Vinogradov dd8e3b0497 [issue #195] Added JQuery datatables to /projects 2012-03-25 01:36:56 +04:00
Vladimir Sharshov 0a2561549b Merge pull request #339 from warpc/195-projects
[Refs #195] add lock/unlock icon, fixed edit button, changed translations
2012-03-23 12:26:30 -07:00
Alexander Machehin 863d2999c8 [refs #195] changed translations 2012-03-24 01:15:34 +06:00
Alexander Machehin b08b1f7528 [refs #270] changed translation to Admin 2012-03-23 17:11:15 +06:00
Vladimir Sharshov df32afbda6 [Refs #265] change text for load_messages link 2012-03-22 22:35:01 +04:00
Alexander Machehin 071c391a6e Merge branch '3.2-master' into 270-user_control
Conflicts:
	app/assets/stylesheets/design/custom.scss
2012-03-22 21:15:10 +06:00
George Vinogradov 9f23cf7727 [issue #195] Merge branch '3.2-master' into 195-new_design_for_projects
Conflicts:
	app/views/projects/_sidebar.html.haml
2012-03-22 18:15:57 +04:00
George Vinogradov 524fa2302f [issue #279] Changed buttons alignment. 2012-03-22 17:53:35 +04:00
Alexander Machehin fcc1fad0d1 [refs #270] fixed translations 2012-03-22 18:00:34 +06:00
Pavel Chipiga 89f31e9782 Minor gems update. Prepare gemfile for jruby and rbx tests. Remove encoding hacks. Apply grit fixes for encoding support. Recode incorrect encodings. Refactor, cleanup and fix lots bugs in git section. Refactor and remove unused git routes. Translate some untranslated parts. Redo branch/tags selector. Fix files tree last commit message. Project section templates refactor and cleanup. Refs #190 2012-03-21 21:55:14 +02:00
Alexander Machehin a6a5b722d2 [refs #270] use devise lockable to ban 2012-03-21 23:45:51 +06:00
Alexander Machehin 4a6ce6c8a8 Merge branch '3.2-master' into 270-user_control
Conflicts:
	app/views/users/index.html.haml
2012-03-21 15:29:44 +06:00
Vladimir Sharshov e2c1e59350 Merge pull request #314 from warpc/270-admins_menu
[Refs #270] created admins menu aside
2012-03-20 15:17:51 -07:00
Alexander Machehin 5c408540ff [refs #270] can ban user 2012-03-21 02:06:51 +06:00
Alexander Machehin 20ff998f08 [refs #270] user control 2012-03-21 00:12:18 +06:00
George Vinogradov f958c56a3e [issue #279] Fixed typos 2012-03-20 21:44:56 +04:00
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
Alexander Machehin 1066307fbb [refs #270] created admins menu aside 2012-03-19 23:32:02 +06:00
George Vinogradov 155a46cce9 [issue #279] Fixed some bugs in connection info. 2012-03-19 19:56:40 +04:00
George Vinogradov b6b1462de5 [issue #279] Fixed some bugs in connection info. 2012-03-19 19:37:08 +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
konstantin.grabar 9b68752ffd [refs #257] Change avatar helper and logic. Add paperclip avatar to users 2012-03-03 22:05:02 +04:00
konstantin.grabar ecff8d2d41 [refs #257] Add new design to notifier settings. Fix sidebar. Add edit btn to user profile 2012-03-03 13:23:30 +04:00
konstantin.grabar 0dc22bae82 [refs #257] Add new design for users edit and private settings edit. Add new fields and action. 2012-03-03 12:01:32 +04:00
Pavel Chipiga 159fbe65dc Re-add compass. Add flash messages design. Refactor and fix bugs after merge. Remove duplicates, sync and separate locales . Fix some specs. Refs #263 2012-03-03 02:28:27 +02:00
Pavel Chipiga 56a12dc9ea Merge branch 'master' into 3.2-master
Conflicts:
	app/models/comment.rb
	app/models/issue.rb
	config/locales/en.yml
2012-03-03 01:38:43 +02:00
George Vinogradov 6522650c5a [issue #195] Merge branch '3.2-master' into 195-new_design_for_projects
Conflicts:
	app/views/git/blobs/_show.html.haml
2012-03-02 20:58:28 +04:00
George Vinogradov b3750f8644 [issue #195] Fixed branch selector. 2012-03-02 20:48:19 +04:00
Vladimir Sharshov 6bb3d36c81 Merge pull request #258 from warpc/230-error_messages
[refs #230] Fix error messages + some refactoring
2012-03-02 04:55:55 -08:00
Alexander Machehin 7164dd580e [refs #230] fix error messages + some refactoring 2012-03-02 18:27:38 +06:00
konstantin.grabar e147c2d6c5 [refs #257] Add new design for user public page. New field. Move locales to another file 2012-03-02 16:14:59 +04:00
konstantin.grabar 1700588b97 [refs #232] Merge 3.2-master into 232-new_groups_design 2012-03-02 13:44:54 +04:00
konstantin.grabar d376b55a57 [refs #232] Move groups locales to another files. Remove unsused commented code. On small sidebar fix 2012-03-02 12:47:16 +04:00
Alexander Machehin f79c8d6f16 [refs #230] shorter error messages 2012-03-02 02:04:06 +02:00
Alexander Machehin d7dbe79357 [refs #230] edit password page 2012-03-02 02:04:06 +02:00
Alexander Machehin 3aae663811 [refs #194] add comments to issues 2012-03-02 02:04:05 +02:00
Pavel Chipiga 036dfb6dd5 Fix build_lists bugs. Add build list display and new build list pages design, apply compass. Refactor and cleanup assets. Refactor abilities. Refactor build_list search. Improve layout_class helper. Change defaul build_lists index filter and fix specs. Fix assets path. Refs #223 2012-03-02 02:04:04 +02:00
George Vinogradov 4b024d1728 [issue #195] Fixes.
*  Fixed translations
  *  Fixed blob display
  *  Fixed routes
2012-03-01 21:37:24 +04:00
konstantin.grabar 157f9a1a68 [refs #232] Add sidebar and group edit page 2012-03-01 16:28:38 +04:00
George Vinogradov 2a4e978857 [issue #195] Merge branch '3.2-master' into 195-new_design_for_projects
Conflicts:
	app/assets/stylesheets/custom.scss
2012-03-01 14:22:39 +04:00
George Vinogradov fe5ad9ebf3 [issue #195] Added missed js. Some changes. 2012-03-01 05:07:31 +04:00
George Vinogradov bc96fcdcc3 [issue #195] Added missed translation. 2012-03-01 03:34:36 +04:00
Vladimir Sharshov d3231b5faa Merge pull request #243 from warpc/230-registration_page
[Refs #230] Fix I18n and remove wrong js for registration page
2012-02-29 11:23:35 -08:00
Alexander Machehin ceae6730d8 [refs #230] fix I18n 2012-03-01 01:14:46 +06:00
Vladimir Sharshov d9ca8ff8b6 Merge pull request #231 from warpc/195-new_design_for_projects
[Refs #195] new design for projects
2012-02-29 09:54:42 -08:00
konstantin.grabar bc75b318ce [refs #195] Merge 3.2-master into 195-new_design_for_projects 2012-02-29 21:37:28 +04:00
konstantin.grabar 12d8f5e7b8 [refs #232] Add new design to some group pages 2012-02-29 21:12:06 +04:00
Alexander Machehin ba4fae071f [refs #230] error messages 2012-02-29 23:01:30 +06:00
Alexander Machehin 3136159777 [refs #230] add red borders to invalid attributes 2012-02-29 22:59:09 +06:00
Alexander Machehin ee84ac84cf [refs #228] fix I18n 2012-02-29 22:59:08 +06:00
Alexander Machehin a1bfe66791 [refs #228] sign_in page 2012-02-29 22:59:08 +06:00
George Vinogradov 5b9d20154b [issue #195] Added translations and maybe missed partials 2012-02-29 20:27:32 +04:00
George Vinogradov 662ea4018c [issue #195] Changed commit header on commit page. 2012-02-29 19:08:21 +04:00
konstantin.grabar c5d8041296 [refs #195] Add global fixes to projects and collaborators logic 2012-02-29 18:45:04 +04:00
Pavel Chipiga cefaa902b1 Apply new design for projects build monitoring page. Improve and refactor filters. Improve abilities. Switch off old statuses. Separate build_lists translations. Refactor and remove duplicate translations. Refactor and code cleanup. Fix specs. Apply layout class helper. Refs #223 2012-02-29 16:04:38 +02:00
George Vinogradov fe46e53ad8 [issue #195] Many changes.
*  Base presenter moved to lib
  *  Added diff display
  *  Changes in some views

TODO Add translations.
TODO Change commit page layout.
TODO Change representation of commit on commit page.
TODO Fix bug with tree/branch select.
2012-02-29 06:02:07 +04:00
Alexander Machehin c4719f12da [refs #194] some change in the issue managing 2012-02-28 22:33:38 +06:00
konstantin.grabar e9ae923b60 [refs #195] Merge 3.2-master into 195-new_design_for_projects 2012-02-28 20:10:31 +04:00
Vladimir Sharshov 529d8d3708 Merge pull request #192 from warpc/123-activity-feed
[Refs #123] activity feed (commits notifcation not work)
2012-02-28 07:46:55 -08:00
Alexander Machehin bc4a157703 Merge branch '3.2-master' into 194-tracker
Conflicts:
	app/assets/stylesheets/application.scss
	app/views/issues/_form.html.haml
	app/views/platforms/show.html.haml
2012-02-28 20:13:08 +06:00
Alexander Machehin 0d75a37451 [refs #194] show page beta version 2012-02-28 20:05:18 +06:00
konstantin.grabar 03663a8ed7 [refs #195] Add sections page and method to projects 2012-02-28 12:00:56 +04:00
Pavel Chipiga 70963d0943 Merge branch 'master' into 3.2-master 2012-02-27 22:34:21 +02:00
Pavel Chipiga 159ef26b38 Merge branch 'master' into 3.2-master
Conflicts:
	app/views/wiki/_compare.html.haml
	app/views/wiki/_diff_data.html.haml
	db/schema.rb
2012-02-27 22:32:57 +02:00
Vladimir Sharshov ddda2b92ab [Refs #221] Delete product build lists (only in web) 2012-02-28 00:00:33 +04:00
George Vinogradov b6a52fb840 Merge branch '195-new_design_for_projects' of github.com:warpc/rosa-build into 195-new_design_for_projects 2012-02-27 21:47:05 +04:00
George Vinogradov 582063d066 [issue #195] Commits history, editing, showing... 2012-02-27 21:40:46 +04:00
Pavel Chipiga 1005fbd64f Add link to product container. Refs #217 2012-02-27 18:21:56 +02:00
Alexander Machehin 27c85d32df [refs #194] create page; index pagination; some bugs 2012-02-27 22:10:12 +06:00
konstantin.grabar 72fec3b314 [refs #195] Add owner choose on project create 2012-02-27 13:03:28 +04:00
Pavel Chipiga 4d2459c60c Refactor, fix and cleanup wiki templates and translations. Refs #193 2012-02-24 23:39:40 +02:00
Alexander Machehin dde81b5554 [refs #123] fix activity feed for commit comments; remove reply notification 2012-02-25 00:25:35 +06:00
Vladimir Sharshov 63c89edfda Isolated localization for activity feed 2012-02-24 19:28:01 +04:00
Vladimir Sharshov e93d5c08b0 [Refs#196] Update text message for empty text[en] 2012-02-24 19:27:57 +04:00
Vladimir Sharshov f4f542811d [Refs#196] Update text message for empty text[ru] 2012-02-24 19:27:57 +04:00
Pavel Chipiga 4daf50b34e Change blank repo message. Refs #196 2012-02-24 19:27:57 +04:00
konstantin.grabar aedfc0df8c Change nginx log rotate period to 1 day 2012-02-24 19:27:55 +04:00
konstantin.grabar 45905babd8 [refs #123] Add lost notification locales 2012-02-24 15:51:30 +04:00
konstantin.grabar 395fb812a6 [refs #123] Move notifications locales into another file 2012-02-24 15:34:23 +04:00
Alexander Machehin 9e5e7cd5e4 [refs #194] labels manage 2012-02-23 20:48:46 +06:00
konstantin.grabar ba1798fd71 [refs #195] Add design to form and edit page 2012-02-22 21:48:37 +04:00
konstantin.grabar b99a7d5aa9 [refs #193] Move wiki locales to another file 2012-02-22 16:11:40 +04:00
Alexander Machehin ecb29d1762 [refs #194] tags -> labels 2012-02-22 02:28:04 +06:00
George Vinogradov 85f3d956f5 [issue #195] Merge branch '203-feed_message' into 195-new_design_for_projects
Conflicts:
	app/views/layouts/application.html.haml
2012-02-21 19:42:30 +04:00
Alexander Machehin 0ce76207af [refs #194] Add issue tags 2012-02-21 00:41:40 +06:00
Alexander Machehin 5dcc4eabf8 [refs #194] tracker without tags manage 2012-02-20 22:54:45 +06:00
George Vinogradov edc8774387 [issue #203] Some layout changes & presenters.
*  Fixed bugs in layout
  *  Fixed typos
  *  Fixed bugs in JS
  *  Added universal partial _feed_message.html.haml
  *  Added presenters
  *  Added CommitAsMessage presenter, that prepares Grit::Commit
     to be shown as message.
2012-02-19 02:47:57 +04:00
Vladimir Sharshov 3d7b6ea9d6 [Refs#196] Update text message for empty text[en] 2012-02-16 23:10:58 +04:00
Vladimir Sharshov 6a08704866 [Refs#196] Update text message for empty text[ru] 2012-02-16 23:08:54 +04:00
Pavel Chipiga 689d15f9fd Change blank repo message. Refs #196 2012-02-16 20:23:49 +02:00
Alexander Machehin 55379ed9c8 [refs #194] first steps 2012-02-16 00:53:58 +06:00
Alexander Machehin fab80d97eb [refs #194] project submenu partial 2012-02-15 22:32:26 +06:00
konstantin.grabar 00e2043f51 Change nginx log rotate period to 1 day 2012-02-15 14:37:27 +04:00
konstantin.grabar 5039907431 Merge branch 'master' into 123-activity-feed 2012-02-14 14:30:27 +04:00
Pavel Chipiga 7d74b0af13 Merge branch 'master' into 96-upgrade_rails
Conflicts:
	Gemfile
	Gemfile.lock
	app/models/group.rb
	app/views/layouts/application.html.haml
	db/schema.rb
	public/stylesheets/git/style.css
2012-02-14 02:14:03 +02:00
George Vinogradov 99c314fb11 [issue #133] Merge branch 'master' into 133-editing_from_web
Conflicts:
	db/schema.rb
2012-02-13 21:48:40 +04:00
Pavel Chipiga 704c544cbc Add more register_requests fields, change design. Apply invitation mail sending. Refactor. Refs #174 2012-02-10 18:33:16 +02:00
George Vinogradov 2160f3aa66 [issue #133] Added translations 2012-02-09 04:28:39 +04:00
Pavel Chipiga 7223b7deb9 Upgrade rails, devise, delayed_jobs and other gems. Fix dependencies. Apply assets pipeline, add to deploy. Refactor and cleanup Gemfile. Fix after upgrade bugs. Redo commentable_id from string to decimal. Refactor and code cleanup. Apply basic new design. Refactor main template. Automate menus. Improve translations. Refs #96 2012-02-09 01:46:25 +02:00
konstantin.grabar 96d3b35bdf [refs #123] Merge master into 123-activity-feed 2012-02-06 19:46:32 +04:00
Vladimir Sharshov 72a6edd86b Fix missing localization[Refs #64, Refs #139] 2012-02-03 01:47:35 +04:00
Vladimir Sharshov 26923740ad Hot fix for en yml
Add new schema.rb
2012-02-03 01:30:08 +04:00
Vladimir Sharshov 06fa8f489f Return original translation 2012-02-03 01:14:41 +04:00
Vladimir Sharshov 4165b188eb Merge branch 'master' into 64-project_wiki
Conflicts:
	app/models/project.rb
	config/locales/en.yml
2012-02-03 00:55:16 +04:00
Alexander Machehin 20613ba2c3 [refs #64] All pages: 2012-02-02 01:36:56 +06:00
Alexander Machehin f15cb90b87 Merge branch 'master' into 114-comment_notifications
Conflicts:
	config/locales/ru.yml
2012-01-31 21:42:37 +06:00