2ec2548390
[refs #195 ] Add base design and functional to project members page
2012-02-29 01:01:25 +04: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
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
03663a8ed7
[refs #195 ] Add sections page and method to projects
2012-02-28 12:00:56 +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
582063d066
[issue #195 ] Commits history, editing, showing...
2012-02-27 21:40:46 +04:00
27c85d32df
[refs #194 ] create page; index pagination; some bugs
2012-02-27 22:10:12 +06:00
3685eafe57
Remove unused code [Refs #207 ]
2012-02-24 19:35:29 +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
9e5e7cd5e4
[refs #194 ] labels manage
2012-02-23 20:48:46 +06:00
6fe88ed69d
[issue #195 ] Merge branch '195-new_design_for_projects' of github.com:warpc/rosa-build into 195-new_design_for_projects
...
Conflicts:
app/presenters/git_presenters/commit_as_message_presenter.rb
2012-02-23 02:16:20 +04:00
43b7ccd3dc
[issue #195 ] Added blob show. Some changes.
2012-02-23 02:11:55 +04:00
ba1798fd71
[refs #195 ] Add design to form and edit page
2012-02-22 21:48:37 +04: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
2b675c6f84
[refs #193 ] Fix routes regex for wiki compare
2012-02-20 13:56:09 +04:00
d9025b093f
[refs #193 ] Compare routes repair and compare design
2012-02-17 18:12:05 +04: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
d0fe7f55d5
[issue #174 ] added static pages and some changes
2012-02-10 02:57:43 +04:00
ce39cdd04f
[issue #174 ] A half of work to create invitations system
2012-02-09 21:46:23 +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
74d401d087
[issue #133 ] Writed draft of web editing.
2012-02-08 21:51:30 +04:00
96d3b35bdf
[refs #123 ] Merge master into 123-activity-feed
2012-02-06 19:46:32 +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
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
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
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
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
acdd1f22b6
[issue #64 ] Fixed bug with revert all wiki.
2012-01-28 16:10:43 +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
e71a9e84cb
[refs #114 ] emails control
2012-01-27 02:11:07 +06: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
dd1493d677
[refs #123 ] Add activity feed page. Remove some unnessary code. Some logic fixes.
2012-01-25 17:05:39 +04:00
45877e8b5c
[issue #64 ] Bug fix & views refactoring
...
* Fixed bug with history
* Navigation moved to partial.
2012-01-25 00:47:55 +04:00
9127b6b689
[refs #114 ] changed logics
2012-01-24 01:42:54 +06: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
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
0c527af291
[issue #64 ] Added revisions comparsion.
2012-01-19 17:49:32 +04:00
51e9b5d1f6
[issue #64 ] Some changes in views and routes.
2012-01-18 02:28:59 +04: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
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
52696791f2
[refs #54 , #94 ] Merge master into issues
2012-01-16 13:42:44 +04:00
794c55a030
Merge branch 'master' of github.com:warpc/rosa-build into 18-commit_comments
2012-01-13 22:01:30 +06: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
07dc7a4800
[refs #18 ] add comments to commit
2012-01-12 17:19:22 +06:00
2b8aca5f09
[refs #54 ] Add settings notifier
2012-01-11 17:58:13 +04:00
7c50b2c3f5
[issue #76 ] Added jQuery DataTable. But it doesn't work yet
2011-12-31 02:42:58 +04:00
a44530980e
[refs #54 ] Remove some unnessacary comments
2011-12-30 18:44:47 +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
ec95373d28
[#issue 64] Routes to Wiki and some methods in controller.
...
Useless yet.
2011-12-26 21:07:16 +04:00
ce6746f7a9
[refs #54 ] Add subscribes and notifications
2011-12-26 19:48:57 +04:00
5237939f49
Merge issues with master
2011-12-26 13:26:13 +04: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
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
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
3ab55d34b8
[refs #54 ] Add CanCan rules for issues and comments. Fix serial_id routes and some actions
2011-12-21 18:48:16 +04:00
d901426b79
Move project build functinality to build_lists controller. Refactor downloads url - create model based methods for url genertion. Cleanup code. Add includeed_repos functionality. Display included_repos on build_list page. Refs #65
2011-12-21 16:01:50 +02:00
6c48e058be
[ close #70 ] Removed all & filter methods in BuildListsController
...
* Removed methods
* Changed abilities
* Changed routes
* Added specs
2011-12-21 05:30:34 +04:00
375c98366f
[ref #54 ] Add has_issue settings to projec edit. Fix routes and friendly_id bug. Fix some moments
2011-12-20 20:57:34 +04:00
d20d43eb2b
[refs #54 ] Base logic and templates for issues and comments to them
2011-12-19 19:30:14 +04:00
1b3e473b94
[ closed #20 ] Changed adding collaborators to project
...
Changed collaborators page of project:
* Added form to input group and/or project nickname.
* In tables show only projects/groups that already added to project
2011-12-14 19:52:47 +04:00
168e110169
[ close #11 ] Changed adding members to group.
2011-12-10 03:40:13 +04:00
603e4b3691
fixed #4 . Removed unnecessary routes and views parts.
2011-12-08 18:47:18 +04:00
6794ca42fb
Fix date filter normalization. Add build, freeze, unfreeze confirmation. Refs #2261
2011-12-07 02:09:04 +02:00
2f5ce7cebe
Merge branch 'groups_reincarnation' into staging
...
Conflicts:
app/models/ability.rb
app/models/project.rb
config/environments/production.rb
2011-12-05 17:16:32 +04:00
9cc820080b
Groups base functional.
2011-12-05 16:32:18 +04:00
6d8e4f98b9
[refs #2249 ] Some ACL changes
2011-12-01 13:29:04 +04:00
f154ccc132
Fixed groups creation.
2011-11-30 19:27:19 +04:00
438bedd226
Add build all btn to platforms
2011-11-30 18:48:50 +04:00
7023dda7e0
First iteration of groups refactoring.
2011-11-30 16:58:14 +04:00
141fe7677f
Apply project fork button. Refactor and cleanup code. Refs #2243
2011-11-23 17:52:33 +02:00
140eaf6265
[refs #2249 ] Remove old roles managment system
2011-11-21 21:43:37 +04:00
4d4f5deed4
[refs #2249 ] Remove bitmask. Add new rules. Add some authorize filters. Add some template can? helpers
2011-11-16 22:45:01 +04:00
7996740ae7
Improve build_lists time. Apply product build lists basic functionality. Move product build functionality to separate controller. Apply event logging for product build. Fix logging for project build list publishing. Code refactor and cleanup. Refs #2161
2011-11-11 19:13:09 +02:00
4b4df620ff
Fix test sudo action
2011-11-03 15:16:17 +04:00
df2f3abe62
[refs #2161 ] Add test sudo action
2011-11-03 14:33:23 +04:00
f5ba1b34f2
Fix repository and personal_repository - add_project add remove_project actions. Fix links. Refactor. Refs #2162
2011-11-02 23:37:19 +02:00
1a0e235167
Add auto_build_lists destroy action. Fix auto_build process. Improve auto_build relations. Refs #2162
2011-11-02 21:18:43 +02:00
7b8df283eb
[refs #2161 ] Change regenerate logic for private_users
2011-11-02 14:42:08 +04:00
103cb16f27
Added form to set name of platfroms clone
2011-11-02 02:00:44 +04:00
fd5dc9fd01
[refs #2161 ] Small categories fix
2011-11-02 00:56:01 +04:00
2c0422a3bc
[refs #2161 ] Split platforms on three groups
2011-11-02 00:53:48 +04:00
5c97e89829
Fix gitolito update_key bug. Push project colaborators git. Fix key update. Hide colaborators groups. Improve RPC XML tests. Refactor and code cleanup. Refs #2162
2011-11-01 02:52:24 +02:00
de959bb527
[refs #2161 ] Add refresh option to statistics
2011-10-31 19:58:04 +04:00
b9ee6e365b
Added collaborators management.
2011-10-31 02:59:03 +04:00
af91843f4d
Changed routes.
2011-10-31 01:52:25 +04:00
30564e8e17
[refs #2161 ] Add auto build lists functional
2011-10-29 23:09:50 +04:00
411e40267a
Added stub for add_collaborators action.
2011-10-29 19:56:44 +04:00
c39e01ba32
Add auto_build hook recivier. Remove XML RPC from project. Gitolite docs. Refs #2136
2011-10-28 16:27:12 +03:00
89312375fd
Merge master and personal_repos
2011-10-27 17:13:53 +04:00
3114eb1ecc
[refs #2106 ] Add personal repos to project. Some changes of private repos controller and logic
2011-10-27 17:04:03 +04:00
a470f01690
Move easy_urpmi json integration to separate action. Do not require authentication. Change name to unixname, improve URL generation. Refs #1959
2011-10-27 14:02:25 +03:00
02a8a62f36
Added dump to yml and load from yml abilities for roles.
2011-10-26 04:35:01 +04:00
9c182f0bda
Merge master and build_lists_queue
2011-10-24 14:40:36 +04:00
7053333296
[refs #1832 ] Change downloads controller routes to statistics
2011-10-24 14:27:00 +04:00
d04de6e2fc
[refs #1832 ] Fixed git repos web interface routes
2011-10-24 14:19:04 +04:00
3915da75d4
Merge branch 'master' of github.com:warpc/rosa-build
2011-10-24 05:55:16 +04:00
ba617742a3
XML-PRC controller v1
2011-10-24 05:55:03 +04:00
5a5529ba3e
[refs #1832 ] Build list process fixes
2011-10-23 15:24:46 +04:00
54c7c80af8
Merge branch 'master' of github.com:warpc/rosa-build
2011-10-22 19:57:26 +04:00
c24a9fae1b
[refs #1832 ] Build Lists updates. Project updates and fixes.
2011-10-22 19:28:41 +04:00
600a897490
Added route to roles controller.
2011-10-21 19:39:32 +04:00
644d57b420
Merge branch 'catalog'
...
Conflicts:
Gemfile
Gemfile.lock
app/views/layouts/application.html.haml
app/views/repositories/show.html.haml
config/locales/ru.yml
config/routes.rb
db/schema.rb
2011-10-21 17:55:41 +03:00
a92282de1e
Merge branch 'chipiga'
...
Conflicts:
app/controllers/application_controller.rb
app/views/layouts/application.html.haml
config/locales/ru.yml
db/schema.rb
2011-10-20 19:55:03 +04:00
1659ad5805
Merge branch 'private_repos'
...
Conflicts:
config/application.yml.sample
config/locales/ru.yml
config/routes.rb
db/schema.rb
2011-10-20 19:49:35 +04:00
2dd99d32f9
Merge branch 'downloads'
...
First turn of merging.
Conflicts:
.gitignore
Gemfile
Gemfile.lock
config/locales/ru.yml
config/routes.rb
db/schema.rb
2011-10-20 19:22:11 +04:00
5291752419
Add categories and apply basic CRUD actions. Add category link and description to project. Apply category assign to project. Apply categorization with platforms. Integrate to common design and layout. Import basic categories structure. Refs #1858
2011-10-19 23:58:31 +03:00
ff36b1fdd3
Merge branch 'itima_web_refactoring'
...
Conflicts:
Gemfile
Gemfile.lock
app/models/user.rb
app/views/layouts/application.html.haml
config/locales/ru.yml
config/routes.rb
db/schema.rb
2011-10-19 18:09:58 +04:00
ee9af32fa6
Adding projects to repositories.
2011-10-19 17:16:29 +04:00
5f17928423
[refs #1923 ] Add private repositories to project
2011-10-18 17:47:17 +04:00
6d065ea01c
Changed routes and added some translations
2011-10-17 18:24:45 +04:00
5f705cdd0d
Develop and apply event logging mechanism without source code modification and with localization. Apply events log display with pagination. Apply XML RPC requests stub for local test. Refactor. Refs #1828
2011-10-17 11:04:36 +03:00
d7cddecbe8
Changed User representation.
2011-10-17 00:49:41 +04:00
8103b14e15
[refs #1861 ] Add downloads statistics
2011-10-14 10:35:25 +04:00
77e03df70b
Refactor gemfile and upgrade rails, devise and other gems, fix conflicts, remove deprecations. Implement user classic registration and registration through omniauth OpenId. Allow user enter correct nickname and change other info during registration through OpenId. Make login through nickname or email. Apply profile edit form. Dont ask current password for profile update. Fix layout and devise links. Refs #1954
2011-10-11 23:56:51 +03:00
02a9a46b60
Add publish function for BuildList
2011-09-15 21:56:20 +04:00
232eb9461e
Platform clone ui
2011-05-30 13:04:32 +04:00
c927abd073
added crontab to products without translations and setting values to generator form for existing crontab line
2011-04-28 18:32:11 +04:00
a1bef617f9
route fix
2011-04-22 18:29:19 +04:00
eafd2c4b3c
one more routes fix
2011-04-22 16:18:50 +04:00
043fa5736d
Routes fix
2011-04-22 15:39:26 +04:00
fb2808b9e6
crontab generator without translations, because im in fucken ISRAELgit add app/controllers/crontabs_controller.rb app/views/crontabs/show.html.hamlgit add app/controllers/crontabs_controller.rb app/views/crontabs/show.html.haml Shalom LEOLAM
2011-04-18 16:34:06 +04:00
38cef4d887
Minor product fixes
2011-04-15 13:23:12 +04:00
577cb2e126
added platform cloning and system_wide flag
2011-04-14 21:04:32 +04:00
1a6330956b
build list creation
2011-04-11 20:37:09 +04:00
e3b12e4a1a
merge
2011-04-11 14:52:37 +04:00
82869f57a7
build list items and more statuses
2011-04-11 14:47:57 +04:00
cd6e7ade15
Product Builder xml-rpc and Product model
2011-04-11 12:35:08 +04:00
62d0985fcb
more methods fot build lists, added is_circle build flag
2011-04-07 18:56:28 +04:00
4ac5931f44
fixes + build lists
2011-04-07 17:20:21 +04:00
konstantin.grabar
Vladimir Sharshov
Alexander Machehin
Pavel Chipiga
George Vinogradov
Ilya Krasilnikov
Alexey Nayden
Timothy N. Tsvetkov