Commit Graph

452 Commits

Author SHA1 Message Date
Alexander Machehin 99e3bbb762 [refs #194] update issue content 2012-02-28 21:41:47 +06: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
Alexander Machehin 66a08662c2 [refs #194] new styles; some changes 2012-02-28 15:23:27 +06: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
Alexander Machehin 27c85d32df [refs #194] create page; index pagination; some bugs 2012-02-27 22:10:12 +06:00
George Vinogradov 586d4e0bea Fixed bug with Windows line endings in blob editing. 2012-02-24 20:34:41 +04: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 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
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 5dcc4eabf8 [refs #194] tracker without tags manage 2012-02-20 22:54:45 +06:00
Alexander Machehin eaa6a46a43 [refs #96] fixed commit subscribing 2012-02-15 19:07:56 +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
Alexander Machehin da0d791f74 [refs #96] fixed commentable & subscribeable ids 2012-02-15 02:28:01 +06:00
Pavel Chipiga 2c493cdbb7 Apply approved and rejected filters for register requests. Tune abilities. Link to user profile if user have already registered. Refs #174 2012-02-14 20:15:52 +02:00
Pavel Chipiga b7b69a86d8 Minor gems update. Sync with newest styles, javascripts, images. Refactor assets. Merge and fix wiki assets, temporary disable buggy ones. Change subscribeable_id type from string to decimal to avoid bugs. Auto convert commit subscribe subscribeable_id from hex to decimal. Refactor commentable. Fix bugs and some specs. Refactor application.yml. Refs #96 2012-02-14 18:05:41 +02:00
George Vinogradov e9c5273136 [issue #64] Added possibility to diff and revert last commit 2012-02-14 18:54:44 +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 99ee490e94 [issue #64] Added callback for notifications + some minor changes 2012-02-14 03:30:17 +04:00
George Vinogradov 159bf21810 Merge branch 'master' into 64-project_wiki 2012-02-14 02:29:32 +04:00
Vladimir Sharshov 141a078cce Merge pull request #175 from warpc/133-editing_from_web
[Refs #133] Edit files in git-repo with web editor
2012-02-13 13:07:55 -08:00
George Vinogradov 4dcc39975d [issue #133] Fixed redirection bugs 2012-02-13 23:04:41 +04:00
Vladimir Sharshov 2ca69df1cd Merge pull request #165 from warpc/150-acl-collaborators
[Fix #150] Disable edit and update action for non-admin collaborators in projects.
2012-02-13 10:49:01 -08:00
George Vinogradov c26962c216 [issue #133] Added redirects if cannot find Blob object 2012-02-13 22:45:45 +04:00
George Vinogradov e4da6057a5 [issue #64] Changed authorization filters 2012-02-13 22:28:43 +04: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
George Vinogradov 8c0cd29f0e [issue #133] Fixed bug with no acl on editing blobs 2012-02-13 19:21:00 +04:00
George Vinogradov 8417e8c16f [issue #174] multiupdate in admin view. 2012-02-10 15:18:40 +04:00
George Vinogradov a17f548168 [issue #174] Fixed bugs 2012-02-10 14:04:15 +04: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 ffe2608c32 [issue #133] Some makeup and a lot of encodings magic 2012-02-09 04:27:26 +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
Alexander Machehin 02217752af [refs #169] fix creating build list on empty repository 2012-02-08 17:07:16 +06:00
konstantin.grabar a83d64eaab [refs #150] Fix collaborators cancan authorize 2012-02-06 19:04:56 +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
George Vinogradov f2bfcf8699 [issue #151] Probably fixed. 2012-02-05 00:12:37 +04:00
Alexander Machehin 87abfb4352 [refs #64] fixed forbidden redirection after signin 2012-02-03 21:28:19 +06:00