Commit Graph

1263 Commits

Author SHA1 Message Date
konstantin.grabar 08ffd8c25d [refs #123] Add wiki to ActivityFeed 2012-02-14 20:09:41 +04:00
konstantin.grabar 5039907431 Merge branch 'master' into 123-activity-feed 2012-02-14 14:30:27 +04:00
Pasha ea176264d9 Merge pull request #185 from warpc/64-project_wiki
64 project wiki
2012-02-13 15:45:23 -08: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
Vladimir Sharshov 2350993120 Merge pull request #182 from warpc/171-build_list_tab_acl_fix
[fix #171] Added ACL calls to project navigation
2012-02-13 09:24:04 -08:00
Vladimir Sharshov fb66bac119 Merge pull request #184 from warpc/183-ga
Fix #183. Add GA code to layouts and invite pages. Do not track admins.
2012-02-13 08:46:18 -08:00
Pavel Chipiga c6f9995b98 Add GA code to layouts and invite pages. Do not track admins. Refs #183 2012-02-13 18:42:11 +02:00
George Vinogradov 50d27ad34d [issue #171] Added ACL calls to project navigation. 2012-02-13 20:16:50 +04:00
George Vinogradov 8c0cd29f0e [issue #133] Fixed bug with no acl on editing blobs 2012-02-13 19:21:00 +04:00
konstantin.grabar 391716fee5 [refs #133] Fix syntax error into blob template 2012-02-13 14:43:57 +04:00
Vladimir Sharshov 2866014a6f Merge pull request #181 from warpc/178-project_and_group_create_error
[Fix #178] Fix project create error with group owner
2012-02-13 02:26:54 -08:00
konstantin.grabar 1356ffa437 [refs #178] Fix project create error with group owner 2012-02-13 14:23:20 +04:00
Vladimir Sharshov 47399a957f Update doc link 2012-02-11 00:36:45 +04:00
konstantin.grabar 9271c15a5f [refs #123] Add new commits support 2012-02-10 21:33:05 +04:00
Pasha 325533f39e Merge pull request #180 from warpc/174-invite_system
Доработка системы приглашений
2012-02-10 09:00:07 -08: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 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
Pasha 3dae76ef4a Merge pull request #177 from warpc/174-invite_system
Система приглашений для регистрации
2012-02-09 15:33:37 -08:00
Pavel Chipiga e535ca2b64 Fix validations. Refs #174 2012-02-10 01:33:06 +02:00
George Vinogradov d0fe7f55d5 [issue #174] added static pages and some changes 2012-02-10 02:57:43 +04:00
George Vinogradov f9e7f3fb06 [issue #174] Devise hacks 2012-02-10 01:45:26 +04:00
George Vinogradov edef21068d [issue #174] Fixed bug with RegisterRequest 2012-02-10 01:44:47 +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 a4baf8b670 [issue #133] Editor JS moved to separate file 2012-02-09 04:35:07 +04:00
George Vinogradov 2160f3aa66 [issue #133] Added translations 2012-02-09 04:28:39 +04:00
George Vinogradov ffe2608c32 [issue #133] Some makeup and a lot of encodings magic 2012-02-09 04:27:26 +04:00
George Vinogradov e23a02d357 [issue #133] Some fixes in Git::Repository#update_file 2012-02-09 04:03:40 +04:00
George Vinogradov d44a274c77 [issue #133] Fixed bug and added comments 2012-02-09 00:56:18 +04:00
Vladimir Sharshov e9f3b79bd2 Merge pull request #176 from warpc/169-fix_create_build_list
[refs #169] fix creating build list for empty build version
2012-02-08 10:21:40 -08:00
George Vinogradov 009b1374a2 [issue #133] Fixed commits display 2012-02-08 21:52:13 +04: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
Vladimir Sharshov c6375619ce Merge pull request #172 from warpc/168-undefined_visibility
[refs #168] Fix undefined method `visibility'
2012-02-07 08:48:51 -08:00
Alexander Machehin c47db56270 [refs #168] can read repos in the open platform 2012-02-07 19:55:45 +06:00
Alexander Machehin 325667dde0 [refs #168] removed wrong ability 2012-02-07 17:31:00 +06:00
Vladimir Sharshov ff6c855234 Merge pull request #170 from warpc/155-fix_render_event_logs
[refs #155] fix render event logs
2012-02-07 01:35:21 -08:00
Alexander Machehin 86704bc39d [refs #155] fix render event logs 2012-02-07 15:31:07 +06:00
Vladimir Sharshov a1fcc62768 Merge pull request #167 from warpc/143-fix-destroy-group
[Fixs #143] Group dooes not destroy personal platfrom when deleting
2012-02-07 00:02:13 -08:00
Alexander Machehin 36f609ec7d [refs #143] fix destroy 2012-02-07 01:47:39 +06:00
konstantin.grabar 96d3b35bdf [refs #123] Merge master into 123-activity-feed 2012-02-06 19:46:32 +04:00
Vladimir Sharshov 4e3d6b4056 Show xml-rpc error code in error message 2012-02-06 19:07:08 +04:00
Vladimir Sharshov c367fc818b Merge branch 'master' of github.com:warpc/rosa-build 2012-02-06 19:05:50 +04:00