Commit Graph

1449 Commits

Author SHA1 Message Date
Vladimir Sharshov 78025ec623 Merge pull request #246 from warpc/195-new_design_for_projects
[Refs #195] Rewrite main css file in Sassy CSS
* Added missed translation;
* Added missed js. Some changes;
* Returned lost files.
2012-03-01 02:34:17 -08: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
George Vinogradov dedd64f976 [issue #195] Returned lost files. 2012-03-01 03:29:16 +04:00
Vladimir Sharshov 20e1af6872 Merge pull request #245 from warpc/230-registration_page
[Refs #230] change title style for forgoten password page; remove unused js
2012-02-29 12:28:59 -08:00
Alexander Machehin bcef305228 [refs #230] change title style; remove unused js 2012-03-01 02:19:39 +06:00
Vladimir Sharshov a7155ac522 Merge pull request #244 from warpc/230-registration_page
[Refs #230] fix forgot password SignUp style
2012-02-29 11:56:56 -08:00
Alexander Machehin cadd1995d1 [refs #230] fix forgot password SignUp style 2012-03-01 01:50:08 +06:00
Alexander Machehin b53d6c4bf6 Merge branch '3.2-master' of github.com:warpc/rosa-build into 3.2-master 2012-03-01 01:36:46 +06: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 4fd518ac86 Merge pull request #242 from warpc/195-new_design_for_projects
[Refs #195] 
* Add default value to is_rpm field for projects
* Show tab for wiki, tracker or build only if they activate
2012-02-29 11:04:19 -08:00
Alexander Machehin 5f71d430fc [refs #230] remove wrong js 2012-03-01 00:48:13 +06:00
Alexander Machehin fd03f3deab [refs #230] remove wrong js 2012-03-01 00:45:37 +06:00
Alexander Machehin aea631824f [refs #230] remove debug messages 2012-03-01 00:39:12 +06:00
Vladimir Sharshov c962569c50 Merge pull request #241 from warpc/194-tracker
[Refs #194] small fix for new tracker
2012-02-29 10:36:07 -08:00
Alexander Machehin 3a10ed91b2 [refs #194] more uniq 2012-03-01 00:33:01 +06:00
konstantin.grabar 5b25ea221b [refs #195] Add default value to is_rpm field for projects 2012-02-29 22:27:57 +04:00
Alexander Machehin fe0eba8e61 [refs #194] fix index page 2012-03-01 00:23:19 +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
George Vinogradov c3d7221f97 [issue #195] Fixed bugs
*  Highlighting in submenu
  *  File history
2012-02-29 21:53:14 +04:00
Vladimir Sharshov 97c6599f43 Merge pull request #238 from warpc/230-registration_page
[Refs #230] registration and password restore pages
2012-02-29 09:40:49 -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
Alexander Machehin 3415c6eb9f Merge branch '3.2-master' into 230-registration_page 2012-02-29 23:25:24 +06:00
Vladimir Sharshov 6e8b48188e Merge pull request #229 from warpc/228-sign_in
[Refs #228] sign in
2012-02-29 09:22:42 -08:00
Alexander Machehin 4f6876aa34 Merge branch '230-registration_page' of github.com:warpc/rosa-build into 230-registration_page
Conflicts:
	config/locales/en.yml
	config/locales/ru.yml
2012-02-29 23:08:41 +06:00
Alexander Machehin ba4fae071f [refs #230] error messages 2012-02-29 23:01:30 +06:00
Alexander Machehin 322e68212f [refs #230] add registration to precompile list 2012-02-29 22:59:09 +06:00
Alexander Machehin 3136159777 [refs #230] add red borders to invalid attributes 2012-02-29 22:59:09 +06:00
Alexander Machehin 632e908442 [refs #228] add logins to precompile array 2012-02-29 22:59:09 +06:00
Alexander Machehin f4954557b3 [refs #228] fix showing error 2012-02-29 22:59:08 +06:00
Alexander Machehin ee84ac84cf [refs #228] fix I18n 2012-02-29 22:59:08 +06:00
Alexander Machehin 71d9079003 [refs #228] fix registration link 2012-02-29 22:59:08 +06:00
Alexander Machehin a1bfe66791 [refs #228] sign_in page 2012-02-29 22:59:08 +06:00
Alexander Machehin b759e2b065 [refs #230] error messages 2012-02-29 22:54:44 +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
George Vinogradov 19dd58800b [issue #195] Added comments to commit. 2012-02-29 19:05:36 +04:00
Vladimir Sharshov 7992bb60d9 Merge pull request #240 from warpc/223-monitoring_design
[Refs #223] 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
2012-02-29 06:53:52 -08: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
Alexander Machehin 6da02b6f48 [refs #230] add registration to precompile list 2012-02-29 17:46:19 +06:00
Alexander Machehin e6398e8008 Merge branch '3.2-master' into 230-registration_page 2012-02-29 17:38:22 +06:00
Alexander Machehin 75a0069f72 [refs #230] add red borders to invalid attributes 2012-02-29 17:38:13 +06:00
Alexander Machehin 645d4b04ce Merge branch '3.2-master' of github.com:warpc/rosa-build into 3.2-master 2012-02-29 17:06:58 +06:00
Alexander Machehin 9aa561a591 [refs #230] fix devise for undefined method 'render_with_scope' 2012-02-29 17:05:36 +06:00
Alexander Machehin 89a5cf56b2 [refs #228] fix submit button style 2012-02-29 15:23:59 +06:00
Alexander Machehin 80b594b986 [refs #230] fix same bug with devise 2012-02-29 14:49:04 +06:00
Vladimir Sharshov 90cf0b0ce8 Merge pull request #234 from warpc/233-fix_user_menu
[Fix #233] fix users menu toggle
2012-02-29 00:15:17 -08:00