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

423 Commits

Author SHA1 Message Date
konstantin.grabar 2bdcdb6fd3 [refs #193] Fix compare buttons and links design 2012-02-20 14:27:58 +04: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
konstantin.grabar d8a3983b07 [refs #193] Add new design to wiki 2012-02-17 15:13:54 +04:00
konstantin.grabar c140c1b466 Merge branch '194-project_submenu' into 193-new_design_for_wiki 2012-02-16 12:23:41 +04:00
Alexander Machehin fab80d97eb [refs #194] project submenu partial 2012-02-15 22:32:26 +06:00
konstantin.grabar 0763936e38 [refs #193] Wiki navigation design 2012-02-15 19:01:49 +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
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 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
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
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
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 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 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
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
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
George Vinogradov 0591ba4378 [fix #158] Fixed bug with render in BlobController#raw 2012-02-04 22:03:29 +04:00
Alexander Machehin b0d0b21ec4 [refs #144] fix template 2012-02-03 19:40:47 +06:00
George Vinogradov 549fc242d8 [issue #64] Fixed bug in _history partial 2012-02-03 04:23:29 +04:00
George Vinogradov a2f07fad10 Merge branch '64-project_wiki' of github.com:warpc/rosa-build into 64-project_wiki 2012-02-03 04:05:18 +04:00
George Vinogradov e05f391f8e [issue #64] Write User.uname instead of User.name to commit 2012-02-03 04:04:20 +04:00
Vladimir Sharshov 4165b188eb Merge branch 'master' into 64-project_wiki 
Conflicts:
	app/models/project.rb
	config/locales/en.yml
 2012-02-03 00:55:16 +04:00
Alexander Machehin 68c97b3a33 [refs #64] some template fixes 2012-02-03 00:46:33 +06:00
George Vinogradov 821062c150 Merge branch '64-project_wiki' of github.com:warpc/rosa-build into 64-project_wiki 2012-02-02 03:18:53 +04:00
George Vinogradov 4cd20934c4 [issue #64] Removed unused MathJax 2012-02-02 03:17:16 +04:00
Alexander Machehin 20613ba2c3 [refs #64] All pages: 2012-02-02 01:36:56 +06:00
Vladimir Sharshov 8562b882da Merge pull request #136 from warpc/114-comment_notifications 
Notifications and subscribtions about new comments in commit [Refs #114]
 2012-02-01 11:12:24 -08: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
konstantin.grabar 0559f1b678 [refs #127] Filter request refactor 2012-02-01 20:00:19 +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
George Vinogradov 6f78e5456c [issue #64] Changes for ruby 1.9.3 compatibility. 2012-01-31 20:40:46 +04:00
Alexander Machehin f15cb90b87 Merge branch 'master' into 114-comment_notifications 
Conflicts:
	config/locales/ru.yml
 2012-01-31 21:42:37 +06: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 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 5f40030e30 [issue #64] Fixed bug with cloning wiki repository 2012-01-30 18:17:00 +04:00