Commit Graph

567 Commits

Author SHA1 Message Date
Alexander Machehin cadd1995d1 [refs #230] fix forgot password SignUp style 2012-03-01 01:50:08 +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 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
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 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 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
konstantin.grabar 2ec2548390 [refs #195] Add base design and functional to project members page 2012-02-29 01:01:25 +04:00
Pavel Chipiga 9860624a0d Temporary disable SSL force 2012-02-28 19:00:43 +02:00
Alexander Machehin c4719f12da [refs #194] some change in the issue managing 2012-02-28 22:33:38 +06:00
Alexander Machehin 895b095058 Merge branch '3.2-master' into 194-tracker
Conflicts:
	app/assets/stylesheets/custom.scss
	app/assets/stylesheets/main.scss
2012-02-28 22:31:00 +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
Pavel Chipiga 2f39b050ae Merge branch 'master' into 3.2-master
Conflicts:
	config/deploy.rb
2012-02-28 17:44:11 +02:00
Pavel Chipiga 07b081cc0d Fresh up assets. Force production SSL. Refs #223 2012-02-28 17:40:22 +02: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
Vladimir Sharshov b17ae2f53b [Refs #196] Disable bluepill, turn on DJ receipts 2012-02-28 14:09:27 +04:00
Vladimir Sharshov 5cc32d61c2 [Refs #196] Fix bluepill and DJ option for deploy and restarting 2012-02-28 13:41:02 +04:00
konstantin.grabar 03663a8ed7 [refs #195] Add sections page and method to projects 2012-02-28 12:00:56 +04:00
Pavel Chipiga e004822bd3 Remove/replace old assets to avoid production bugs. Fix deploy settings. 2012-02-28 01:16:14 +02: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
Pavel Chipiga 7508bb1339 Fix bugs to force new design work. Minor refactor and improvements. Refs #193 2012-02-27 20:58:37 +02: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 46a5ab1c76 Merge branch 'master' into 123-activity-feed
Conflicts:
	config/deploy.rb
	db/schema.rb
2012-02-24 20:44:36 +04:00
Vladimir Sharshov 3685eafe57 Remove unused code [Refs #207] 2012-02-24 19:35:29 +04:00
Pavel Chipiga 482874409d Force bluepill restart after deploy. Refs #196 2012-02-24 17:28:46 +02:00
Vladimir Sharshov 63c89edfda Isolated localization for activity feed 2012-02-24 19:28:01 +04:00
Pavel Chipiga 600df031f5 Refactor platform clone controller and routes. Refactor and fix clone process for platform, repository, product. Place XML RPC clone request to DJ. Refs #207 2012-02-24 19:27:59 +04:00
Pavel Chipiga 432b6ac276 Refactor bluepill deploy recipies. Restart DJ through bluepill. Refs #196 2012-02-24 19:27:58 +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
George Vinogradov 50ad3edab4 Fixed default host in mailer 2012-02-24 19:27:56 +04:00
konstantin.grabar aedfc0df8c Change nginx log rotate period to 1 day 2012-02-24 19:27:55 +04:00
Pavel Chipiga fd15a39f7a Fix cancan regsiter_requests specs. Temporary fix specs running bug through file rename. Refs #161 2012-02-24 19:27:54 +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
George Vinogradov 6fe88ed69d [issue #195] Merge branch '195-new_design_for_projects' of github.com:warpc/rosa-build into 195-new_design_for_projects
Conflicts:
	app/presenters/git_presenters/commit_as_message_presenter.rb
2012-02-23 02:16:20 +04:00
George Vinogradov 43b7ccd3dc [issue #195] Added blob show. Some changes. 2012-02-23 02:11:55 +04: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
Pavel Chipiga 5b29de93af Refactor platform clone controller and routes. Refactor and fix clone process for platform, repository, product. Place XML RPC clone request to DJ. Refs #207 2012-02-21 23:27:11 +02: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
konstantin.grabar 2b675c6f84 [refs #193] Fix routes regex for wiki compare 2012-02-20 13:56:09 +04: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
Pavel Chipiga 3347a74653 Refactor bluepill deploy recipies. Restart DJ through bluepill. Refs #196 2012-02-17 16:32:03 +02:00
konstantin.grabar d9025b093f [refs #193] Compare routes repair and compare design 2012-02-17 18:12:05 +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
George Vinogradov 2b170fcbf1 Fixed default host in mailer 2012-02-15 22:02:47 +04: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
Pavel Chipiga 02478f5451 Merge branch 'master' into 96-upgrade_rails 2012-02-14 14:05:27 +02:00
Pavel Chipiga 7bca61c58d Fix cancan regsiter_requests specs. Temporary fix specs running bug through file rename. Refs #161 2012-02-14 13:50:01 +02: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 d0fe7f55d5 [issue #174] added static pages and some changes 2012-02-10 02:57:43 +04:00
George Vinogradov ce39cdd04f [issue #174] A half of work to create invitations system 2012-02-09 21:46:23 +04: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
George Vinogradov 74d401d087 [issue #133] Writed draft of web editing. 2012-02-08 21:51:30 +04:00
konstantin.grabar 96d3b35bdf [refs #123] Merge master into 123-activity-feed 2012-02-06 19:46:32 +04:00
Alexander Machehin 70346f0015 [refs #151] refactoring 2012-02-06 20:12:33 +06:00
George Vinogradov f2bfcf8699 [issue #151] Probably fixed. 2012-02-05 00:12:37 +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
Vladimir Sharshov 8562b882da Merge pull request #136 from warpc/114-comment_notifications
Notifications and subscribtions about new comments in commit [Refs #114]
2012-02-01 11:12:24 -08:00
George Vinogradov d0717c8f9e [issue #64] Merge branch 'master' into 64-project_wiki
Conflicts:
	Gemfile.lock
	db/schema.rb
2012-02-01 22:39:04 +04:00
George Vinogradov b117ec1331 [issue #64] Yet another hacks. 2012-02-01 22:33:53 +04:00