Commit Graph

917 Commits

Author SHA1 Message Date
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
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 7d56267e03 [Fix #224] Alphabetic order category list 2012-02-28 14:35:17 +04:00
Alexander Machehin 66a08662c2 [refs #194] new styles; some changes 2012-02-28 15:23:27 +06: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
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
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
Pavel Chipiga e1f7817624 Add local admin ability to build product. Fix template links. Refactor. Refs #217 2012-02-27 15:49:24 +02:00
Pavel Chipiga 1dd20377cf Fix layout. Refs #193 2012-02-24 23:54:44 +02:00
Pavel Chipiga 4d2459c60c Refactor, fix and cleanup wiki templates and translations. Refs #193 2012-02-24 23:39:40 +02:00
George Vinogradov 3c83649627 [issue #96] Some fixes in layout and scripts. 2012-02-24 23:39:40 +02:00
George Vinogradov 586d4e0bea Fixed bug with Windows line endings in blob editing. 2012-02-24 20:34:41 +04:00
Pavel Chipiga bda978a306 Fix bug with group autocomplete. Do not delete during rsync 2012-02-24 17:27:49 +02:00
Pavel Chipiga dde34cdffb Fix build_for settings. Refs #207 2012-02-23 22:20:44 +02:00
Pavel Chipiga 86c717dee5 Build only main repo. Refs #207 2012-02-23 21:06:28 +02:00
Pavel Chipiga 66fc31e404 Redo platform build_all with sleep and errors rescue. Refs #207 2012-02-23 20:32:56 +02:00
Alexander Machehin a6a51225b8 [refs #194] some js refactoring 2012-02-23 22:16:04 +06:00
Alexander Machehin 027012d3e5 [refs #194] some refactotring 2012-02-23 21:57:51 +06:00
Alexander Machehin 9e5e7cd5e4 [refs #194] labels manage 2012-02-23 20:48:46 +06:00
Pavel Chipiga b192ebdcea Create directory for platform before clone. Fix created directory permissions. Increase timeout during XML RPC clone. Switch off cascade XML RPC requests during platform destroy. Refs #207 2012-02-23 00:57:43 +02:00
Pavel Chipiga 9eb191da7b Redo clone logic. Split clone process for repositories. Optimize and refactor. Refs #207 2012-02-22 22:24:29 +02:00
Pavel Chipiga 8f4c207545 Place platform destroy to background. Redo clone process to 2 phases - base_clone and relations_clone. Place relations clone and XML RPC to background. Remove unneeded validations. Refactor xml_rpc_clone. Refs #207 2012-02-22 14:35:40 +02:00
Pavel Chipiga 5829ab87e9 Remove raise. Refs #207 2012-02-21 23:43:06 +02: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
konstantin.grabar 3a48f8dea9 [refs #193] Add lost file with wiki_history checkboxes script 2012-02-21 20:11:16 +04:00
konstantin.grabar 81393d7f5b [refs #193] Disable more than 2 versions for wiki diff by js 2012-02-21 16:42:09 +04:00
konstantin.grabar 9b610eb920 [refs #193] Fixed old commented code from old template versions. Fix diff page 2012-02-21 14:49:06 +04:00
Pavel Chipiga ed60751dfa Delegate all repo abilities to platform. Remove repository owner and relations. Fix templates and specs. Refactor and code cleanup. Refs #205 2012-02-21 01:13:05 +02: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 2bdcdb6fd3 [refs #193] Fix compare buttons and links design 2012-02-20 14:27:58 +04:00
konstantin.grabar f22d9809ff [refs #193] Remove debug puts from wiki controller 2012-02-20 14:02:04 +04:00
Alexander Machehin 76beb6a277 [refs #194] add creator to issue 2012-02-19 23:28:43 +06:00
konstantin.grabar d9025b093f [refs #193] Compare routes repair and compare design 2012-02-17 18:12:05 +04:00
konstantin.grabar 7863869a30 [refs# 193] Move some gollum style to docs/gollum. Add new styles to edit and new pages 2012-02-17 16:47:33 +04:00