Commit Graph

1742 Commits

Author SHA1 Message Date
Alexander Machehin c55d6d097e [refs #228] fix registration link 2012-02-29 10:41:25 +06: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 b586c5ddf0 [refs #195] Add js hack for sections bigpadding div class 2012-02-29 01:17:04 +04:00
konstantin.grabar 2ec2548390 [refs #195] Add base design and functional to project members page 2012-02-29 01:01:25 +04:00
Alexander Machehin 91eb306560 [refs #228] sign_in page 2012-02-29 02:43:17 +06:00
konstantin.grabar 577eadbc7c [refs #195] Fix project form submit tag 2012-02-29 00:12:37 +04:00
konstantin.grabar fa69cd8ee4 [refs #195] Fix radio and checkboxes script. Fix project edit and new form 2012-02-28 23:11:08 +04:00
Pavel Chipiga 9860624a0d Temporary disable SSL force 2012-02-28 19:00:43 +02:00
Pasha 816f0ce7ee Merge pull request #226 from warpc/194-tracker
194 tracker
2012-02-28 08:48:11 -08:00
Alexander Machehin 2cb085992b [refs #194] fix submenu for issues 2012-02-28 22:41:03 +06:00
Alexander Machehin e83e19ea50 [refs #194] remove duplicates 2012-02-28 22:36:29 +06: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
konstantin.grabar 06795a56be [refs #195] Add sections action ability for projects 2012-02-28 19:44:16 +04:00
Pavel Chipiga 2f39b050ae Merge branch 'master' into 3.2-master
Conflicts:
	config/deploy.rb
2012-02-28 17:44:11 +02:00
Alexander Machehin 99e3bbb762 [refs #194] update issue content 2012-02-28 21:41:47 +06:00
Pavel Chipiga 07b081cc0d Fresh up assets. Force production SSL. Refs #223 2012-02-28 17:40:22 +02:00
Vladimir Sharshov 7a93239e35 Merge pull request #227 from warpc/193-new_design_for_wiki
[refs #193] Fix wrap gollum and wiki page styles
2012-02-28 07:25:28 -08:00
Alexander Machehin f9c834cf4d Revert "[refs #194] return main.scss"
This reverts commit 0b8461a5df9f3d9bbca6e3b377164ff4aa4ac4e6.
2012-02-28 20:56:43 +06:00
Alexander Machehin 5abdbd4486 [refs #194] return main.scss 2012-02-28 20:37:30 +06:00
konstantin.grabar 39b0beb3ab [refs #193] Fix wrap gollum and wiki page styles 2012-02-28 18:36:04 +04:00
Alexander Machehin 0abea8ff55 [refs #194] fix issues count 2012-02-28 20:28:11 +06: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 fd5f9d13d7 Fix bug in invite page (separator beyond the boundary ) 2012-02-28 15:08:17 +04:00
Alexander Machehin 481dcb0e3a Merge pull request #225 from warpc/224-category_order
[Fix #224] Alphabetic order category list
2012-02-28 02:40:26 -08:00
Vladimir Sharshov 7d56267e03 [Fix #224] Alphabetic order category list 2012-02-28 14:35:17 +04: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
Alexander Machehin 66a08662c2 [refs #194] new styles; some changes 2012-02-28 15:23:27 +06: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 39d42c1721 Fix seeds 2012-02-27 23:11:43 +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
Pasha ab2398de53 Merge pull request #222 from warpc/221-delete_product_build_list
[Refs #221] Delete product build lists (only in web)
2012-02-27 12:11:06 -08:00
Vladimir Sharshov ddda2b92ab [Refs #221] Delete product build lists (only in web) 2012-02-28 00:00:33 +04:00
Vladimir Sharshov b475877608 Merge pull request #216 from warpc/193-new_design_for_wiki
[Refs #193] new design for wiki
2012-02-27 11:12:28 -08:00
Pavel Chipiga 0579fe9b47 Merge branch '3.2-master' into 193-new_design_for_wiki
Conflicts:
	app/assets/stylesheets/application.scss
	app/views/layouts/application.html.haml
2012-02-27 21:04:10 +02: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
Alexander Machehin 2c0e1b6314 Merge branch '3.2-master' into 194-tracker
Conflicts:
	app/assets/stylesheets/custom.scss
2012-02-27 23:55:18 +06: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
Vladimir Sharshov 9b02b97f2c Merge pull request #220 from warpc/219-pbl_container
[Fix #219] Add link to product container
2012-02-27 08:29:25 -08: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
Vladimir Sharshov 3715331021 Merge pull request #218 from warpc/217-product_abilities
[Fix #217]
* Add local admin ability to build product
* Fix template links
* Refactor
2012-02-27 05:58:58 -08:00
Pavel Chipiga e1f7817624 Add local admin ability to build product. Fix template links. Refactor. Refs #217 2012-02-27 15:49:24 +02:00