Commit Graph

802 Commits

Author SHA1 Message Date
Vladimir Sharshov f9abc2d39c Hide participate projects 2012-01-28 04:25:11 +04:00
George Vinogradov a89db6f3a5 [issue #64] Fixed bug with multiword page names 2012-01-27 23:14:53 +04:00
George Vinogradov 324e9a294f [issue #64] Fixed some bugs. 2012-01-27 22:30:45 +04:00
George Vinogradov a4f95e3660 [issue #64] Changed editor toolbar. 2012-01-27 21:00:44 +04:00
Vladimir Sharshov e966e523e9 Merge pull request #132 from warpc/112-sync_projects
Auto sync for mandriva repo

* Apply rsync for mandriva repo
* Parse and import changes from official repo
* Fix attachment types
* Redo srpm upload wrapper to use it without paperclip
* Add cron task through whenever
2012-01-27 08:46:58 -08:00
Pavel Chipiga 74f891fc83 Apply rsync for mandriva repo. Parse and import changes from official repo. Fix attachment types. Redo srpm upload wrapper to use it without paperclip. Add cron task through whenever. Refs #112 2012-01-27 17:35:18 +02:00
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
Alexander Machehin 06ab99a1d0 [refs #114] add js 2012-01-27 18:20:07 +06:00
George Vinogradov eed3040944 [issue #64] Changed validation message and removed unnecessary
validation of projects owner.
2012-01-27 10:13:56 +04:00
Vladimir Sharshov 45c175942b Temporary change arch for mass rebuild 2012-01-27 05:00:44 +04:00
George Vinogradov 2d1e36fb1a [issue #64] Changed own_projects validation. 2012-01-27 04:16:07 +04:00
George Vinogradov ba84d5f216 [issue #64] Added validation of own_projects count. 2012-01-27 03:37:19 +04:00
George Vinogradov 1498e937f6 [issue #64] Added own_projects counters to User & Group 2012-01-27 02:33:18 +04:00
George Vinogradov b04a9e0176 [issue #64] Removed duplicated authorization. 2012-01-27 00:51:11 +04:00
Alexander Machehin e71a9e84cb [refs #114] emails control 2012-01-27 02:11:07 +06: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
Alexander Machehin e04b2eb59b Merge branch '114-comment_notifications' into user-emails-list
Conflicts:
	app/models/subscribe.rb
	config/locales/en.yml
2012-01-26 14:55:16 +06:00
Alexander Machehin 77420d2a8f [refs #114] user emails 2012-01-26 14:53:40 +06:00
Pavel Chipiga 374628a216 Render answer before publication trying to avoid bug. Refs #97 2012-01-26 00:28:11 +02:00
Alexander Machehin 8f5951acb9 Merge branch 'fix-email-i18n' into 114-comment_notifications 2012-01-25 23:33:41 +06:00
Alexander Machehin 4cca8f7bb1 [refs #114] some refactoring 2012-01-25 23:33:26 +06:00
Alexander Machehin 82339dcb34 send email in user's language 2012-01-25 14:28:00 +06:00
Alexander Machehin b7c2b4d35b [refs #114] fix email bug 2012-01-25 13:21:41 +06:00
Pavel Chipiga 60c1153d49 Save with validation. Refs #31 2012-01-24 23:29:23 +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
Pavel Chipiga 3f4bf65825 Upgrade paperclip. Apply srpm_import script and UI. Fix specs. Refs #31 2012-01-24 22:35:36 +02:00
Alexander Machehin 61be317b21 [refs #114] i18n 2012-01-25 01:00:51 +06:00
Alexander Machehin 6df1640485 [refs #114] fix logics 2012-01-24 18:18:39 +06:00
Vladimir Sharshov 7e1a26000e Fix for "undefined method `<<' for nil:NilClass" 2012-01-24 01:12:42 +04:00
Alexander Machehin 9127b6b689 [refs #114] changed logics 2012-01-24 01:42:54 +06:00
Vladimir Sharshov c3f415e90c Add new build status for Item 2012-01-23 22:11:53 +04:00
Vladimir Sharshov e1a4dd5ab5 Fix branch name for mass rebuild
Fix error in include_repos
2012-01-23 21:07:09 +04:00
Vladimir Sharshov 733adaf111 Update build_for for new requirements 2012-01-23 20:19:10 +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
Alexander Machehin 651c5637ed [refs #114] fix committer notification 2012-01-22 23:49:41 +06:00
Alexander Machehin f1f6d1b78b [refs #114] email i18n 2012-01-22 22:19:00 +06:00
Alexander Machehin f0d7ed0d89 [refs #114] fix notification for committer 2012-01-22 22:17:08 +06:00
Alexander Machehin ab081d3c46 [refs #114] only new comment notification 2012-01-22 22:15:25 +06:00
Alexander Machehin 36a895385c [refs #114] changed rules 2012-01-22 01:13:33 +06:00
Alexander Machehin 21d422c313 [refs #114] refactoring subscribe 2012-01-21 19:32:22 +06:00
George Vinogradov d939edda8f [issue #64] Fixed some bugs. 2012-01-21 02:11:46 +04:00
Vladimir Sharshov c6836e2978 Merge pull request #121 from warpc/113-file_mime_types
[Close #113] Images render and download href for binary data into blobs
2012-01-20 11:10:16 -08:00
konstantin.grabar f46b179486 [refs #113] Add json to mime types list 2012-01-20 22:40:00 +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
Alexander Machehin d8df6c6279 [refs #114] committer subscribe + some tests 2012-01-21 00:22:25 +06:00
Alexander Machehin 06a977ea21 Merge branch 'master' into 114-comment_notifications 2012-01-20 22:03:04 +06:00
Alexander Machehin 371abac031 [refs #114] fix controller tests 2012-01-20 21:17:05 +06:00
George Vinogradov 23573a1a07 [issue #64] Added creation wiki to project. 2012-01-20 19:10:30 +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
Vladimir Sharshov bae56741d0 Temporary disable AutoBuild functions for users (not working at now) 2012-01-20 12:24:57 +04:00
George Vinogradov 364f2e40c0 [issue #64] Added Wiki history, compare, revert. 2012-01-20 03:25:15 +04:00
Alexander Machehin 800b02f544 [refs #18] Add project subsribe, tests 2012-01-20 00:20:03 +06: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 552aa0a58a [issue #64] Fixed bug with sidebar and footer. 2012-01-19 17:48:29 +04:00
George Vinogradov 538e3da8c8 [issue #64] Added search through wiki 2012-01-19 16:10:50 +04:00
George Vinogradov 65e659ad49 [issue #64] Some changes in preview. 2012-01-19 16:09:55 +04:00
George Vinogradov 32b64d3462 [issue #64] Minor fixes in WikiController 2012-01-19 16:07:08 +04:00
George Vinogradov 022a013b79 [issue #64] Added Wiki seeding on create. 2012-01-19 16:06:27 +04:00
George Vinogradov a03690a9f7 [issue #64] Some views restuct. 2012-01-19 01:14:12 +04:00
konstantin.grabar bd6abf2681 [refs #105] Add locale fixes 2012-01-19 00:58:38 +04:00
Alexander Machehin dba11f4662 [refs #114] FIXME subscribers 2012-01-19 01:12:52 +06:00
Alexander Machehin 71447a29e3 [refs #114] add settings for commits notifications 2012-01-19 00:20:08 +06:00
George Vinogradov 2af0135fb5 [issue #64] Added All Pages representation. 2012-01-18 19:09:25 +04:00
George Vinogradov 0386c34246 [issue #64] Added page deletion. 2012-01-18 18:33:35 +04:00
George Vinogradov 7afcc3a617 [issue #64] Some fixes. 2012-01-18 18:33:09 +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
konstantin.grabar 01d8cd8dcc [refs #105] Change LANGUAGE constant into User 2012-01-18 17:06:18 +04:00
George Vinogradov 931aef4db6 [issue #64] Fixed some bugs in templates. 2012-01-18 04:47:01 +04:00
George Vinogradov a608ded8c4 [issue #76] Fixed potential bug in redirects 2012-01-18 04:44:42 +04:00
George Vinogradov d3b32e4d6d [issue #64] Fixed bug with preview page. 2012-01-18 04:43:36 +04:00
George Vinogradov 407130f3d7 [issue #64] Minor fix in WikiController#show. 2012-01-18 03:46:44 +04:00
George Vinogradov 2522dd3c63 [issue #64] Added page history views. 2012-01-18 03:30:54 +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 a0aad7103e some fixes 2012-01-17 17:38:40 +06:00
Pavel Chipiga fab62c548f Hide container_path if build_list published. Cleanup translations. Refs #100 2012-01-17 13:04:50 +02:00
Alexander Machehin 95b4e2557c [refs #18] forgot comments order 2012-01-17 16:30:11 +06: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
George Vinogradov 62922c30a3 [issue #64] Added search partial. 2012-01-17 04:05:07 +04: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 e10dd56dff [refs #18] refactoring 2012-01-16 13:28:30 +06: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