George Vinogradov
ffe2608c32
[issue #133 ] Some makeup and a lot of encodings magic
2012-02-09 04:27:26 +04:00
George Vinogradov
e23a02d357
[issue #133 ] Some fixes in Git::Repository#update_file
2012-02-09 04:03:40 +04:00
Pavel Chipiga
7223b7deb9
Upgrade rails, devise, delayed_jobs and other gems. Fix dependencies. Apply assets pipeline, add to deploy. Refactor and cleanup Gemfile. Fix after upgrade bugs. Redo commentable_id from string to decimal. Refactor and code cleanup. Apply basic new design. Refactor main template. Automate menus. Improve translations. Refs #96
2012-02-09 01:46:25 +02:00
George Vinogradov
d44a274c77
[issue #133 ] Fixed bug and added comments
2012-02-09 00:56:18 +04:00
Vladimir Sharshov
e9f3b79bd2
Merge pull request #176 from warpc/169-fix_create_build_list
...
[refs #169 ] fix creating build list for empty build version
2012-02-08 10:21:40 -08:00
George Vinogradov
74d401d087
[issue #133 ] Writed draft of web editing.
2012-02-08 21:51:30 +04:00
Alexander Machehin
02217752af
[refs #169 ] fix creating build list on empty repository
2012-02-08 17:07:16 +06:00
Alexander Machehin
c47db56270
[refs #168 ] can read repos in the open platform
2012-02-07 19:55:45 +06:00
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
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
Alexander Machehin
60ec9867bb
[refs #163 ] fix commits list
2012-02-06 18:58:45 +06: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
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
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
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
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
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
Alexander Machehin
68c97b3a33
[refs #64 ] some template fixes
2012-02-03 00:46:33 +06: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
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
konstantin.grabar
0559f1b678
[refs #127 ] Filter request refactor
2012-02-01 20:00:19 +04:00
George Vinogradov
8733c4dc34
[issue #64 ] Some dirty hacks.
...
Diff for file with russian name don't work yet.
2012-02-01 03:20:42 +04:00
Pavel Chipiga
34b105675a
Add 1 more mime type to product
2012-01-31 23:29:25 +02:00
Pavel Chipiga
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
George Vinogradov
6f78e5456c
[issue #64 ] Changes for ruby 1.9.3 compatibility.
2012-01-31 20:40:46 +04:00
Alexander Machehin
f15cb90b87
Merge branch 'master' into 114-comment_notifications
...
Conflicts:
config/locales/ru.yml
2012-01-31 21:42:37 +06:00
George Vinogradov
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
George Vinogradov
07e71c2dfc
[issue #64 ] Changed find_by to where
2012-01-31 01:20:03 +04:00
Pavel Chipiga
13780a1b53
Add magic encodings. Refs #95
2012-01-30 22:39:34 +02:00
Pavel Chipiga
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
George Vinogradov
2a27cd3662
[issue #64 ] Some fixes.
2012-01-30 19:27:54 +04:00
George Vinogradov
5f40030e30
[issue #64 ] Fixed bug with cloning wiki repository
2012-01-30 18:17:00 +04:00
Alexander Machehin
119c378149
[refs #114 ] change subsrcibe status to boolean
2012-01-30 17:59:57 +06:00
George Vinogradov
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
George Vinogradov
f7c58f6a77
[issue #64 ] Removed unnecessary files.
2012-01-30 13:12:18 +04:00
Alexander Machehin
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
Alexander Machehin
8962e85b2d
[refs #114 ] fix reverting
2012-01-30 12:38:31 +06:00
Alexander Machehin
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
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
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
Alexander Machehin
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
Alexander Machehin
2e2e7e43d3
[refs #114 ] some refactoring
2012-01-30 02:18:14 +06:00
George Vinogradov
706c052a5e
[issue #64 ] User names are clickable.
2012-01-29 22:03:42 +04:00
George Vinogradov
1ef2bc0f75
[issue #64 ] Actions authorization moved to filters
2012-01-29 22:02:18 +04:00
Alexander Machehin
39a4479fa3
[refs #114 ] fix emails uniqueness
2012-01-29 22:27:46 +06:00
George Vinogradov
acdd1f22b6
[issue #64 ] Fixed bug with revert all wiki.
2012-01-28 16:10:43 +04:00
Pasha
cd41980441
Merge pull request #135 from warpc/112-sync_projects
...
Доработки автоматической синхронизации
2012-01-27 18:38:31 -08:00
Pavel Chipiga
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
George Vinogradov
aa5641da2f
[issue #64 ] Fixed CanCan bugs.
2012-01-28 06:05:13 +04:00
George Vinogradov
2ab039cc62
[issue #64 ] Some fixes in view.
2012-01-28 05:56:27 +04:00
Pavel Chipiga
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
Vladimir Sharshov
f9abc2d39c
Hide participate projects
2012-01-28 04:25:11 +04:00
George Vinogradov
a89db6f3a5
[issue #64 ] Fixed bug with multiword page names
2012-01-27 23:14:53 +04:00
George Vinogradov
324e9a294f
[issue #64 ] Fixed some bugs.
2012-01-27 22:30:45 +04:00
George Vinogradov
a4f95e3660
[issue #64 ] Changed editor toolbar.
2012-01-27 21:00:44 +04:00
Vladimir Sharshov
e966e523e9
Merge pull request #132 from warpc/112-sync_projects
...
Auto sync for mandriva repo
* Apply rsync for mandriva repo
* Parse and import changes from official repo
* Fix attachment types
* Redo srpm upload wrapper to use it without paperclip
* Add cron task through whenever
2012-01-27 08:46:58 -08:00
Pavel Chipiga
74f891fc83
Apply rsync for mandriva repo. Parse and import changes from official repo. Fix attachment types. Redo srpm upload wrapper to use it without paperclip. Add cron task through whenever. Refs #112
2012-01-27 17:35:18 +02:00
George Vinogradov
549f0a55e8
[issue #64 ] Merge branch 'master' into 64-project_wiki
...
Conflicts:
Gemfile.lock
app/models/project.rb
app/models/user.rb
app/views/projects/_form.html.haml
config/locales/ru.yml
db/schema.rb
2012-01-27 18:27:23 +04:00
Alexander Machehin
06ab99a1d0
[refs #114 ] add js
2012-01-27 18:20:07 +06:00
George Vinogradov
eed3040944
[issue #64 ] Changed validation message and removed unnecessary
...
validation of projects owner.
2012-01-27 10:13:56 +04:00
Vladimir Sharshov
45c175942b
Temporary change arch for mass rebuild
2012-01-27 05:00:44 +04:00
George Vinogradov
2d1e36fb1a
[issue #64 ] Changed own_projects validation.
2012-01-27 04:16:07 +04:00
George Vinogradov
ba84d5f216
[issue #64 ] Added validation of own_projects count.
2012-01-27 03:37:19 +04:00
George Vinogradov
1498e937f6
[issue #64 ] Added own_projects counters to User & Group
2012-01-27 02:33:18 +04:00
George Vinogradov
b04a9e0176
[issue #64 ] Removed duplicated authorization.
2012-01-27 00:51:11 +04:00
Alexander Machehin
e71a9e84cb
[refs #114 ] emails control
2012-01-27 02:11:07 +06:00
George Vinogradov
3cb426a508
[issue #64 ] Added cancan restrictions.
2012-01-26 20:26:21 +04:00
Vladimir Sharshov
c529e63c96
Merge pull request #122 from warpc/105-internationalization
...
[refs #105 ] Fix devise translations
2012-01-26 08:06:34 -08:00
George Vinogradov
da88ac7df7
[issue #64 ] Some refactoring
2012-01-26 18:10:25 +04: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
Pavel Chipiga
374628a216
Render answer before publication trying to avoid bug. Refs #97
2012-01-26 00:28:11 +02:00
Alexander Machehin
8f5951acb9
Merge branch 'fix-email-i18n' into 114-comment_notifications
2012-01-25 23:33:41 +06:00
Alexander Machehin
4cca8f7bb1
[refs #114 ] some refactoring
2012-01-25 23:33:26 +06:00
Alexander Machehin
82339dcb34
send email in user's language
2012-01-25 14:28:00 +06:00
Alexander Machehin
b7c2b4d35b
[refs #114 ] fix email bug
2012-01-25 13:21:41 +06:00
Pavel Chipiga
60c1153d49
Save with validation. Refs #31
2012-01-24 23:29:23 +02:00
George Vinogradov
45877e8b5c
[issue #64 ] Bug fix & views refactoring
...
* Fixed bug with history
* Navigation moved to partial.
2012-01-25 00:47:55 +04:00
Pavel Chipiga
3f4bf65825
Upgrade paperclip. Apply srpm_import script and UI. Fix specs. Refs #31
2012-01-24 22:35:36 +02:00
Alexander Machehin
61be317b21
[refs #114 ] i18n
2012-01-25 01:00:51 +06:00
Alexander Machehin
6df1640485
[refs #114 ] fix logics
2012-01-24 18:18:39 +06:00
Vladimir Sharshov
7e1a26000e
Fix for "undefined method `<<' for nil:NilClass"
2012-01-24 01:12:42 +04:00
Alexander Machehin
9127b6b689
[refs #114 ] changed logics
2012-01-24 01:42:54 +06:00
Vladimir Sharshov
c3f415e90c
Add new build status for Item
2012-01-23 22:11:53 +04:00
Vladimir Sharshov
e1a4dd5ab5
Fix branch name for mass rebuild
...
Fix error in include_repos
2012-01-23 21:07:09 +04:00
Vladimir Sharshov
733adaf111
Update build_for for new requirements
2012-01-23 20:19:10 +04:00
George Vinogradov
6140c0c0bc
[issue #64 ] Added some comments
2012-01-23 17:38:10 +04:00
George Vinogradov
230c25eefd
[issue #64 ] Some changes.
...
* WikiController#compare splitted into WikiController#compare
and WikiController#compate_wiki
* Show only last 30 versions in history.
2012-01-23 16:45:38 +04:00
Alexander Machehin
651c5637ed
[refs #114 ] fix committer notification
2012-01-22 23:49:41 +06:00
Alexander Machehin
f1f6d1b78b
[refs #114 ] email i18n
2012-01-22 22:19:00 +06:00
Alexander Machehin
f0d7ed0d89
[refs #114 ] fix notification for committer
2012-01-22 22:17:08 +06:00
Alexander Machehin
ab081d3c46
[refs #114 ] only new comment notification
2012-01-22 22:15:25 +06:00
Alexander Machehin
36a895385c
[refs #114 ] changed rules
2012-01-22 01:13:33 +06:00
Alexander Machehin
21d422c313
[refs #114 ] refactoring subscribe
2012-01-21 19:32:22 +06:00
George Vinogradov
d939edda8f
[issue #64 ] Fixed some bugs.
2012-01-21 02:11:46 +04:00
Vladimir Sharshov
c6836e2978
Merge pull request #121 from warpc/113-file_mime_types
...
[Close #113 ] Images render and download href for binary data into blobs
2012-01-20 11:10:16 -08:00
konstantin.grabar
f46b179486
[refs #113 ] Add json to mime types list
2012-01-20 22:40:00 +04:00
konstantin.grabar
5d93d40693
[refs #113 ] Remove unused action from blobs controller
2012-01-20 22:33:22 +04:00
konstantin.grabar
23ace52d90
[refs #113 ] Images render and download href for binary data into blobs
2012-01-20 22:31:01 +04:00
Alexander Machehin
d8df6c6279
[refs #114 ] committer subscribe + some tests
2012-01-21 00:22:25 +06:00
Alexander Machehin
06a977ea21
Merge branch 'master' into 114-comment_notifications
2012-01-20 22:03:04 +06:00
Alexander Machehin
371abac031
[refs #114 ] fix controller tests
2012-01-20 21:17:05 +06:00
George Vinogradov
23573a1a07
[issue #64 ] Added creation wiki to project.
2012-01-20 19:10:30 +04:00
George Vinogradov
011efb0c4b
[issue #64 ] Added git access to Wiki.
2012-01-20 19:01:59 +04:00
konstantin.grabar
e3a716b7db
[refs #105 ] Fix some translations
2012-01-20 15:29:32 +04:00
Vladimir Sharshov
bae56741d0
Temporary disable AutoBuild functions for users (not working at now)
2012-01-20 12:24:57 +04:00
George Vinogradov
364f2e40c0
[issue #64 ] Added Wiki history, compare, revert.
2012-01-20 03:25:15 +04:00
Alexander Machehin
800b02f544
[refs #18 ] Add project subsribe, tests
2012-01-20 00:20:03 +06:00
George Vinogradov
54bc26d960
[issue #64 ] Added translations.
2012-01-19 18:37:36 +04:00
George Vinogradov
0c527af291
[issue #64 ] Added revisions comparsion.
2012-01-19 17:49:32 +04:00
George Vinogradov
552aa0a58a
[issue #64 ] Fixed bug with sidebar and footer.
2012-01-19 17:48:29 +04:00
George Vinogradov
538e3da8c8
[issue #64 ] Added search through wiki
2012-01-19 16:10:50 +04:00
George Vinogradov
65e659ad49
[issue #64 ] Some changes in preview.
2012-01-19 16:09:55 +04:00
George Vinogradov
32b64d3462
[issue #64 ] Minor fixes in WikiController
2012-01-19 16:07:08 +04:00
George Vinogradov
022a013b79
[issue #64 ] Added Wiki seeding on create.
2012-01-19 16:06:27 +04:00
George Vinogradov
a03690a9f7
[issue #64 ] Some views restuct.
2012-01-19 01:14:12 +04:00
konstantin.grabar
bd6abf2681
[refs #105 ] Add locale fixes
2012-01-19 00:58:38 +04:00
Alexander Machehin
dba11f4662
[refs #114 ] FIXME subscribers
2012-01-19 01:12:52 +06:00
Alexander Machehin
71447a29e3
[refs #114 ] add settings for commits notifications
2012-01-19 00:20:08 +06:00
George Vinogradov
2af0135fb5
[issue #64 ] Added All Pages representation.
2012-01-18 19:09:25 +04:00
George Vinogradov
0386c34246
[issue #64 ] Added page deletion.
2012-01-18 18:33:35 +04:00
George Vinogradov
7afcc3a617
[issue #64 ] Some fixes.
2012-01-18 18:33:09 +04:00
Pasha
4ba268dd67
Merge pull request #109 from warpc/18-commit_comments
...
18 commit comments
2012-01-18 05:49:57 -08:00
Pasha
eb6ec413da
Merge pull request #108 from warpc/105-internationalization
...
105 internationalization
2012-01-18 05:38:55 -08:00
konstantin.grabar
01d8cd8dcc
[refs #105 ] Change LANGUAGE constant into User
2012-01-18 17:06:18 +04:00
George Vinogradov
931aef4db6
[issue #64 ] Fixed some bugs in templates.
2012-01-18 04:47:01 +04:00
George Vinogradov
a608ded8c4
[issue #76 ] Fixed potential bug in redirects
2012-01-18 04:44:42 +04:00
George Vinogradov
d3b32e4d6d
[issue #64 ] Fixed bug with preview page.
2012-01-18 04:43:36 +04:00
George Vinogradov
407130f3d7
[issue #64 ] Minor fix in WikiController#show.
2012-01-18 03:46:44 +04:00