a83d64eaab
[refs #150 ] Fix collaborators cancan authorize
2012-02-06 19:04:56 +04:00
0591ba4378
[ fix #158 ] Fixed bug with render in BlobController#raw
2012-02-04 22:03:29 +04:00
87abfb4352
[refs #64 ] fixed forbidden redirection after signin
2012-02-03 21:28:19 +06:00
b0d0b21ec4
[refs #144 ] fix template
2012-02-03 19:40:47 +06:00
549fc242d8
[issue #64 ] Fixed bug in _history partial
2012-02-03 04:23:29 +04:00
a2f07fad10
Merge branch '64-project_wiki' of github.com:warpc/rosa-build into 64-project_wiki
2012-02-03 04:05:18 +04:00
e05f391f8e
[issue #64 ] Write User.uname instead of User.name to commit
2012-02-03 04:04:20 +04:00
4165b188eb
Merge branch 'master' into 64-project_wiki
...
Conflicts:
app/models/project.rb
config/locales/en.yml
2012-02-03 00:55:16 +04:00
68c97b3a33
[refs #64 ] some template fixes
2012-02-03 00:46:33 +06:00
821062c150
Merge branch '64-project_wiki' of github.com:warpc/rosa-build into 64-project_wiki
2012-02-02 03:18:53 +04:00
4cd20934c4
[issue #64 ] Removed unused MathJax
2012-02-02 03:17:16 +04:00
0006bf3b63
Returned before_initialize to Group.
2012-02-02 01:20:10 +04:00
cb7a9fcc21
fix group autocomplete
2012-02-02 02:42:23 +06:00
20613ba2c3
[refs #64 ] All pages:
2012-02-02 01:36:56 +06:00
8562b882da
Merge pull request #136 from warpc/114-comment_notifications
...
Notifications and subscribtions about new comments in commit [Refs #114 ]
2012-02-01 11:12:24 -08:00
d0717c8f9e
[issue #64 ] Merge branch 'master' into 64-project_wiki
...
Conflicts:
Gemfile.lock
db/schema.rb
2012-02-01 22:39:04 +04:00
b117ec1331
[issue #64 ] Yet another hacks.
2012-02-01 22:33:53 +04:00
0559f1b678
[refs #127 ] Filter request refactor
2012-02-01 20:00:19 +04:00
8733c4dc34
[issue #64 ] Some dirty hacks.
...
Diff for file with russian name don't work yet.
2012-02-01 03:20:42 +04:00
34b105675a
Add 1 more mime type to product
2012-01-31 23:29:25 +02:00
fde298cc85
Rollback to redhillonrails_core instead of schema_plus to avoid some bugs. Add platform reference to project_imports, change indexes and validators. Adjust sync algoritm to use platform_id. Improve rsync params. Refs #112 , #138
2012-01-31 20:48:37 +02:00
6f78e5456c
[issue #64 ] Changes for ruby 1.9.3 compatibility.
2012-01-31 20:40:46 +04:00
f15cb90b87
Merge branch 'master' into 114-comment_notifications
...
Conflicts:
config/locales/ru.yml
2012-01-31 21:42:37 +06:00
24124766f4
[issue #64 ] Merge branch 'master' into 64-project_wiki
...
Conflicts:
Gemfile.lock
config/locales/en.yml
db/schema.rb
2012-01-31 02:07:11 +04:00
07e71c2dfc
[issue #64 ] Changed find_by to where
2012-01-31 01:20:03 +04:00
13780a1b53
Add magic encodings. Refs #95
2012-01-30 22:39:34 +02:00
33dce21312
Upgrade to ruby 1.9.3 and fix bugs. Fix bug with commit_hash save during project build. Move some russian text to yml. Code cleanup. Fix templates, deploy and import scripts. Fix specs. Translate event_logs. Refs #95
2012-01-30 22:36:58 +02:00
2a27cd3662
[issue #64 ] Some fixes.
2012-01-30 19:27:54 +04:00
5f40030e30
[issue #64 ] Fixed bug with cloning wiki repository
2012-01-30 18:17:00 +04:00
119c378149
[refs #114 ] change subsrcibe status to boolean
2012-01-30 17:59:57 +06:00
2f315f869d
[issue #64 ] Merge branch 'master' into 64-project_wiki
...
Conflicts:
Gemfile.lock
app/models/project.rb
db/schema.rb
2012-01-30 13:27:22 +04:00
f7c58f6a77
[issue #64 ] Removed unnecessary files.
2012-01-30 13:12:18 +04:00
5efaca77cf
Merge branch 'master' into 114-comment_notifications
...
Conflicts:
app/models/project.rb
app/views/user_mailer/new_comment_notification.en.haml
app/views/user_mailer/new_comment_notification.ru.haml
app/views/user_mailer/new_comment_reply_notification.ru.haml
config/locales/devise.en.yml
config/locales/en.yml
config/locales/ru.yml
db/schema.rb
2012-01-30 13:06:06 +06:00
8962e85b2d
[refs #114 ] fix reverting
2012-01-30 12:38:31 +06:00
e0b7699ffd
Revert "Merge branch '114-comment_notifications' into user-emails-list"
...
This reverts commit 2179cbbf40334cbe5d4fa9ba3a7f297d8f543a0a, reversing
changes made to 9bf06e5e1a595f320dc4527ebd44f14be05fcd64.
Conflicts:
app/models/user.rb
2012-01-30 12:22:54 +06:00
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
dc39eefe62
Revert "[refs #114 ] add js"
...
This reverts commit 48a9c4d50b9f11a11cc4f2c5831c4b5b25fdc4d1.
2012-01-30 12:16:09 +06:00
ea7cbe1908
Revert "[refs #114 ] fix emails uniqueness"
...
This reverts commit bc9649561f5b8ac58f9b27d31d66365f16d0cce0.
Conflicts:
app/models/subscribe.rb
app/models/user_email.rb
2012-01-30 12:15:33 +06:00
255c39ef5a
Revert "Merge branch 'fix-email-i18n' into 114-comment_notifications"
...
This reverts commit 9bf06e5e1a595f320dc4527ebd44f14be05fcd64, reversing
changes made to f2bc0e67a91e6283f4881e754e5da95c59cf341b.
2012-01-30 12:09:52 +06:00
2e2e7e43d3
[refs #114 ] some refactoring
2012-01-30 02:18:14 +06:00
706c052a5e
[issue #64 ] User names are clickable.
2012-01-29 22:03:42 +04:00
1ef2bc0f75
[issue #64 ] Actions authorization moved to filters
2012-01-29 22:02:18 +04:00
39a4479fa3
[refs #114 ] fix emails uniqueness
2012-01-29 22:27:46 +06:00
acdd1f22b6
[issue #64 ] Fixed bug with revert all wiki.
2012-01-28 16:10:43 +04:00
cd41980441
Merge pull request #135 from warpc/112-sync_projects
...
Доработки автоматической синхронизации
2012-01-27 18:38:31 -08:00
43a4aecc66
Change indexes to composite, unique, case insensitive. Redo sync logging. Verbose params for tasks. Refs #112
2012-01-28 04:05:31 +02:00
aa5641da2f
[issue #64 ] Fixed CanCan bugs.
2012-01-28 06:05:13 +04:00
2ab039cc62
[issue #64 ] Some fixes in view.
2012-01-28 05:56:27 +04:00
fab4aa6eb6
Refactor and fix projects by_name scope. Apply case insensitive projects, repositories and platforms name uniqness validation. Apply case insensitive project search fallback. Redirect import task outnput to log file. Rename all task. Refs #112
2012-01-28 03:04:11 +02:00
f9abc2d39c
Hide participate projects
2012-01-28 04:25:11 +04:00
konstantin.grabar
George Vinogradov
Alexander Machehin
Vladimir Sharshov
Pavel Chipiga
Pasha