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

360 Commits

Author SHA1 Message Date
George Vinogradov 549f0a55e8 [issue #64] Merge branch 'master' into 64-project_wiki 
Conflicts:
	Gemfile.lock
	app/models/project.rb
	app/models/user.rb
	app/views/projects/_form.html.haml
	config/locales/ru.yml
	db/schema.rb
 2012-01-27 18:27:23 +04:00
George Vinogradov b04a9e0176 [issue #64] Removed duplicated authorization. 2012-01-27 00:51:11 +04:00
George Vinogradov 3cb426a508 [issue #64] Added cancan restrictions. 2012-01-26 20:26:21 +04:00
Vladimir Sharshov c529e63c96 Merge pull request #122 from warpc/105-internationalization 
[refs #105] Fix devise translations
 2012-01-26 08:06:34 -08:00
George Vinogradov da88ac7df7 [issue #64] Some refactoring 2012-01-26 18:10:25 +04:00
Pavel Chipiga 374628a216 Render answer before publication trying to avoid bug. Refs #97 2012-01-26 00:28:11 +02:00
George Vinogradov 45877e8b5c [issue #64] Bug fix & views refactoring 
*  Fixed bug with history
*  Navigation moved to partial.
 2012-01-25 00:47:55 +04:00
George Vinogradov 6140c0c0bc [issue #64] Added some comments 2012-01-23 17:38:10 +04:00
George Vinogradov 230c25eefd [issue #64] Some changes. 
*  WikiController#compare splitted into WikiController#compare
   and WikiController#compate_wiki
*  Show only last 30 versions in history.
 2012-01-23 16:45:38 +04:00
George Vinogradov d939edda8f [issue #64] Fixed some bugs. 2012-01-21 02:11:46 +04:00
konstantin.grabar 5d93d40693 [refs #113] Remove unused action from blobs controller 2012-01-20 22:33:22 +04:00
konstantin.grabar 23ace52d90 [refs #113] Images render and download href for binary data into blobs 2012-01-20 22:31:01 +04:00
George Vinogradov 011efb0c4b [issue #64] Added git access to Wiki. 2012-01-20 19:01:59 +04:00
konstantin.grabar e3a716b7db [refs #105] Fix some translations 2012-01-20 15:29:32 +04:00
George Vinogradov 364f2e40c0 [issue #64] Added Wiki history, compare, revert. 2012-01-20 03:25:15 +04:00
George Vinogradov 54bc26d960 [issue #64] Added translations. 2012-01-19 18:37:36 +04:00
George Vinogradov 0c527af291 [issue #64] Added revisions comparsion. 2012-01-19 17:49:32 +04:00
George Vinogradov 32b64d3462 [issue #64] Minor fixes in WikiController 2012-01-19 16:07:08 +04:00
konstantin.grabar bd6abf2681 [refs #105] Add locale fixes 2012-01-19 00:58:38 +04:00
George Vinogradov 0386c34246 [issue #64] Added page deletion. 2012-01-18 18:33:35 +04:00
Pasha 4ba268dd67 Merge pull request #109 from warpc/18-commit_comments 
18 commit comments
 2012-01-18 05:49:57 -08:00
Pasha eb6ec413da Merge pull request #108 from warpc/105-internationalization 
105 internationalization
 2012-01-18 05:38:55 -08:00
George Vinogradov a608ded8c4 [issue #76] Fixed potential bug in redirects 2012-01-18 04:44:42 +04:00
George Vinogradov 407130f3d7 [issue #64] Minor fix in WikiController#show. 2012-01-18 03:46:44 +04:00
George Vinogradov a9989f07fe [issue #64] Fixed bug with update page 2012-01-18 03:30:04 +04:00
George Vinogradov 51e9b5d1f6 [issue #64] Some changes in views and routes. 2012-01-18 02:28:59 +04:00
Alexander Machehin 310e11b666 [refs #18] Fix if blocking referer 2012-01-18 00:33:42 +06:00
Pavel Chipiga f8be867aaf Replace annotated tags to lightweight. Improve specs. Restore lost migrations. Refs #103 2012-01-17 19:37:41 +02:00
konstantin.grabar bbbf17c2b4 [refs #105] Merge master with 105-internationalization 2012-01-17 17:58:49 +04:00
santaux 62d0419bdd Merge pull request #106 from warpc/103-bl_publish_new_params 
Сохранение сборочного коммита, добавление неподписанного тега на сохраненный коммит после публикации
 2012-01-17 04:34:15 -08:00
konstantin.grabar d205eb2dd9 [refs #105] Add language check on user save 2012-01-17 15:57:46 +04:00
konstantin.grabar 726eddc40e [refs #105] Add internationalization support to project 2012-01-17 15:48:40 +04:00
Alexander Machehin d2c5df93a9 Merge branch '18-commit_comments' of github.com:warpc/rosa-build into 18-commit_comments 
Conflicts:
	app/models/comment.rb
	app/models/issue.rb
	app/views/comments/edit.html.haml
	app/views/issues/show.html.haml
 2012-01-17 15:57:12 +06:00
Alexander Machehin bf4e4f02ed Right merge branch 'master' into 18-commit_comments 
Conflicts:
	app/controllers/comments_controller.rb
	app/views/comments/edit.html.haml
	app/views/issues/show.html.haml
	db/schema.rb
 2012-01-17 15:52:46 +06:00
Pavel Chipiga a687a6601b Save commit_hash during build_list create. Tag git repo during build_list publish. Write and fix specs. Refs #103 2012-01-16 23:51:20 +02:00
George Vinogradov 1e1dab369b [issue #64] Added some views, styles and scripts. 
*  Added base gollum styles
*  Added base gollum javascripts (with minor changes)
*  Fixed some bugs in WikiController
*  Added some views (draft yet)
 2012-01-17 01:48:38 +04:00
Alexander Machehin 80ba40f6ee Merge branch 'master' into 18-commit_comments 
rspec spec/ = 528 examples, 12 failures
 2012-01-17 00:52:16 +06:00
konstantin.grabar 52696791f2 [refs #54, #94] Merge master into issues 2012-01-16 13:42:44 +04:00
Alexander Machehin bdc3b3a3d1 [refs #18] controller tests 2012-01-14 18:16:42 +06:00
Pavel Chipiga 712ca8d95a Save package_version during success build_list publish. Add specs. Refs #103 2012-01-13 18:45:13 +02:00
konstantin.grabar a1a92e9878 [refs #54] Fix comments serial_id routing and some logic 2012-01-13 20:07:46 +04:00
Alexander Machehin 794c55a030 Merge branch 'master' of github.com:warpc/rosa-build into 18-commit_comments 2012-01-13 22:01:30 +06:00
Alexander Machehin 8252367537 some fix 2012-01-13 21:58:48 +06:00
konstantin.grabar db0a66846b [refs #94] Add new notifier rules. Fix some issues and comments bugs 2012-01-13 19:07:01 +04:00
George Vinogradov 729bd94045 [issue #64] Merge branch 'master' into 64-project_wiki 
Conflicts:
	config/routes.rb
	db/schema.rb
 2012-01-13 18:05:42 +04:00
George Vinogradov 0751a94974 [update #76] Merge branch 'master' into 76-project_autocomplete 
Conflicts:
	app/views/layouts/_stylesheets.html.haml
 2012-01-12 20:43:32 +04:00
George Vinogradov 73b710ae4e [close #76] Changed styles. Fixed bug with pagination. 2012-01-12 20:37:50 +04:00
konstantin.grabar f6e4de3b72 [refs #54] Fix issue assign user subscribe update filter 2012-01-12 17:07:54 +04:00
Alexander Machehin 07dc7a4800 [refs #18] add comments to commit 2012-01-12 17:19:22 +06:00
George Vinogradov 49082c2a8d [issue #76] Fixed bug with JSON generation. 2012-01-12 01:12:56 +04:00