Alexander Machehin
|
325667dde0
|
[refs #168] removed wrong ability
|
2012-02-07 17:31:00 +06:00 |
Vladimir Sharshov
|
ff6c855234
|
Merge pull request #170 from warpc/155-fix_render_event_logs
[refs #155] fix render event logs
|
2012-02-07 01:35:21 -08:00 |
Alexander Machehin
|
86704bc39d
|
[refs #155] fix render event logs
|
2012-02-07 15:31:07 +06:00 |
Vladimir Sharshov
|
a1fcc62768
|
Merge pull request #167 from warpc/143-fix-destroy-group
[Fixs #143] Group dooes not destroy personal platfrom when deleting
|
2012-02-07 00:02:13 -08:00 |
Alexander Machehin
|
36f609ec7d
|
[refs #143] fix destroy
|
2012-02-07 01:47:39 +06:00 |
Vladimir Sharshov
|
4e3d6b4056
|
Show xml-rpc error code in error message
|
2012-02-06 19:07:08 +04:00 |
Vladimir Sharshov
|
c367fc818b
|
Merge branch 'master' of github.com:warpc/rosa-build
|
2012-02-06 19:05:50 +04:00 |
konstantin.grabar
|
a83d64eaab
|
[refs #150] Fix collaborators cancan authorize
|
2012-02-06 19:04:56 +04:00 |
Vladimir Sharshov
|
2f2ce5b9d2
|
Merge pull request #160 from warpc/151-grit_encodings_problems
[issue #151] Fix for view the russian texts in Git
|
2012-02-06 07:03:40 -08:00 |
Alexander Machehin
|
70346f0015
|
[refs #151] refactoring
|
2012-02-06 20:12:33 +06:00 |
Alexander Machehin
|
a79a081fd1
|
Merge branch 'master' into 151-grit_encodings_problems
|
2012-02-06 19:55:59 +06:00 |
Vladimir Sharshov
|
4f17968b3b
|
Merge pull request #164 from warpc/163-fix-commits-index
[refs #163] fix commits list(always show master branch)
|
2012-02-06 05:34:41 -08:00 |
Alexander Machehin
|
60ec9867bb
|
[refs #163] fix commits list
|
2012-02-06 18:58:45 +06:00 |
Vladimir Sharshov
|
0bc0f7fde5
|
Merge pull request #162 from warpc/134-git-hook
[refs #134] add post receive hook to repos
|
2012-02-06 02:32:29 -08:00 |
Alexander Machehin
|
fde67a2c22
|
[refs #134] add post receive hook to repos
|
2012-02-06 15:31:22 +06:00 |
Vladimir Sharshov
|
427fc670ac
|
Merge branch 'master' of github.com:warpc/rosa-build
|
2012-02-06 11:57:09 +04:00 |
Vladimir Sharshov
|
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 |
George Vinogradov
|
f2bfcf8699
|
[issue #151] Probably fixed.
|
2012-02-05 00:12:37 +04:00 |
George Vinogradov
|
0591ba4378
|
[fix #158] Fixed bug with render in BlobController#raw
|
2012-02-04 22:03:29 +04:00 |
Vladimir Sharshov
|
28da24d020
|
Merge branch 'master' of github.com:warpc/rosa-build
|
2012-02-03 19:49:56 +04:00 |
Vladimir Sharshov
|
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 |
Alexander Machehin
|
87abfb4352
|
[refs #64] fixed forbidden redirection after signin
|
2012-02-03 21:28:19 +06:00 |
Vladimir Sharshov
|
85c0d8b827
|
Change git branch for mass rebuild
|
2012-02-03 18:32:04 +04:00 |
George Vinogradov
|
2c9345b976
|
Merge pull request #152 from warpc/144-fix-group-render
На странице групп отображаются кнопки Edit, Erase всем пользователям.
|
2012-02-03 05:59:44 -08:00 |
Alexander Machehin
|
b0d0b21ec4
|
[refs #144] fix template
|
2012-02-03 19:40:47 +06:00 |
George Vinogradov
|
549fc242d8
|
[issue #64] Fixed bug in _history partial
|
2012-02-03 04:23:29 +04:00 |
Pasha
|
2162a75fc8
|
Merge pull request #149 from warpc/64-project_wiki
Fixes in wiki
|
2012-02-02 16:16:04 -08:00 |
George Vinogradov
|
a2f07fad10
|
Merge branch '64-project_wiki' of github.com:warpc/rosa-build into 64-project_wiki
|
2012-02-03 04:05:18 +04:00 |
George Vinogradov
|
e05f391f8e
|
[issue #64] Write User.uname instead of User.name to commit
|
2012-02-03 04:04:20 +04:00 |
Vladimir Sharshov
|
72a6edd86b
|
Fix missing localization[Refs #64, Refs #139]
|
2012-02-03 01:47:35 +04:00 |
Vladimir Sharshov
|
26923740ad
|
Hot fix for en yml
Add new schema.rb
|
2012-02-03 01:30:08 +04:00 |
Vladimir Sharshov
|
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 |
Vladimir Sharshov
|
06fa8f489f
|
Return original translation
|
2012-02-03 01:14:41 +04:00 |
Vladimir Sharshov
|
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 |
Vladimir Sharshov
|
b4be56d518
|
Remove unused gems
|
2012-02-03 00:34:55 +04:00 |
Alexander Machehin
|
68c97b3a33
|
[refs #64] some template fixes
|
2012-02-03 00:46:33 +06:00 |
George Vinogradov
|
9730e5e095
|
[issue #64] DJ version set to 2.1.4
|
2012-02-02 18:29:35 +04:00 |
George Vinogradov
|
821062c150
|
Merge branch '64-project_wiki' of github.com:warpc/rosa-build into 64-project_wiki
|
2012-02-02 03:18:53 +04:00 |
George Vinogradov
|
4cd20934c4
|
[issue #64] Removed unused MathJax
|
2012-02-02 03:17:16 +04:00 |
Vladimir Sharshov
|
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 |
George Vinogradov
|
0006bf3b63
|
Returned before_initialize to Group.
|
2012-02-02 01:20:10 +04:00 |
Alexander Machehin
|
cb7a9fcc21
|
fix group autocomplete
|
2012-02-02 02:42:23 +06:00 |
Alexander Machehin
|
20613ba2c3
|
[refs #64] All pages:
|
2012-02-02 01:36:56 +06:00 |
Vladimir Sharshov
|
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 |
George Vinogradov
|
d0717c8f9e
|
[issue #64] Merge branch 'master' into 64-project_wiki
Conflicts:
Gemfile.lock
db/schema.rb
|
2012-02-01 22:39:04 +04:00 |
George Vinogradov
|
b117ec1331
|
[issue #64] Yet another hacks.
|
2012-02-01 22:33:53 +04:00 |
Vladimir Sharshov
|
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 |
konstantin.grabar
|
502f06b65f
|
[refs #127] Make route more short
|
2012-02-01 22:13:42 +04:00 |
konstantin.grabar
|
0559f1b678
|
[refs #127] Filter request refactor
|
2012-02-01 20:00:19 +04:00 |
Vladimir Sharshov
|
25bea5ae31
|
Update IP for iso build client
|
2012-02-01 14:54:58 +04:00 |