a83d64eaab
[refs #150 ] Fix collaborators cancan authorize
2012-02-06 19:04:56 +04:00
edd2ae2d86
Merge pull request #159 from warpc/158-blob_controller_raw
...
[fix #158 , #161 ] Fixed bug with render in BlobController#raw and undefined method `to_sym' for ["Creole", "creole"]
2012-02-05 23:56:36 -08:00
0591ba4378
[ fix #158 ] Fixed bug with render in BlobController#raw
2012-02-04 22:03:29 +04:00
829953372d
Merge pull request #154 from warpc/64-fix_forbidden_redirect
...
[refs #64 ] fixed forbidden redirection after signin
2012-02-03 07:38:40 -08:00
87abfb4352
[refs #64 ] fixed forbidden redirection after signin
2012-02-03 21:28:19 +06:00
2c9345b976
Merge pull request #152 from warpc/144-fix-group-render
...
На странице групп отображаются кнопки Edit, Erase всем пользователям.
2012-02-03 05:59:44 -08: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
2162a75fc8
Merge pull request #149 from warpc/64-project_wiki
...
Fixes in wiki
2012-02-02 16:16:04 -08: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
72a6edd86b
Fix missing localization[Refs #64 , Refs #139 ]
2012-02-03 01:47:35 +04:00
26923740ad
Hot fix for en yml
...
Add new schema.rb
2012-02-03 01:30:08 +04:00
a2ebfdf164
Merge pull request #120 from warpc/64-project_wiki
...
Project wiki(full functions) [Refs #64 ]
Limit project per user or group [Refs #116 ]
2012-02-02 13:21:25 -08:00
06fa8f489f
Return original translation
2012-02-03 01:14:41 +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
b4be56d518
Remove unused gems
2012-02-03 00:34:55 +04:00
68c97b3a33
[refs #64 ] some template fixes
2012-02-03 00:46:33 +06:00
9730e5e095
[issue #64 ] DJ version set to 2.1.4
2012-02-02 18:29:35 +04: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
7c93f684cf
Merge pull request #146 from warpc/fix-autocomplete-group
...
Fix autocomplete for group in porjects for collaborators [Fix #145 ]
2012-02-01 13:24:47 -08: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
92a8e591de
Merge pull request #142 from warpc/127-build-lists-filter-refactor
...
[Done #127 ] Reduced the query string for monitoring page
2012-02-01 10:18:11 -08:00
502f06b65f
[refs #127 ] Make route more short
2012-02-01 22:13:42 +04:00
0559f1b678
[refs #127 ] Filter request refactor
2012-02-01 20:00:19 +04:00
25bea5ae31
Update IP for iso build client
2012-02-01 14:54:58 +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
f8f76302b4
Merge pull request #141 from warpc/112-sync_projects
...
Fixes and improves for auto sync (Refs #112 )
* 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
2012-01-31 11:27:23 -08:00
aa9652409c
[refs #114 ] clean
2012-02-01 01:15:53 +06: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
7848681e2f
Remove unused gems, add newrelic support in development mode
2012-01-31 02:46:02 +04: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
224ce4ec8d
Merge pull request #137 from warpc/95-upgrade_ruby
...
Upgrade ruby and fix bugs (Refs #95 )
* 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
* Add magic encodings
* Fix staging deploy
2012-01-30 13:28:18 -08:00
07e71c2dfc
[issue #64 ] Changed find_by to where
2012-01-31 01:20:03 +04:00
61647e4d1b
Do not store .rvmrc. Refs #95
2012-01-30 23:09:24 +02: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
5126aa796c
Ensure import branch always exists. Refs #112
2012-01-30 18:23:10 +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
konstantin.grabar
Vladimir Sharshov
George Vinogradov
Alexander Machehin
George Vinogradov
Pasha
Pavel Chipiga