510b0c0c50
[issue #347 ] Merge branch 'master' into 347-javascript_refactoring
...
Conflicts:
app/assets/stylesheets/design/custom.scss
app/models/group.rb
app/models/user.rb
2012-04-19 19:32:11 +04:00
f9d2baef5a
[issue #347 ] Added filter.
2012-04-19 19:27:16 +04:00
5b5aec490a
Merge pull request #409 from warpc/396-rss_atom_feed
...
[refs #396 ] Add atom feed for activity feed
2012-04-19 07:08:59 -07:00
3d1cb4bfee
Merge master into 396-rss_atom_feed
2012-04-18 16:53:53 +04:00
8ef020427d
[refs #396 ] Add token auth for atom feed
2012-04-18 16:46:09 +04:00
3e4eba7f9d
Merge pull request #411 from warpc/408-frozen_platform
...
[issue #408 ] Allow publish build list in released platform only for platform members. Add rejected function for bs.
2012-04-18 04:17:32 -07:00
6c64125787
[issue #408 ] Changed behavior of build list for released platform
2012-04-17 22:18:39 +04:00
644b95d5bd
Fuuu!
...
Revert "[refs #385 ] removed dublicate ability"
This reverts commit 72de5731722f0a5b7110983ecb97cba1beda3056.
2012-04-17 19:52:52 +06:00
05ec6cbac3
[refs #385 ] removed dublicate ability
2012-04-17 16:21:45 +06:00
2716c19635
[refs #385 ] add anonymous access to project archive
2012-04-17 16:18:03 +06:00
1b871bf6dd
[refs #404 ] Remove downloads statistics functional
2012-04-17 12:23:58 +04:00
871c8ed1f4
[issue #347 ] Fixed bugs. Some changes.
2012-04-16 23:22:08 +04:00
07cc2db49e
Merge pull request #399 from warpc/194-assignee_and_user
...
[refs #194 ] Move user_id to assignee_id and creator_id to user_id, because user_id in project used only as author.
2012-04-16 09:39:23 -07:00
40090f0903
[Refs #223 ] Fix human_average_build_time (wrong time)
2012-04-14 20:10:18 +04:00
afd82ab4ec
[Refs #223 ] Mass rebuild method now connect project platform repository and main if main exist.
2012-04-14 17:46:39 +04:00
c1ddc2204f
Fix scopes. Refs #223
2012-04-14 01:27:24 +03:00
afbfbcd9e4
[Refs #223 ] Fix time calculation
2012-04-14 01:20:56 +04:00
2c0f047b38
[Refs #223 ] Fix errors and tests
2012-04-14 00:49:29 +04:00
2dedbd92d0
[refs #194 ] assignee & user
2012-04-14 01:44:04 +06:00
ba9184cc49
Merge pull request #398 from warpc/223-build_list_notify_and_duration_updates
...
223 build list notify and duration updates
2012-04-13 11:43:57 -07:00
42967381b6
[refs #223 ] some refactoring
2012-04-14 00:26:34 +06:00
652bc9c471
[Refs #223 ] Fix update_attributes for project
2012-04-13 21:00:43 +04:00
100a166699
[Refs #223 ] Refactoring for pull request
2012-04-13 17:24:43 +04:00
8ffc6be347
Merge branch '223-change_build_lists_new_js_handlers' into 223-build_list_notify_and_duration_updates
...
Conflicts:
app/models/build_list.rb
config/locales/models/build_list.en.yml
config/locales/models/build_list.ru.yml
2012-04-13 17:21:30 +04:00
d8edf8e673
Merge pull request #397 from warpc/223-change_build_lists_new_js_handlers
...
[refs #223 ] Add build list duration
2012-04-13 05:25:20 -07:00
36447051ec
[Refs #223 ] Small refactoring for pull request
2012-04-13 13:48:57 +04:00
a68d4a2926
[issue #347 ] Many changes.
...
Changes includes:
* Changed Collaborator model;
* Autocomplete now works through backbone;
* Changed autocomplete styles;
* Groups have their own avatar;
* Changed previous backbone scripts;
2012-04-13 02:01:24 +04:00
65f1cfc822
[refs #223 ] Add current duration and project average build time
2012-04-12 18:55:32 +04:00
26a468f6e3
[refs #223 ] Replace notified_at by updated_at
2012-04-12 16:12:06 +04:00
742603ab7e
[refs #223 ] Add build list duration
2012-04-12 14:29:04 +04:00
770030e180
[refs #385 ] zip archive
2012-04-12 00:29:08 +06:00
442b44a68e
[issue #347 ] Added not_member_of scope. Added ActsLikeMember module
2012-04-10 19:45:38 +04:00
f0b9cabefa
[Refs #223 ] Change order for version select in build list creation page.
2012-04-10 19:45:18 +04:00
18bda07369
Merge master into 223-change_build_lists_new_js_handlers
2012-04-10 18:00:48 +04:00
207be85ff4
[refs #223 ] Add group select to versions
2012-04-10 16:03:33 +04:00
e349a69883
[refs #353 ] can fork project to group
2012-04-09 23:56:03 +06:00
71c8efabf9
[issue #347 ] Added backbone. Changed collaborators page.
2012-04-09 21:11:39 +04:00
a9ecc683f2
Fix search bug. Write anonymous read specs for issues and search controllers. Refs #263
2012-04-05 20:11:02 +03:00
977ec8382c
Merge branch 'master' into 263-refactoring
2012-04-05 19:58:46 +03:00
01976015a6
[refs #295 ] fix broken create/fork project
2012-04-05 22:52:21 +06:00
4bb8a38fbb
Merge pull request #376 from warpc/263-dj
...
[Refs #295 ] Customized DJ jobs and workers:
* set priority to delayed jobs;
* 4 workers to dj;
* division init bare & fork.
2012-04-05 06:54:28 -07:00
6d5cee2c04
[refs #383 ] added ability to destroy project
2012-04-05 17:36:53 +06:00
20e5936d0c
Fix and refactor build lists, comments and other specs. Refactor comments controller, models and views. Code cleanup. Refs #263
2012-04-05 00:43:06 +03:00
302179eff8
[refs #295 ] set priority to delayed jobs
2012-04-04 18:13:10 +06:00
a6ec36086c
[Refs #263 ] Refactoring ProductBuildList. Add tests
2012-04-04 00:56:21 +04:00
f4937559a6
Merge pull request #378 from warpc/263-product_refactoring
...
[Refs #263 ] Refactoring product. Add tests.
2012-04-03 06:56:46 -07:00
fe053537c3
[ fixed #377 ] Fixed Group.by_admin scope.
2012-04-03 17:08:22 +04:00
d382732e68
[Refs #263 ] Refactoring product. Add tests.
2012-04-03 16:21:39 +04:00
1fb63cf1a7
[refs #263 ] division init bare & fork
2012-04-03 17:32:00 +06:00
5a384c6846
[refs #263 ] added dj queues
2012-04-03 01:29:06 +06:00
d06e452935
[refs #263 ] fixed feed with no repo
2012-04-03 01:27:36 +06:00
dfa538abef
Merge pull request #375 from warpc/263-repository_refactoring
...
[Refs #263 ] Refactoring repository. Add tests
2012-04-02 10:44:28 -07:00
431ed14e83
Fix "NameError: undefined local variable or method `platform' for ProductBuildList"
2012-04-02 21:39:43 +04:00
d31d0c9672
[Refs #263 ] Refactoring repository. Add tests
2012-04-02 19:43:59 +04:00
fef3affc07
[Refs #263 ] Refactoring platforms, add platform tests and software license, showing warning for errors in update project action
2012-04-01 19:19:54 +04:00
265090a172
Merge branch 'master' into 349-anonymous_access
...
Conflicts:
db/schema.rb
2012-03-31 02:41:25 +03:00
d6e6959f46
Write basic robots.txt. Apply configurable anonymous access, hide some functionality from guests. Apply basic design for main page. Autoconfirm manually created users. Code refactor and cleanup. Remove unused code, routes, containers, rpms, personal_repositories. Redo product_build_lists monitoring and filtering. Fix add_project to repo bug. Add links to bottom menu. Switch off deploy assets sppedup. Refs #349 , #263
2012-03-31 02:37:54 +03:00
7234cb7f99
[issue #195 ] Changed scopes.
2012-03-31 03:13:09 +04:00
0c09568d74
[issue #195 ] Merge branch 'master' into 195-new_design_for_projects
...
Conflicts:
app/models/group.rb
app/models/user.rb
2012-03-31 02:48:44 +04:00
71c1a4afcf
[issue #195 ] Owner removed from list of collaborators when editing list
2012-03-31 02:45:05 +04:00
0f91e0e8a1
[refs #344 ] fixed ability and submenu
2012-03-30 23:23:46 +06:00
3cedef5f07
Merge branch 'master' into 344-fix_products_monitoring
...
Conflicts:
db/schema.rb
2012-03-30 20:30:06 +04:00
d3c2bac226
[refs #344 ] Add product buils list filter and search
2012-03-30 15:26:28 +04:00
4dd97d8c63
[Refs #263 ] Remove xml-rpc gem, clear CanCan abilities and tests
2012-03-30 00:24:45 +04:00
34011513b5
[Refs #263 ] Remove old xml-rpc API
2012-03-29 23:19:00 +04:00
0c2d0f4612
[Refs #263 ] Delete Categories
2012-03-29 23:01:25 +04:00
5db485a4c0
[Refs #263 ] Remove Aut BuildList. Part 2
2012-03-29 22:43:46 +04:00
66c285c796
[Refs #263 ] Delete AutoBuildList
2012-03-29 22:22:48 +04:00
9a45353ccb
Merge pull request #342 from warpc/128-account-activation
...
[Refs #128 ] account activation
2012-03-29 09:09:03 -07:00
9ee350b007
Refactor search controllers and scopes. Add search query whitespace strip. Refs #263
2012-03-28 02:58:03 +03:00
c9f4cf0ea4
Fix and refactor project membered abilities. Refs #195
2012-03-28 00:28:50 +03:00
2ba4a282cd
[issue #195 ] Global admin can change members in all projects
2012-03-28 00:16:33 +04:00
baf35da99c
[issue #195 ] Merge branch 'master' into 195-new_design_for_projects
...
Conflicts:
app/controllers/projects_controller.rb
2012-03-27 21:23:09 +04:00
c2960b7083
[refs #263 ] fixed commentable accessibility
2012-03-27 22:45:07 +06:00
3b57bb56bc
[refs #263 ] removed project_id from access lists
2012-03-27 21:11:52 +06:00
a0b7f243d6
[refs #263 ] changed and fixed comment tests; some refactoring
2012-03-27 21:09:04 +06:00
8b31c6373f
Merge branch 'master' into 128-account-activation
2012-03-27 13:46:21 +04:00
dafedb3dcf
Reroute and refactor admin user creation to force invitation and self registration work correct. Refs #270
2012-03-26 17:49:00 +03:00
ae0ca1ce99
[refs #128 ] Fix devise mails. Fix confirm ability
2012-03-26 18:33:02 +04:00
a3d334f0c2
[refs #128 ] Merge 3.2-master into 128-account-activation
2012-03-26 13:55:45 +04:00
4b96c988d4
Reduce build batch size. Refs #263
2012-03-24 02:09:49 +02:00
099ba2a3dd
Build platform for both arches. Refs #263
2012-03-24 01:53:07 +02:00
9ced817560
[Refs #279 ] Temporary fix for mass rebuild
2012-03-24 03:30:12 +04:00
d44de9f2bb
Redo projects list. Allow view projects through groups. Hide delete from project link from project owners. Refs #195
2012-03-23 22:37:17 +02:00
7f31246463
Tune project specific build_lists page filters. Cleanup. Refs #223
2012-03-22 22:58:02 +02:00
4553affa56
Add missing magic_encodings. Fix blame commit select, hide blank blame. Fix git repo hooks - redo branch parse to support non-ascii branches. Refs #190 , #134
2012-03-22 19:11:12 +02:00
071c391a6e
Merge branch '3.2-master' into 270-user_control
...
Conflicts:
app/assets/stylesheets/design/custom.scss
2012-03-22 21:15:10 +06:00
23eeb1cae7
[refs #270 ] changes in ban
2012-03-22 20:50:15 +06:00
787eed92a3
[refs #270 ] removed ssh_key
2012-03-22 17:47:56 +06:00
71f1822fce
[refs #270 ] some refactoring
2012-03-22 17:17:11 +06:00
867d678dc4
[refs #270 ] some users tests
2012-03-22 02:05:27 +06:00
89f31e9782
Minor gems update. Prepare gemfile for jruby and rbx tests. Remove encoding hacks. Apply grit fixes for encoding support. Recode incorrect encodings. Refactor, cleanup and fix lots bugs in git section. Refactor and remove unused git routes. Translate some untranslated parts. Redo branch/tags selector. Fix files tree last commit message. Project section templates refactor and cleanup. Refs #190
2012-03-21 21:55:14 +02:00
87e1ee4700
Merge pull request #317 from warpc/232-groups_tests
...
[refs #232 ] Add groups tests and mass assignment protect
2012-03-21 12:06:00 -07:00
bf1340939b
[refs #270 ] fixed users filtration
2012-03-22 00:02:58 +06:00
a6a5b722d2
[refs #270 ] use devise lockable to ban
2012-03-21 23:45:51 +06:00
72c02282aa
[refs #232 ] Add mass-assignment fixes. Add create and mass-assig tests.
2012-03-21 17:52:35 +04:00
3c7dec3b97
Merge branch '3.2-master' into 270-user_control
2012-03-21 19:39:55 +06:00
8b252d8c14
Add and tune devise lockable strategy. Refs #270
2012-03-21 15:37:16 +02:00
4a6ce6c8a8
Merge branch '3.2-master' into 270-user_control
...
Conflicts:
app/views/users/index.html.haml
2012-03-21 15:29:44 +06:00
5c408540ff
[refs #270 ] can ban user
2012-03-21 02:06:51 +06:00
347b5283b0
Merge pull request #320 from warpc/279-new_design_for_platforms
...
[issue #279 ] Disable members for personal platforms
2012-03-20 11:49:21 -07:00
cd42c912d8
[issue #279 ] Fixed permissions for personal platforms.
2012-03-20 22:41:14 +04:00
047425a27f
Merge pull request #318 from warpc/279-new_design_for_platforms
...
[Refs #279 ] new design for platforms(add control for members, fix bugs)
2012-03-20 09:48:57 -07:00
7c0585ee87
[issue #279 ] Added members and other changes.
2012-03-20 20:24:18 +04:00
d3c3726a84
[Refs #66 ] Add priority in build list
2012-03-20 14:56:51 +04:00
56f1d06da8
[Refs #66 ] Add priority to build list
2012-03-20 14:08:24 +04:00
4ce3e5bf32
Merge pull request #310 from warpc/252-user_appeal
...
[refs #252 ] fixed appeal to user in email and in welcome message in activity feed
2012-03-19 09:07:21 -07:00
ddc95c25fb
[issue #279 ] Merge branch '3.2-master' into 279-new_design_for_platforms
...
Conflicts:
app/assets/stylesheets/design/custom.scss
2012-03-19 18:56:04 +04:00
1cbc3f5b7a
[issue #279 ] Added block of connection data for personal platform.
2012-03-19 18:46:12 +04:00
9b2dc6538d
[refs #252 ] new user notifications
2012-03-19 20:45:47 +06:00
d5dc05233f
[refs #252 ] fixed appeal to user
2012-03-19 20:34:57 +06:00
296acd80da
[refs #265 ] added build waiting message
2012-03-19 15:07:09 +06:00
86871ab32d
Merge branch '3.2-master' into 265-activity_feed_messages
...
Conflicts:
config/locales/menu.en.yml
config/locales/menu.ru.yml
2012-03-17 01:09:04 +06:00
fb89eedca3
[refs #265 ] forgot build list setup
2012-03-17 00:58:41 +06:00
dd5f51de71
[refs #265 ] added build tasks feed
2012-03-16 21:37:58 +06:00
3d9f9b5c73
[issue #279 ] Fixed permissions and moved some buttons.
...
Removed Freeze/Unfreeze actions from Platform.
2012-03-16 17:25:34 +04:00
42eb250942
Merge pull request #302 from warpc/279-new_design_for_platforms
...
[issue #279 ] Fixed some bugs:
* Redirect to repositroies page when remove repository.
* Fixed sorting background in Datatables styles.
* Fixed save button translation in platforms form.
* Fixed platform save & create flashes.
* Fixed cancel buttons in platform, product & repository forms.
* Redirect to created product on creation.
* Redirect to platform's products page after product destruction.
* Fixed permissions to Build button on product page.
* Fixed permissions to Add button on repository page.
* Fixed forbidden redirect when trying to acces
* RepositoriesController#projects_list by unprivilleged user.
2012-03-15 16:15:58 -07:00
cc68163238
[issue #279 ] Fixed some bugs:
...
* Redirect to repositroies page when remove repository.
* Fixed sorting background in Datatables styles.
* Fixed save button translation in platforms form.
* Fixed platform save & create flashes.
* Fixed cancel buttons in platform, product & repository forms.
* Redirect to created product on creation.
* Redirect to platform's products page after product destruction.
* Fixed permissions to Build button on product page.
* Fixed permissions to Add button on repository page.
* Fixed forbidden redirect when trying to acces
RepositoriesController#projects_list by unprivilleged user.
2012-03-16 02:56:12 +04:00
e719633862
Merge pull request #300 from warpc/279-new_design_for_platforms
...
[Refs #279 ] new design for platforms (bugfixes, ACL and filters)
2012-03-15 14:50:37 -07:00
9911d9f25e
[issue #279 ] Removed can_clone? and can_build? from Product
2012-03-16 01:10:24 +04:00
3719b40889
[refs #265 ] removed unused code
2012-03-16 00:22:56 +06:00
4addff059b
[refs #265 ] added activity feed tabs
2012-03-15 23:52:54 +06:00
09dcb43da8
Merge pull request #301 from warpc/265-activity_feed_messages
...
[refs #265 ] Fixed check rails env
2012-03-15 07:08:23 -07:00
e7ac387466
[refs #265 ] fixed check rails env
2012-03-15 18:10:10 +06:00
76af82805d
[issue #279 ] Fixes.
...
* Fixed permissions.
* Added pagination in repository view.
2012-03-15 04:07:53 +04:00
3c60347a23
[issue #279 ] Fixes.
...
* Almost finished permissions fixes
* Removed is_template from product
* Some fixes in crontab_generator partial
2012-03-15 03:34:09 +04:00
747edb73a5
[issue #279 ] Merge branch '3.2-master' into 279-new_design_for_platforms
...
Conflicts:
db/schema.rb
2012-03-14 21:43:08 +04:00
79e56eec52
Merge pull request #298 from warpc/265-activity_feed_messages
...
[Refs #265 ] Restyle comments and issues feeds messages, refactoring, fix bugs
2012-03-14 10:29:10 -07:00
3642163fd7
[refs #265 ] changed feed messages
2012-03-14 23:00:26 +06:00
20079d4fc5
[refs #265 ] changed comments feed
2012-03-14 20:40:41 +06:00
d9c3f9ddc8
[refs #265 ] fixed comment to commit feed
2012-03-14 20:33:16 +06:00
9c429e893e
Merge pull request #294 from warpc/265-activity_feed_messages
...
[refs #265 ] changed activity feed messages; fixed avatar sizes; fixed message for deleted branch
2012-03-14 05:20:48 -07:00
dc6e380647
Merge pull request #296 from warpc/194-issue_page
...
[refs #194 ] fixed remove executor from issue
2012-03-14 04:18:29 -07:00
4b8e9682b5
[refs #194 ] some refactor
2012-03-14 16:53:23 +06:00
5ffd976086
[refs #194 ] fixed remove executor from issue
2012-03-14 16:39:59 +06:00
9f9eb23e43
Merge pull request #293 from warpc/265-new_design_for_activity_feed
...
[Refs #265 ] Fix subscribe dublicates
2012-03-13 13:48:32 -07:00
b93032e226
[refs #265 ] fixed avatar sizes
2012-03-14 00:53:37 +06:00
ba437f7703
[refs #265 ] changed activity feed messages
2012-03-14 00:47:37 +06:00
5b932879e2
[refs #265 ] fixed subscribe dublicates
2012-03-13 19:56:58 +06:00
51e2584995
Fix abilities for invites. Refs #174
2012-03-12 23:24:05 +02:00
f6dd072a24
Merge branch '3.2-master' into 257-new_design_for_profiles
...
Conflicts:
config/locales/users.en.yml
config/locales/users.ru.yml
2012-03-12 23:04:31 +06:00
843d95b64e
[refs #257 ] fixed 'big' geometry
2012-03-12 23:02:02 +06:00
4fd91e2bfe
[refs #257 ] force convert avatar to jpg
2012-03-12 22:28:56 +06:00
24639b8684
[refs 257] renamed to profile
2012-03-12 21:03:25 +06:00
bb7cff5de8
Fix abilities - allow users search build_lists. Refs #223
2012-03-12 13:46:57 +02:00
535c075d3e
[issue #279 ] Added platform main page, menu & sidebar
2012-03-12 03:08:50 +04:00
a78b7b4155
Merge branch 'master' into 3.2-master
2012-03-11 23:39:11 +02:00
6d5120e5cc
Merge branch '3.2-master' into 265-new_design_for_activity_feed
2012-03-11 22:44:25 +06:00
1cf2660cda
Fix search order. Refs #255
2012-03-08 02:32:12 +02:00
41ae79eb46
Add configurable arch parameter to project build_for method. Write rake task for projects build. Refs #282
2012-03-08 01:25:17 +02:00
41cd1ddaf3
Redo cusel assign to avoid side effects. Refactor and cleanup projects controller, routes, views. Apply new design and functionality for projcts list page. Add fork button and fix fork. Apply gap repo during repo fork. Apply attr_accessible for projects. Cleanup locales. Fix new_build link ability check. Refs #195
2012-03-07 23:34:49 +02:00
c657efc338
[refs #194 ] show all project labels without searching
2012-03-07 19:36:17 +06:00
7588a318da
Merge branch '3.2-master' into 265-new_design_for_activity_feed
...
Conflicts:
app/models/user.rb
2012-03-07 03:58:35 +06:00
13ba125dc0
[refs #265 ] add project_id to comment & fix email notification
2012-03-07 03:49:29 +06:00
0f823bd9f3
[refs #265 ] fix security & commit to comments
2012-03-07 02:51:51 +06:00
4b9d0616d6
Merge branch '3.2-master' into 194-issue_page
...
Conflicts:
app/views/issues/_create_sidebar.html.haml
2012-03-07 01:19:34 +06:00
7308c4a0d2
Merge branch '3.2-master' into 255-search
...
Refactor avatars. Fix user bugs. Remove ssh_key delete migration
Conflicts:
app/assets/stylesheets/design/custom.scss
app/models/user.rb
2012-03-06 20:59:29 +02:00
872132d8a6
[refs #265 ] fix find owner and project
2012-03-07 00:20:14 +06:00
8ae7ebee2b
Merge branch '3.2-master' into 194-issue_page
2012-03-06 22:51:13 +06:00
d6f9b2c3e9
Minor gems update. Apply search design and controller. Add and refactor search scopes. Fix relations. Separate and refactor search translations. Refactor search form. Refs #255
2012-03-06 17:53:04 +02:00
b9de81f4df
[refs #194 ] managing labels in the issue
2012-03-06 21:21:13 +06:00
7e53a6c511
[refs #265 ] Fix git push and delete branch partials and logic
2012-03-06 18:57:05 +04:00
f54d889f74
[refs #265 ] Fix activity partials messages and locales. Fix observer.
2012-03-06 18:04:05 +04:00
4f995ca548
[refs #265 ] hook mode 775 -> 755
2012-03-06 15:39:23 +06:00
de0f7c83c8
[refs #265 ] fix hook and add execute bit for it
2012-03-06 15:07:14 +06:00
9e6d06f1c9
[refs #194 ] manage issue executer
2012-03-06 00:28:55 +06:00
91ba8b1543
[Refs #257 ] Fix password change, refactoring.
2012-03-05 19:36:23 +04:00
73296059eb
[refs #257 ] Merge 3.2-master into 257-new_design_for_profiles
2012-03-05 13:42:39 +04:00
c176304088
Add first version of new design to activity feed. Add new scope to BuildList model. Fix one moment into observer.
2012-03-05 13:11:50 +04:00
9b68752ffd
[refs #257 ] Change avatar helper and logic. Add paperclip avatar to users
2012-03-03 22:05:02 +04:00
f58e24b134
[refs #257 ] User edit pages fixes
2012-03-03 20:03:23 +04:00
159fbe65dc
Re-add compass. Add flash messages design. Refactor and fix bugs after merge. Remove duplicates, sync and separate locales . Fix some specs. Refs #263
2012-03-03 02:28:27 +02:00
a831a4aa63
Merge branch '3.2-master' of github.com:warpc/rosa-build into 3.2-master
2012-03-03 01:43:14 +02:00
56a12dc9ea
Merge branch 'master' into 3.2-master
...
Conflicts:
app/models/comment.rb
app/models/issue.rb
config/locales/en.yml
2012-03-03 01:38:43 +02:00
622d80c6d3
Merge pull request #261 from warpc/194-tracker
...
[Refs #194 ] Fix ACL and tests for issues
2012-03-02 11:48:10 -08:00
7cd3e40efc
[refs #194 ] fix accessible list
2012-03-03 01:23:45 +06:00
8677fa7493
[refs #232 ] Remove name field
2012-03-02 14:39:48 +04:00
56b9371ee2
[refs #194 ] add default scope for comments
2012-03-02 01:10:12 +06:00
7d112d0524
Fix build_lists bugs. Add build list display and new build list pages design, apply compass. Refactor and cleanup assets. Refactor abilities. Refactor build_list search. Improve layout_class helper. Change defaul build_lists index filter and fix specs. Fix assets path. Refs #223
2012-03-01 19:33:46 +02:00
bc75b318ce
[refs #195 ] Merge 3.2-master into 195-new_design_for_projects
2012-02-29 21:37:28 +04:00
cefaa902b1
Apply new design for projects build monitoring page. Improve and refactor filters. Improve abilities. Switch off old statuses. Separate build_lists translations. Refactor and remove duplicate translations. Refactor and code cleanup. Fix specs. Apply layout class helper. Refs #223
2012-02-29 16:04:38 +02:00
b20c533e6b
[Refs #221 ] Fix xml-rpc call
2012-02-29 16:00:02 +04:00
2e16d3c4ee
Merge pull request #237 from warpc/221-delete_product_build_list
...
[Refs #221 ] delete product build list
2012-02-29 03:25:25 -08:00
02cbec8d86
[Refs #221 ] Add xml-rpc call for iso container destroy
2012-02-29 15:15:49 +04:00
97c9eab3be
[ Fix #236 ] Add application/octet-stream content type for tar.bz2 product attachment
2012-02-29 13:41:42 +04:00
fe46e53ad8
[issue #195 ] Many changes.
...
* Base presenter moved to lib
* Added diff display
* Changes in some views
TODO Add translations.
TODO Change commit page layout.
TODO Change representation of commit on commit page.
TODO Fix bug with tree/branch select.
2012-02-29 06:02:07 +04:00
895b095058
Merge branch '3.2-master' into 194-tracker
...
Conflicts:
app/assets/stylesheets/custom.scss
app/assets/stylesheets/main.scss
2012-02-28 22:31:00 +06:00
e9ae923b60
[refs #195 ] Merge 3.2-master into 195-new_design_for_projects
2012-02-28 20:10:31 +04:00
529d8d3708
Merge pull request #192 from warpc/123-activity-feed
...
[Refs #123 ] activity feed (commits notifcation not work)
2012-02-28 07:46:55 -08:00
06795a56be
[refs #195 ] Add sections action ability for projects
2012-02-28 19:44:16 +04:00
2f39b050ae
Merge branch 'master' into 3.2-master
...
Conflicts:
config/deploy.rb
2012-02-28 17:44:11 +02:00
0abea8ff55
[refs #194 ] fix issues count
2012-02-28 20:28:11 +06:00
bc4a157703
Merge branch '3.2-master' into 194-tracker
...
Conflicts:
app/assets/stylesheets/application.scss
app/views/issues/_form.html.haml
app/views/platforms/show.html.haml
2012-02-28 20:13:08 +06:00
0d75a37451
[refs #194 ] show page beta version
2012-02-28 20:05:18 +06:00
7d56267e03
[ Fix #224 ] Alphabetic order category list
2012-02-28 14:35:17 +04:00
70963d0943
Merge branch 'master' into 3.2-master
2012-02-27 22:34:21 +02:00
159ef26b38
Merge branch 'master' into 3.2-master
...
Conflicts:
app/views/wiki/_compare.html.haml
app/views/wiki/_diff_data.html.haml
db/schema.rb
2012-02-27 22:32:57 +02:00
ddda2b92ab
[Refs #221 ] Delete product build lists (only in web)
2012-02-28 00:00:33 +04:00
1005fbd64f
Add link to product container. Refs #217
2012-02-27 18:21:56 +02:00
27c85d32df
[refs #194 ] create page; index pagination; some bugs
2012-02-27 22:10:12 +06:00
e1f7817624
Add local admin ability to build product. Fix template links. Refactor. Refs #217
2012-02-27 15:49:24 +02:00
72fec3b314
[refs #195 ] Add owner choose on project create
2012-02-27 13:03:28 +04:00
dde81b5554
[refs #123 ] fix activity feed for commit comments; remove reply notification
2012-02-25 00:25:35 +06:00
46a5ab1c76
Merge branch 'master' into 123-activity-feed
...
Conflicts:
config/deploy.rb
db/schema.rb
2012-02-24 20:44:36 +04:00
3c8f1c062b
Fix ActivityFeed for user, remove info about password [Refs #207 ]
2012-02-24 20:33:00 +04:00
3685eafe57
Remove unused code [Refs #207 ]
2012-02-24 19:35:29 +04:00
51e2c85b0a
Fix build_for settings. Refs #207
2012-02-24 19:28:01 +04:00
165a8dd6f4
Build only main repo. Refs #207
2012-02-24 19:28:01 +04:00
15f78e30a0
Redo platform build_all with sleep and errors rescue. Refs #207
2012-02-24 19:28:00 +04:00
07093c0d1d
Create directory for platform before clone. Fix created directory permissions. Increase timeout during XML RPC clone. Switch off cascade XML RPC requests during platform destroy. Refs #207
2012-02-24 19:28:00 +04:00
9015b971aa
Redo clone logic. Split clone process for repositories. Optimize and refactor. Refs #207
2012-02-24 19:28:00 +04:00
069c226110
Place platform destroy to background. Redo clone process to 2 phases - base_clone and relations_clone. Place relations clone and XML RPC to background. Remove unneeded validations. Refactor xml_rpc_clone. Refs #207
2012-02-24 19:28:00 +04:00
600df031f5
Refactor platform clone controller and routes. Refactor and fix clone process for platform, repository, product. Place XML RPC clone request to DJ. Refs #207
2012-02-24 19:27:59 +04:00
5e58ec9e59
Delegate all repo abilities to platform. Remove repository owner and relations. Fix templates and specs. Refactor and code cleanup. Refs #205
2012-02-24 19:27:58 +04:00
30f47a1748
[refs #134 ] lost env!
2012-02-24 19:27:57 +04:00
a809a4c116
[refs #134 ] fixed bug with new project
2012-02-24 19:27:57 +04:00
41861185c0
[refs #134 ] fixed git hook
2012-02-24 19:27:56 +04:00
bab3a90155
Apply approved and rejected filters for register requests. Tune abilities. Link to user profile if user have already registered. Refs #174
2012-02-24 19:27:55 +04:00
bda978a306
Fix bug with group autocomplete. Do not delete during rsync
2012-02-24 17:27:49 +02:00
28e2494e14
[refs #123 ] Remove stubs controller
2012-02-24 15:26:50 +04:00
dde34cdffb
Fix build_for settings. Refs #207
2012-02-23 22:20:44 +02:00
86c717dee5
Build only main repo. Refs #207
2012-02-23 21:06:28 +02:00
66fc31e404
Redo platform build_all with sleep and errors rescue. Refs #207
2012-02-23 20:32:56 +02:00
9e5e7cd5e4
[refs #194 ] labels manage
2012-02-23 20:48:46 +06:00
b192ebdcea
Create directory for platform before clone. Fix created directory permissions. Increase timeout during XML RPC clone. Switch off cascade XML RPC requests during platform destroy. Refs #207
2012-02-23 00:57:43 +02:00
9eb191da7b
Redo clone logic. Split clone process for repositories. Optimize and refactor. Refs #207
2012-02-22 22:24:29 +02:00
8f4c207545
Place platform destroy to background. Redo clone process to 2 phases - base_clone and relations_clone. Place relations clone and XML RPC to background. Remove unneeded validations. Refactor xml_rpc_clone. Refs #207
2012-02-22 14:35:40 +02:00
5b29de93af
Refactor platform clone controller and routes. Refactor and fix clone process for platform, repository, product. Place XML RPC clone request to DJ. Refs #207
2012-02-21 23:27:11 +02:00
ecb29d1762
[refs #194 ] tags -> labels
2012-02-22 02:28:04 +06:00
85f3d956f5
[issue #195 ] Merge branch '203-feed_message' into 195-new_design_for_projects
...
Conflicts:
app/views/layouts/application.html.haml
2012-02-21 19:42:30 +04:00
ed60751dfa
Delegate all repo abilities to platform. Remove repository owner and relations. Fix templates and specs. Refactor and code cleanup. Refs #205
2012-02-21 01:13:05 +02:00
0ce76207af
[refs #194 ] Add issue tags
2012-02-21 00:41:40 +06:00
76beb6a277
[refs #194 ] add creator to issue
2012-02-19 23:28:43 +06:00
edc8774387
[issue #203 ] Some layout changes & presenters.
...
* Fixed bugs in layout
* Fixed typos
* Fixed bugs in JS
* Added universal partial _feed_message.html.haml
* Added presenters
* Added CommitAsMessage presenter, that prepares Grit::Commit
to be shown as message.
2012-02-19 02:47:57 +04:00
a5375c369c
[refs #134 ] lost env!
2012-02-16 22:29:41 +06:00
4888993c3f
[refs #134 ] fixed bug with new project
2012-02-16 21:08:08 +06:00
20836e8864
[refs #134 ] fixed git hook
2012-02-15 17:12:49 +06:00
da0d791f74
[refs #96 ] fixed commentable & subscribeable ids
2012-02-15 02:28:01 +06:00
2c493cdbb7
Apply approved and rejected filters for register requests. Tune abilities. Link to user profile if user have already registered. Refs #174
2012-02-14 20:15:52 +02:00
101fa63514
Small ActivityFeed refactoring
2012-02-14 20:46:08 +04:00
08ffd8c25d
[refs #123 ] Add wiki to ActivityFeed
2012-02-14 20:09:41 +04:00
b7b69a86d8
Minor gems update. Sync with newest styles, javascripts, images. Refactor assets. Merge and fix wiki assets, temporary disable buggy ones. Change subscribeable_id type from string to decimal to avoid bugs. Auto convert commit subscribe subscribeable_id from hex to decimal. Refactor commentable. Fix bugs and some specs. Refactor application.yml. Refs #96
2012-02-14 18:05:41 +02:00
5039907431
Merge branch 'master' into 123-activity-feed
2012-02-14 14:30:27 +04:00
7d74b0af13
Merge branch 'master' into 96-upgrade_rails
...
Conflicts:
Gemfile
Gemfile.lock
app/models/group.rb
app/views/layouts/application.html.haml
db/schema.rb
public/stylesheets/git/style.css
2012-02-14 02:14:03 +02:00
99c314fb11
[issue #133 ] Merge branch 'master' into 133-editing_from_web
...
Conflicts:
db/schema.rb
2012-02-13 21:48:40 +04:00
1356ffa437
[refs #178 ] Fix project create error with group owner
2012-02-13 14:23:20 +04:00
9271c15a5f
[refs #123 ] Add new commits support
2012-02-10 21:33:05 +04:00
704c544cbc
Add more register_requests fields, change design. Apply invitation mail sending. Refactor. Refs #174
2012-02-10 18:33:16 +02:00
e535ca2b64
Fix validations. Refs #174
2012-02-10 01:33:06 +02:00
d0fe7f55d5
[issue #174 ] added static pages and some changes
2012-02-10 02:57:43 +04:00
edef21068d
[issue #174 ] Fixed bug with RegisterRequest
2012-02-10 01:44:47 +04:00
ce39cdd04f
[issue #174 ] A half of work to create invitations system
2012-02-09 21:46:23 +04:00
e23a02d357
[issue #133 ] Some fixes in Git::Repository#update_file
2012-02-09 04:03:40 +04:00
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
d44a274c77
[issue #133 ] Fixed bug and added comments
2012-02-09 00:56:18 +04:00
74d401d087
[issue #133 ] Writed draft of web editing.
2012-02-08 21:51:30 +04:00
c47db56270
[refs #168 ] can read repos in the open platform
2012-02-07 19:55:45 +06:00
325667dde0
[refs #168 ] removed wrong ability
2012-02-07 17:31:00 +06:00
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
36f609ec7d
[refs #143 ] fix destroy
2012-02-07 01:47:39 +06:00
96d3b35bdf
[refs #123 ] Merge master into 123-activity-feed
2012-02-06 19:46:32 +04:00
4e3d6b4056
Show xml-rpc error code in error message
2012-02-06 19:07:08 +04:00
c367fc818b
Merge branch 'master' of github.com:warpc/rosa-build
2012-02-06 19:05:50 +04:00
fde67a2c22
[refs #134 ] add post receive hook to repos
2012-02-06 15:31:22 +06:00
85c0d8b827
Change git branch for mass rebuild
2012-02-03 18:32:04 +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
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
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
0559f1b678
[refs #127 ] Filter request refactor
2012-02-01 20:00:19 +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
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
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
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
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
2e2e7e43d3
[refs #114 ] some refactoring
2012-01-30 02:18:14 +06:00
39a4479fa3
[refs #114 ] fix emails uniqueness
2012-01-29 22:27:46 +06: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
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
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
e01fe571b4
[refs #123 ] Add activity feed en translation fixes
2012-01-27 18:59:28 +04:00
a5d6889999
[refs #128 ] Add devise confirmable and reconfirmable options
2012-01-27 18:58:38 +04: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
72fd821bc8
[refs #123 ] Add fixes for activity feed
2012-01-27 16:06:04 +04: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
George Vinogradov
Vladimir Sharshov
konstantin.grabar
Alexander Machehin
Pavel Chipiga
Pasha
konstantin.grabar