Alexander Machehin
|
f6b6bbfb54
|
Revert "[refs #114] emails control"
This reverts commit 26fb1fcbfb843163231d8b8f0caf582bafccbe57.
Conflicts:
app/models/subscribe.rb
app/models/user.rb
spec/models/comment_for_commit_spec.rb
|
2012-01-30 12:19:54 +06:00 |
Alexander Machehin
|
dc39eefe62
|
Revert "[refs #114] add js"
This reverts commit 48a9c4d50b9f11a11cc4f2c5831c4b5b25fdc4d1.
|
2012-01-30 12:16:09 +06:00 |
Alexander Machehin
|
06ab99a1d0
|
[refs #114] add js
|
2012-01-27 18:20:07 +06:00 |
Alexander Machehin
|
e71a9e84cb
|
[refs #114] emails control
|
2012-01-27 02:11:07 +06: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 |
Alexander Machehin
|
61be317b21
|
[refs #114] i18n
|
2012-01-25 01:00:51 +06:00 |
Alexander Machehin
|
9127b6b689
|
[refs #114] changed logics
|
2012-01-24 01:42:54 +06:00 |
Alexander Machehin
|
06a977ea21
|
Merge branch 'master' into 114-comment_notifications
|
2012-01-20 22:03:04 +06:00 |
Vladimir Sharshov
|
59c7faf5c1
|
Fix localization file (here was dragons!)
|
2012-01-20 02:07:42 +04:00 |
Vladimir Sharshov
|
25bd2cd13d
|
Fix for localization files
|
2012-01-20 00:33:28 +04:00 |
Vladimir Sharshov
|
3206258f7b
|
Change default locale to English
|
2012-01-20 00:06:43 +04:00 |
Vladimir Sharshov
|
a5c2bcdd85
|
Fix email host address
|
2012-01-20 00:06:09 +04:00 |
Pavel Chipiga
|
b5f0124f91
|
Add pids symlink generation task. Refs #110
|
2012-01-19 21:21:15 +02:00 |
Alexander Machehin
|
800b02f544
|
[refs #18] Add project subsribe, tests
|
2012-01-20 00:20:03 +06:00 |
Vladimir Sharshov
|
5a6f5b51c0
|
Upgrade capistrano receipts:
* add application env files;
* remove unused ui deploy;
* clear main deploy config.
|
2012-01-19 20:20:30 +04: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 |
Alexander Machehin
|
71447a29e3
|
[refs #114] add settings for commits notifications
|
2012-01-19 00:20:08 +06:00 |
Pasha
|
4ba268dd67
|
Merge pull request #109 from warpc/18-commit_comments
18 commit comments
|
2012-01-18 05:49:57 -08:00 |
konstantin.grabar
|
bbbf17c2b4
|
[refs #105] Merge master with 105-internationalization
|
2012-01-17 17:58:49 +04:00 |
konstantin.grabar
|
726eddc40e
|
[refs #105] Add internationalization support to project
|
2012-01-17 15:48:40 +04: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
|
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
|
52696791f2
|
[refs #54, #94] Merge master into issues
|
2012-01-16 13:42:44 +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 |
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
|
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
|
636c90e6e4
|
[refs #18] add some I18n
|
2012-01-12 20:27:45 +06:00 |
Alexander Machehin
|
07dc7a4800
|
[refs #18] add comments to commit
|
2012-01-12 17:19:22 +06:00 |
konstantin.grabar
|
2b8aca5f09
|
[refs #54] Add settings notifier
|
2012-01-11 17:58:13 +04:00 |
George Vinogradov
|
7c50b2c3f5
|
[issue #76] Added jQuery DataTable. But it doesn't work yet
|
2011-12-31 02:42:58 +04: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 |
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 |
konstantin.grabar
|
fa8656d1f5
|
[refs #54] Refactor subscires routes and authorize
|
2011-12-28 17:54:45 +04:00 |
konstantin.grabar
|
1c263c6e0a
|
[refs #54] Notification DJ support. Routes fixes.
|
2011-12-28 14:47:54 +04:00 |
konstantin.grabar
|
a783b460bd
|
Merge issues with master
|
2011-12-28 13:22:57 +04:00 |
Pavel Chipiga
|
5e3addd5d2
|
Great refactor for cancan abilities. Remove product relations. Fix git abilities. Fix and refactor specs. Refs #85. Refactor issues controller to avoid serial_id problem. Fix links and routes. Fix minor bugs and translations. Fix specs. Refs #54
|
2011-12-28 04:59:05 +02:00 |
konstantin.grabar
|
d3ba83135e
|
[refs #54] Add some locales and interface fixes for issues
|
2011-12-27 17:18:25 +04:00 |
konstantin.grabar
|
8face9208e
|
[refs #54] Add fixes and locales to subscribes
|
2011-12-27 16:35:31 +04:00 |
konstantin.grabar
|
ce6746f7a9
|
[refs #54] Add subscribes and notifications
|
2011-12-26 19:48:57 +04:00 |
konstantin.grabar
|
5237939f49
|
Merge issues with master
|
2011-12-26 13:26:13 +04:00 |
konstantin.grabar
|
bf2f3d1bc7
|
[refs #54] Add issue statuses filters
|
2011-12-23 18:34:32 +04:00 |
Pavel Chipiga
|
a82f59f35a
|
Add route, action and statuses for publish_build. Apply status assign and check. Localize statuses. Convert tabs to spaces. Refs #80
|
2011-12-22 02:53:55 +02:00 |
Pavel Chipiga
|
2c67843c34
|
Refactor and cleanup build_lists controller and routes. Rename methods. Allow deffis in platform and repository name. Add missing relation and migration to force work user assign in build_lists. Fix and simplify links. Abstract sidebar. Refs #65
|
2011-12-21 23:42:06 +02:00 |
Pavel Chipiga
|
a61d211862
|
Fix bugs. Change included_repos format. Refs #65
|
2011-12-21 20:59:19 +02:00 |
Pavel Chipiga
|
e588482f32
|
[#74] Merge branch 'master' into 65-build_repo
Conflicts:
app/controllers/build_lists_controller.rb
app/controllers/projects_controller.rb
db/schema.rb
|
2011-12-21 20:13:57 +02:00 |
konstantin.grabar
|
3ab55d34b8
|
[refs #54] Add CanCan rules for issues and comments. Fix serial_id routes and some actions
|
2011-12-21 18:48:16 +04:00 |