Commit Graph

1281 Commits

Author SHA1 Message Date
George Vinogradov 022a013b79 [issue #64] Added Wiki seeding on create. 2012-01-19 16:06:27 +04:00
Alexander Machehin 221712c3a9 Merge pull request #117 from warpc/add_english_localization
Add english localization. Refs #105
2012-01-19 01:57:52 -08:00
Alexander Machehin 3994abd6ed [refs #105] fix 2012-01-19 15:53:19 +06:00
Vladimir Sharshov 14fdc35eb9 Add english localization. Refs #105 2012-01-19 13:34:05 +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
George Vinogradov 8a1486664f [issue #64] Fixed typo 2012-01-18 18:19:52 +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
Vladimir Sharshov 5073ab4f00 Merge pull request #111 from warpc/103-bl_publish_new_params
Replace annotated tags to lightweight. Improve specs. Restore lost migrations. Refs #103
2012-01-17 09:45:18 -08: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
Pavel Chipiga b5170e2f2a Write specs for tag based build. Refs #103 2012-01-17 14:25:54 +02: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
Vladimir Sharshov 7d65e89ca8 Merge pull request #107 from warpc/100-hide_container
Hide container_path if build_list published. Cleanup translations. Refs #100
2012-01-17 03:14:34 -08: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
konstantin.grabar ee58a8e789 [refs #54] Fix comments failed specs 2012-01-17 12:20:06 +04: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
Vladimir Sharshov 68744b1676 Fix broken tests in #94 from pull request #92 2012-01-17 01:07:48 +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
Vladimir Sharshov cec8314439 Merge pull request #92 from warpc/issues
[refs #54, #94] Fix comments and issues bugs. Add new notification settings.
2012-01-16 08:28:49 -08:00
Alexander Machehin 69debdd83e fix tests for shared elements 2012-01-16 19:43:23 +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 674d5f8e56 [refs #18] model tests 2012-01-14 18:36:00 +06:00
Alexander Machehin bdc3b3a3d1 [refs #18] controller tests 2012-01-14 18:16:42 +06:00
Vladimir Sharshov b98edf9bf6 Merge pull request #104 from warpc/103-bl_publish_new_params
Refs #103. Save data about version and release when publish container
2012-01-13 12:46:00 -08:00
Pavel Chipiga 712ca8d95a Save package_version during success build_list publish. Add specs. Refs #103 2012-01-13 18:45:13 +02:00