Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,376 Commits 30 Branches 0 Tags 24 MiB
Commit Graph

1376 Commits

Author SHA1 Message Date
Vladimir Sharshov ba44c32507 Merge pull request #187 from warpc/96-upgrade_rails 
[Refs #96] New Rails 3.2 and more new staff
 2012-02-15 06:04:03 -08:00
Alexander Machehin eaa6a46a43 [refs #96] fixed commit subscribing 2012-02-15 19:07:56 +06: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
konstantin.grabar 00e2043f51 Change nginx log rotate period to 1 day 2012-02-15 14:37:27 +04: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
Vladimir Sharshov 7530cf5d91 Merge pull request #189 from warpc/143-remove_migration 
Remove broken migration
 2012-02-14 16:03:37 -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
Alexander Machehin 3690d69663 remove broken migration 2012-02-15 00:50:55 +06:00
Vladimir Sharshov d47ad1ed88 Merge pull request #188 from warpc/174-invite_system 
[Refs #174] Apply approved and rejected filters for register requests
 2012-02-14 10:35:43 -08: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
George Vinogradov 85723f7da6 [issue #64] Fixed encodings bugs 2012-02-14 18:54:18 +04:00
Pavel Chipiga 02478f5451 Merge branch 'master' into 96-upgrade_rails 2012-02-14 14:05:27 +02:00
Alexander Machehin a53f627f5f Merge branch 'master' of github.com:warpc/rosa-build 2012-02-14 17:54:46 +06:00
Alexander Machehin 6fff641531 fix collaborator tests 2012-02-14 17:52:33 +06: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
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
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
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