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
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
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
06ab99a1d0
[refs #114 ] add js
2012-01-27 18:20:07 +06:00
eed3040944
[issue #64 ] Changed validation message and removed unnecessary
...
validation of projects owner.
2012-01-27 10:13:56 +04:00
45c175942b
Temporary change arch for mass rebuild
2012-01-27 05:00:44 +04:00
2d1e36fb1a
[issue #64 ] Changed own_projects validation.
2012-01-27 04:16:07 +04:00
ba84d5f216
[issue #64 ] Added validation of own_projects count.
2012-01-27 03:37:19 +04:00
1498e937f6
[issue #64 ] Added own_projects counters to User & Group
2012-01-27 02:33:18 +04:00
b04a9e0176
[issue #64 ] Removed duplicated authorization.
2012-01-27 00:51:11 +04:00
e71a9e84cb
[refs #114 ] emails control
2012-01-27 02:11:07 +06:00
3cb426a508
[issue #64 ] Added cancan restrictions.
2012-01-26 20:26:21 +04:00
c529e63c96
Merge pull request #122 from warpc/105-internationalization
...
[refs #105 ] Fix devise translations
2012-01-26 08:06:34 -08:00
da88ac7df7
[issue #64 ] Some refactoring
2012-01-26 18:10:25 +04:00
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
77420d2a8f
[refs #114 ] user emails
2012-01-26 14:53:40 +06:00
374628a216
Render answer before publication trying to avoid bug. Refs #97
2012-01-26 00:28:11 +02:00
8f5951acb9
Merge branch 'fix-email-i18n' into 114-comment_notifications
2012-01-25 23:33:41 +06:00
4cca8f7bb1
[refs #114 ] some refactoring
2012-01-25 23:33:26 +06:00
82339dcb34
send email in user's language
2012-01-25 14:28:00 +06:00
b7c2b4d35b
[refs #114 ] fix email bug
2012-01-25 13:21:41 +06:00
60c1153d49
Save with validation. Refs #31
2012-01-24 23:29:23 +02:00
45877e8b5c
[issue #64 ] Bug fix & views refactoring
...
* Fixed bug with history
* Navigation moved to partial.
2012-01-25 00:47:55 +04:00
3f4bf65825
Upgrade paperclip. Apply srpm_import script and UI. Fix specs. Refs #31
2012-01-24 22:35:36 +02:00
61be317b21
[refs #114 ] i18n
2012-01-25 01:00:51 +06:00
6df1640485
[refs #114 ] fix logics
2012-01-24 18:18:39 +06:00
7e1a26000e
Fix for "undefined method `<<' for nil:NilClass"
2012-01-24 01:12:42 +04:00
9127b6b689
[refs #114 ] changed logics
2012-01-24 01:42:54 +06:00
c3f415e90c
Add new build status for Item
2012-01-23 22:11:53 +04:00
e1a4dd5ab5
Fix branch name for mass rebuild
...
Fix error in include_repos
2012-01-23 21:07:09 +04:00
733adaf111
Update build_for for new requirements
2012-01-23 20:19:10 +04:00
6140c0c0bc
[issue #64 ] Added some comments
2012-01-23 17:38:10 +04:00
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
651c5637ed
[refs #114 ] fix committer notification
2012-01-22 23:49:41 +06:00
f1f6d1b78b
[refs #114 ] email i18n
2012-01-22 22:19:00 +06:00
f0d7ed0d89
[refs #114 ] fix notification for committer
2012-01-22 22:17:08 +06:00
ab081d3c46
[refs #114 ] only new comment notification
2012-01-22 22:15:25 +06:00
36a895385c
[refs #114 ] changed rules
2012-01-22 01:13:33 +06:00
21d422c313
[refs #114 ] refactoring subscribe
2012-01-21 19:32:22 +06:00
d939edda8f
[issue #64 ] Fixed some bugs.
2012-01-21 02:11:46 +04:00
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
f46b179486
[refs #113 ] Add json to mime types list
2012-01-20 22:40:00 +04:00
5d93d40693
[refs #113 ] Remove unused action from blobs controller
2012-01-20 22:33:22 +04:00
23ace52d90
[refs #113 ] Images render and download href for binary data into blobs
2012-01-20 22:31:01 +04:00
d8df6c6279
[refs #114 ] committer subscribe + some tests
2012-01-21 00:22:25 +06:00
06a977ea21
Merge branch 'master' into 114-comment_notifications
2012-01-20 22:03:04 +06:00
371abac031
[refs #114 ] fix controller tests
2012-01-20 21:17:05 +06:00
23573a1a07
[issue #64 ] Added creation wiki to project.
2012-01-20 19:10:30 +04:00
011efb0c4b
[issue #64 ] Added git access to Wiki.
2012-01-20 19:01:59 +04:00
e3a716b7db
[refs #105 ] Fix some translations
2012-01-20 15:29:32 +04:00
bae56741d0
Temporary disable AutoBuild functions for users (not working at now)
2012-01-20 12:24:57 +04:00
364f2e40c0
[issue #64 ] Added Wiki history, compare, revert.
2012-01-20 03:25:15 +04:00
800b02f544
[refs #18 ] Add project subsribe, tests
2012-01-20 00:20:03 +06:00
54bc26d960
[issue #64 ] Added translations.
2012-01-19 18:37:36 +04:00
0c527af291
[issue #64 ] Added revisions comparsion.
2012-01-19 17:49:32 +04:00
552aa0a58a
[issue #64 ] Fixed bug with sidebar and footer.
2012-01-19 17:48:29 +04:00
538e3da8c8
[issue #64 ] Added search through wiki
2012-01-19 16:10:50 +04:00
65e659ad49
[issue #64 ] Some changes in preview.
2012-01-19 16:09:55 +04:00
32b64d3462
[issue #64 ] Minor fixes in WikiController
2012-01-19 16:07:08 +04:00
022a013b79
[issue #64 ] Added Wiki seeding on create.
2012-01-19 16:06:27 +04:00
a03690a9f7
[issue #64 ] Some views restuct.
2012-01-19 01:14:12 +04:00
bd6abf2681
[refs #105 ] Add locale fixes
2012-01-19 00:58:38 +04:00
dba11f4662
[refs #114 ] FIXME subscribers
2012-01-19 01:12:52 +06:00
71447a29e3
[refs #114 ] add settings for commits notifications
2012-01-19 00:20:08 +06:00
2af0135fb5
[issue #64 ] Added All Pages representation.
2012-01-18 19:09:25 +04:00
0386c34246
[issue #64 ] Added page deletion.
2012-01-18 18:33:35 +04:00
7afcc3a617
[issue #64 ] Some fixes.
2012-01-18 18:33:09 +04:00
4ba268dd67
Merge pull request #109 from warpc/18-commit_comments
...
18 commit comments
2012-01-18 05:49:57 -08:00
eb6ec413da
Merge pull request #108 from warpc/105-internationalization
...
105 internationalization
2012-01-18 05:38:55 -08:00
01d8cd8dcc
[refs #105 ] Change LANGUAGE constant into User
2012-01-18 17:06:18 +04:00
931aef4db6
[issue #64 ] Fixed some bugs in templates.
2012-01-18 04:47:01 +04:00
a608ded8c4
[issue #76 ] Fixed potential bug in redirects
2012-01-18 04:44:42 +04:00
d3b32e4d6d
[issue #64 ] Fixed bug with preview page.
2012-01-18 04:43:36 +04:00
407130f3d7
[issue #64 ] Minor fix in WikiController#show.
2012-01-18 03:46:44 +04:00
2522dd3c63
[issue #64 ] Added page history views.
2012-01-18 03:30:54 +04:00
a9989f07fe
[issue #64 ] Fixed bug with update page
2012-01-18 03:30:04 +04:00
51e9b5d1f6
[issue #64 ] Some changes in views and routes.
2012-01-18 02:28:59 +04:00
310e11b666
[refs #18 ] Fix if blocking referer
2012-01-18 00:33:42 +06:00
f8be867aaf
Replace annotated tags to lightweight. Improve specs. Restore lost migrations. Refs #103
2012-01-17 19:37:41 +02:00
bbbf17c2b4
[refs #105 ] Merge master with 105-internationalization
2012-01-17 17:58:49 +04:00
62d0419bdd
Merge pull request #106 from warpc/103-bl_publish_new_params
...
Сохранение сборочного коммита, добавление неподписанного тега на сохраненный коммит после публикации
2012-01-17 04:34:15 -08:00
d205eb2dd9
[refs #105 ] Add language check on user save
2012-01-17 15:57:46 +04:00
726eddc40e
[refs #105 ] Add internationalization support to project
2012-01-17 15:48:40 +04:00
a0aad7103e
some fixes
2012-01-17 17:38:40 +06:00
fab62c548f
Hide container_path if build_list published. Cleanup translations. Refs #100
2012-01-17 13:04:50 +02:00
95b4e2557c
[refs #18 ] forgot comments order
2012-01-17 16:30:11 +06:00
d2c5df93a9
Merge branch '18-commit_comments' of github.com:warpc/rosa-build into 18-commit_comments
...
Conflicts:
app/models/comment.rb
app/models/issue.rb
app/views/comments/edit.html.haml
app/views/issues/show.html.haml
2012-01-17 15:57:12 +06:00
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
62922c30a3
[issue #64 ] Added search partial.
2012-01-17 04:05:07 +04:00
a687a6601b
Save commit_hash during build_list create. Tag git repo during build_list publish. Write and fix specs. Refs #103
2012-01-16 23:51:20 +02:00
1e1dab369b
[issue #64 ] Added some views, styles and scripts.
...
* Added base gollum styles
* Added base gollum javascripts (with minor changes)
* Fixed some bugs in WikiController
* Added some views (draft yet)
2012-01-17 01:48:38 +04:00
80ba40f6ee
Merge branch 'master' into 18-commit_comments
...
rspec spec/ = 528 examples, 12 failures
2012-01-17 00:52:16 +06:00
52696791f2
[refs #54 , #94 ] Merge master into issues
2012-01-16 13:42:44 +04:00
e10dd56dff
[refs #18 ] refactoring
2012-01-16 13:28:30 +06:00
bdc3b3a3d1
[refs #18 ] controller tests
2012-01-14 18:16:42 +06:00
712ca8d95a
Save package_version during success build_list publish. Add specs. Refs #103
2012-01-13 18:45:13 +02:00
a1a92e9878
[refs #54 ] Fix comments serial_id routing and some logic
2012-01-13 20:07:46 +04:00
794c55a030
Merge branch 'master' of github.com:warpc/rosa-build into 18-commit_comments
2012-01-13 22:01:30 +06:00
8252367537
some fix
2012-01-13 21:58:48 +06:00
db0a66846b
[refs #94 ] Add new notifier rules. Fix some issues and comments bugs
2012-01-13 19:07:01 +04:00
729bd94045
[issue #64 ] Merge branch 'master' into 64-project_wiki
...
Conflicts:
config/routes.rb
db/schema.rb
2012-01-13 18:05:42 +04:00
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
73b710ae4e
[ close #76 ] Changed styles. Fixed bug with pagination.
2012-01-12 20:37:50 +04:00
caf7adef70
[refs #18 ] FIXME subscribe don't work
2012-01-12 20:50:27 +06:00
630346d2e3
[refs #18 ] fix cancel button
2012-01-12 20:48:08 +06:00
636c90e6e4
[refs #18 ] add some I18n
2012-01-12 20:27:45 +06:00
980e455b31
[refs #54 ] Fix comment deliver notification user check
2012-01-12 17:45:22 +04:00
f6e4de3b72
[refs #54 ] Fix issue assign user subscribe update filter
2012-01-12 17:07:54 +04:00
f8d00f5235
[refs #18 ] Fix cancan ability for commit comments
2012-01-12 18:04:16 +06:00
07dc7a4800
[refs #18 ] add comments to commit
2012-01-12 17:19:22 +06:00
49082c2a8d
[issue #76 ] Fixed bug with JSON generation.
2012-01-12 01:12:56 +04:00
c23312ad51
Research and fix problem with build_lists#auto_publish feature. Fix specs. Refs #97
2012-01-11 21:43:33 +02:00
c18b71bf0b
[refs #18 ] changed refs id to string
2012-01-12 00:10:23 +06:00
2b8aca5f09
[refs #54 ] Add settings notifier
2012-01-11 17:58:13 +04:00
4132c336d6
[refs #54 ] Fix comment update path
2011-12-31 14:55:49 +04:00
16c9d0ec15
[refs #54 ] Fix some bugs of issues and comments + add comment body to email
2011-12-31 14:51:47 +04:00
7c50b2c3f5
[issue #76 ] Added jQuery DataTable. But it doesn't work yet
2011-12-31 02:42:58 +04:00
e8977a7d95
Merger issues with master
2011-12-30 18:23:16 +04:00
3f72082e0e
[refs #54 ] Add comments, subscribes models specs. Finish subscribes controller specs. Some ability.rb fixes
2011-12-30 18:21:08 +04:00
782b311983
[issue #76 ] Changed project list in repositories.
2011-12-29 22:16:39 +04:00
633e5ebffc
Added actions to WikiController
2011-12-29 22:00:43 +04:00
635e2b7977
[refs #54 ] Add comments specs and factory. Remove unused code. Add one delay and fix some links.
2011-12-29 15:16:54 +04:00
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
49ec1ebe98
[refs #54 ] Remove unused comments
2011-12-28 18:24:24 +04:00
fa8656d1f5
[refs #54 ] Refactor subscires routes and authorize
2011-12-28 17:54:45 +04:00
1c263c6e0a
[refs #54 ] Notification DJ support. Routes fixes.
2011-12-28 14:47:54 +04:00
a783b460bd
Merge issues with master
2011-12-28 13:22:57 +04:00
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
ecbfed9300
[refs #54 ] Fix user_id validation into issues
2011-12-27 21:49:08 +04:00
b48ffecc28
[refs #54 ] Add new styles to comments list to issue page
2011-12-27 17:52:48 +04:00
d3ba83135e
[refs #54 ] Add some locales and interface fixes for issues
2011-12-27 17:18:25 +04:00
8face9208e
[refs #54 ] Add fixes and locales to subscribes
2011-12-27 16:35:31 +04:00
ec95373d28
[#issue 64] Routes to Wiki and some methods in controller.
...
Useless yet.
2011-12-26 21:07:16 +04:00
81378478ca
[issue #64 ] Added Wiki controller and some methods in Project
2011-12-26 21:07:07 +04:00
ce6746f7a9
[refs #54 ] Add subscribes and notifications
2011-12-26 19:48:57 +04:00
7d3dd5eaf1
[ #82 ] Merge branch 'master' into 65-build_repo
...
Conflicts:
spec/models/cancan_spec.rb
2011-12-26 14:51:30 +02:00
5237939f49
Merge issues with master
2011-12-26 13:26:13 +04:00
7d8d77a386
[issue #79 ] Added validation to ProjectToRepository
2011-12-23 21:06:47 +04:00
bf2f3d1bc7
[refs #54 ] Add issue statuses filters
2011-12-23 18:34:32 +04:00
894bc0c077
[refs #54 ] Add issues tests. Fix some CanCan rights. Make some fixes to logic
2011-12-23 14:56:46 +04:00
8c3291d237
Fix and redo specs after great build_lists refactoring and improvement. Fix minor bugs. Code cleanup. Refs #65
2011-12-23 04:14:28 +02:00
e2144e0fdb
[refs #54 ] Fix issue ability and comment redirect after update
2011-12-22 11:41:37 +04:00
96d458875e
Remove publish validator. Add can_cancel/can_publish checking to cancel/publish methods. Refs #80
2011-12-22 04:08:11 +02:00
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
2ac4391edf
Redo build_list publish to check returned status. Refs #77
2011-12-22 01:31:05 +02:00
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
8c2b837600
Fix build_list user assign. Refs #65
2011-12-21 21:17:55 +02:00
a61d211862
Fix bugs. Change included_repos format. Refs #65
2011-12-21 20:59:19 +02:00
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
7f58a52602
Autocheck current save platform and disable unavailable base platforms on JS level. Refs #65
2011-12-21 19:51:55 +02:00
Vladimir Sharshov
Pavel Chipiga
George Vinogradov
Alexander Machehin
konstantin.grabar
Pasha