Commit Graph

181 Commits

Author SHA1 Message Date
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 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
Pavel Chipiga a78b7b4155 Merge branch 'master' into 3.2-master 2012-03-11 23:39:11 +02:00
Alexander Machehin 6d5120e5cc Merge branch '3.2-master' into 265-new_design_for_activity_feed 2012-03-11 22:44:25 +06:00
Pavel Chipiga f6a91ec006 Fix rake task. Refs #282 2012-03-08 01:47:48 +02:00
Pavel Chipiga 41ae79eb46 Add configurable arch parameter to project build_for method. Write rake task for projects build. Refs #282 2012-03-08 01:25:17 +02:00
George Vinogradov 464de82c68 [issue #274] Added some MIME types. Changed MIME ordering. 2012-03-07 17:36:39 +04:00
George Vinogradov d6d8410b0f [issue #274] Fixed file detection.
TODO.

  1.  Change MIME in editor
  2.  Change MIME sorting
2012-03-07 05:20:35 +04:00
Alexander Machehin 4f995ca548 [refs #265] hook mode 775 -> 755 2012-03-06 15:39:23 +06:00
Alexander Machehin de0f7c83c8 [refs #265] fix hook and add execute bit for it 2012-03-06 15:07:14 +06: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
konstantin.grabar bc75b318ce [refs #195] Merge 3.2-master into 195-new_design_for_projects 2012-02-29 21:37:28 +04:00
Vladimir Sharshov b20c533e6b [Refs #221] Fix xml-rpc call 2012-02-29 16:00:02 +04:00
Vladimir Sharshov 6e15ee3e96 [Refs #221] Fix syntax error 2012-02-29 15:47:05 +04:00
Alexander Machehin 2e16d3c4ee Merge pull request #237 from warpc/221-delete_product_build_list
[Refs #221] delete product build list
2012-02-29 03:25:25 -08:00
Vladimir Sharshov 02cbec8d86 [Refs #221] Add xml-rpc call for iso container destroy 2012-02-29 15:15:49 +04:00
Alexander Machehin 9aa561a591 [refs #230] fix devise for undefined method 'render_with_scope' 2012-02-29 17:05:36 +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
Vladimir Sharshov 5cc32d61c2 [Refs #196] Fix bluepill and DJ option for deploy and restarting 2012-02-28 13:41:02 +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 a2a29e2baa Rescue and ignore timeout error during long XML RPC. Apply add_branch script. Refs #207 2012-02-23 17:17:02 +02: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 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 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
Pavel Chipiga 3347a74653 Refactor bluepill deploy recipies. Restart DJ through bluepill. Refs #196 2012-02-17 16:32:03 +02:00
Alexander Machehin c55158a892 [refs #134] some hook task improvements 2012-02-17 15:22:55 +06:00
Alexander Machehin a5375c369c [refs #134] lost env! 2012-02-16 22:29:41 +06:00
Vladimir Sharshov 98059d6570 Merge pull request #191 from warpc/134-git-hook
[refs #134] Fixed git hook (hadr-coded desctionation and wrong rails env)
2012-02-16 05:52:09 -08:00
George Vinogradov 5dac20bac5 Some fixes:
*  Changed default visibility to personal platforms to 'open'
  *  Changed 'Erase' button to simple link in comments partial
  *  Probably added domain name to links in mail notifications
  *  Fixed protocol in repo links form 'http' to 'https'
2012-02-15 20:30:56 +04:00
Alexander Machehin a8f507737f [refs #134] rails root 2012-02-15 19:06:25 +06:00
Alexander Machehin fbaa9949df [refs #134] clean 2012-02-15 17:23:49 +06:00
Alexander Machehin 20836e8864 [refs #134] fixed git hook 2012-02-15 17:12:49 +06:00
Vladimir Sharshov 90c1250769 Merge pull request #186 from warpc/64-project_wiki
[Refs #64] - Fix diff for russians pages, add ability to revert last commit
2012-02-15 01:44:41 -08:00
George Vinogradov 5b7d1a79d0 [issue #64] Removed debug methods and unnecessary comments. 2012-02-15 02:13:52 +04:00
George Vinogradov e9c5273136 [issue #64] Added possibility to diff and revert last commit 2012-02-14 18:54:44 +04: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
George Vinogradov 99ee490e94 [issue #64] Added callback for notifications + some minor changes 2012-02-14 03:30:17 +04:00
George Vinogradov f9e7f3fb06 [issue #174] Devise hacks 2012-02-10 01:45:26 +04:00
Alexander Machehin 70346f0015 [refs #151] refactoring 2012-02-06 20:12:33 +06:00
Alexander Machehin a79a081fd1 Merge branch 'master' into 151-grit_encodings_problems 2012-02-06 19:55:59 +06:00
Alexander Machehin fde67a2c22 [refs #134] add post receive hook to repos 2012-02-06 15:31:22 +06:00
George Vinogradov f2bfcf8699 [issue #151] Probably fixed. 2012-02-05 00:12:37 +04: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
George Vinogradov 8733c4dc34 [issue #64] Some dirty hacks.
Diff for file with russian name don't work yet.
2012-02-01 03:20:42 +04:00
Pavel Chipiga fde298cc85 Rollback to redhillonrails_core instead of schema_plus to avoid some bugs. Add platform reference to project_imports, change indexes and validators. Adjust sync algoritm to use platform_id. Improve rsync params. Refs #112, #138 2012-01-31 20:48:37 +02:00
George Vinogradov 24124766f4 [issue #64] Merge branch 'master' into 64-project_wiki
Conflicts:
	Gemfile.lock
	config/locales/en.yml
	db/schema.rb
2012-01-31 02:07:11 +04:00
Pavel Chipiga 13780a1b53 Add magic encodings. Refs #95 2012-01-30 22:39:34 +02:00
Pavel Chipiga 33dce21312 Upgrade to ruby 1.9.3 and fix bugs. Fix bug with commit_hash save during project build. Move some russian text to yml. Code cleanup. Fix templates, deploy and import scripts. Fix specs. Translate event_logs. Refs #95 2012-01-30 22:36:58 +02:00
George Vinogradov 2f315f869d [issue #64] Merge branch 'master' into 64-project_wiki
Conflicts:
	Gemfile.lock
	app/models/project.rb
	db/schema.rb
2012-01-30 13:27:22 +04:00