Commit Graph

988 Commits

Author SHA1 Message Date
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
Vladimir Sharshov 68744b1676 Fix broken tests in #94 from pull request #92 2012-01-17 01:07:48 +04: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
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 2b1fe79adc [refs #18] controller tests 2012-01-13 22:00:28 +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
santaux 80d6d105f6 Merge pull request #102 from warpc/76-project_autocomplete
Added forgotten files.
2012-01-13 05:52:19 -08:00
George Vinogradov 8d35c14fc1 [update #76] Added forgotten files. 2012-01-13 17:48:48 +04:00
Vladimir Sharshov d938d49e18 Merge pull request #99 from warpc/76-project_autocomplete
Added ajax find where adding project to repository. Close #99
2012-01-12 11:11:03 -08:00
George Vinogradov f8177f88ad [update #76] Removed unnecessary files. 2012-01-12 22:46:56 +04:00
Alexander Machehin f910c7cdcf Merge branch '18-commit_comments' of github.com:warpc/rosa-build into 18-commit_comments
вот жешь фак
2012-01-13 00:12:37 +06: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
Alexander Machehin caf7adef70 [refs #18] FIXME subscribe don't work 2012-01-12 20:50:27 +06:00
Vladimir Sharshov 52ef6f9f70 Merge pull request #98 from warpc/97-auto_publish_bug
Fix auto publications. Fix #72 and close #97
2012-01-12 06:48:52 -08:00
Alexander Machehin 630346d2e3 [refs #18] fix cancel button 2012-01-12 20:48:08 +06:00
Alexander Machehin 636c90e6e4 [refs #18] add some I18n 2012-01-12 20:27:45 +06:00
konstantin.grabar 980e455b31 [refs #54] Fix comment deliver notification user check 2012-01-12 17:45:22 +04:00
konstantin.grabar f6e4de3b72 [refs #54] Fix issue assign user subscribe update filter 2012-01-12 17:07:54 +04:00
Alexander Machehin f8d00f5235 [refs #18] Fix cancan ability for commit comments 2012-01-12 18:04:16 +06: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
Pavel Chipiga c23312ad51 Research and fix problem with build_lists#auto_publish feature. Fix specs. Refs #97 2012-01-11 21:43:33 +02:00
Alexander Machehin 4193360444 [refs #18] add comments to commit 2012-01-12 00:15:35 +06:00
Alexander Machehin c18b71bf0b [refs #18] changed refs id to string 2012-01-12 00:10:23 +06:00
konstantin.grabar 2b8aca5f09 [refs #54] Add settings notifier 2012-01-11 17:58:13 +04:00
konstantin.grabar dda40d9e9d [refs #54] Mailer specs for comments and issues 2012-01-11 11:12:23 +04:00
konstantin.grabar 60a7f3e87f [refs #54] Fix comments specs 2012-01-10 15:24:43 +04:00
konstantin.grabar 4132c336d6 [refs #54] Fix comment update path 2011-12-31 14:55:49 +04:00
konstantin.grabar 16c9d0ec15 [refs #54] Fix some bugs of issues and comments + add comment body to email 2011-12-31 14:51:47 +04:00
George Vinogradov 7c50b2c3f5 [issue #76] Added jQuery DataTable. But it doesn't work yet 2011-12-31 02:42:58 +04:00
Vladimir Sharshov 921238572b Merge pull request #87 from warpc/issues
Issues(#54):
* Subscribes
* Tests
* New interface
2011-12-30 06:52:38 -08:00
konstantin.grabar a44530980e [refs #54] Remove some unnessacary comments 2011-12-30 18:44:47 +04:00
konstantin.grabar e8977a7d95 Merger issues with master 2011-12-30 18:23:16 +04:00
konstantin.grabar 3f72082e0e [refs #54] Add comments, subscribes models specs. Finish subscribes controller specs. Some ability.rb fixes 2011-12-30 18:21:08 +04:00
George Vinogradov 782b311983 [issue #76] Changed project list in repositories. 2011-12-29 22:16:39 +04:00
konstantin.grabar 402133aff6 [refs #54] Add some subscribe specs and factory 2011-12-29 21:03:53 +04:00
konstantin.grabar 635e2b7977 [refs #54] Add comments specs and factory. Remove unused code. Add one delay and fix some links. 2011-12-29 15:16:54 +04:00
santaux 86ebaa7817 Merge pull request #91 from warpc/72-auto_publish
Автоматическая публикация сборки
2011-12-29 00:31:05 -08:00
Pavel Chipiga acb970686c Apply auto_publish for build_lists. Apply publish build_list error status. Remove circle build info. Display auto_publish info. Fix bugs. Refactor. Apply specs for all build_lists core callbacks. Refs #72 2011-12-29 04:37:34 +02:00