d20d43eb2b
[refs #54 ] Base logic and templates for issues and comments to them
2011-12-19 19:30:14 +04:00
a946349bb4
[ close #23 ] Changed searching.
2011-12-16 04:33:44 +04:00
021f1f8691
Merge pull request #58 from warpc/47-fork_bug
...
Fix #47 . Problem with fork when project already exist in personal repository
* Allow to add only own projects to personal repository(solution);
* Fix tests;
* Remove deprected relation.
2011-12-15 14:08:03 -08:00
0c3b62b235
[issue #27 ] Changed abilities. Added test, but test fails.
2011-12-16 01:58:20 +04:00
7448d74416
Allow to add only own projects to personal repository. Fix tests. Remove deprected relation. Refs #47
2011-12-15 23:52:45 +02:00
b3f422e713
[refs #32 ] Add user filter
2011-12-15 20:15:25 +04:00
e3663381db
Merge branch 'master' into build_list_visibilities
2011-12-15 03:29:22 +04:00
a855366a75
Fix merge bug. Take back method. Refs #1
2011-12-15 00:11:31 +02:00
f1465f51ca
Merge branch 'master' into 1-bluepill
...
Conflicts:
app/controllers/platforms_controller.rb
app/models/platform.rb
2011-12-14 23:51:31 +02:00
2a108981d5
[update #20 ] To server sends id instead of uname. Added some specs
2011-12-14 19:54:04 +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
9ab07c1675
Merge pull request #36 from warpc/platform_edit
...
Edit platform;
Added callback updates with new owner.
Added a button for call edit action;
Removed unnecessary to edit platform form field when you upgrade.
2011-12-14 03:15:41 -08:00
1d55e8758e
Merge pull request #26 from warpc/platform_admin_fixes
...
Fix autocomplete. Rsync stubs for development env. Blocked problematic validation for development env
2011-12-14 02:00:01 -08:00
045b8441f6
Apply basic bluepill configuration, write capistrano recipe for it. Change deploy logic to integrate with bluepill. Refactor unicorn config. Cleanup depoy. Refactor mount_downloads script. Write autostart script. Remove old scripts. Refactor platform mount/umount methods. Fix bugs. Refs #1
2011-12-13 23:48:25 +02:00
30b08c4a80
[issue #27 ] Commented maybe unnecessarry scope.
...
Removed BuildList#scoped_open_to_user_with_groups because its
functionality provides CanCan after changes in [issue #37 ].
2011-12-13 19:24:02 +04:00
4a723369a2
[refs #12 ] Add platform update options
2011-12-13 17:27:27 +04:00
e0e0dd1fed
Merge branch 'master' of github.com:warpc/rosa-build
2011-12-13 17:15:22 +04:00
fdd89eb51b
#24 . Fix "uninitialized constant BuildList::BUILD_STARTED"
2011-12-13 15:02:41 +04:00
24766d2383
Merge pull request #14 from warpc/group_members_change
...
Changed adding members to group.
2011-12-13 02:16:37 -08:00
461cf3fd8e
[issue #27 ] Added using of new BuildList scope in controller
2011-12-13 04:27:03 +04:00
222033de5e
[refs #12 ] Fix platform relations again
2011-12-12 19:37:37 +04:00
6a364b73a6
[refs #12 ] Fix platform admin relations. Locales correction. Add validationa and rsync stubs.
2011-12-12 18:10:39 +04:00
c3f4c8dd87
[updated #16 ] admin_id renamed to admin_uname.
2011-12-11 21:43:42 +04:00
b9c0f1e3d9
[ fixed #16 ] Changed owner fetching in PlatformsController#create
2011-12-11 20:00:50 +04:00
d2831da4b8
Issue #11 updated. Added check if user already added.
2011-12-10 21:26:57 +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
26689f3bd2
Start writing Group tests.
2011-12-07 23:51:08 +04:00
0d9b683100
Fixed bug in ApplicationController#get_owner
2011-12-07 16:32:42 +04:00
0f827f2644
[refs #2249 ] Fix collaborators controller. Fix projects specs.
2011-12-07 13:47:43 +04:00
0bffb0581e
Some changes in groups.
2011-12-07 03:45:09 +04:00
c6e5ace271
fixed bug with empty group form submitting
2011-12-07 00:16:19 +04:00
701ccf54dd
Fix OpenID registration bug. Refs #2261
2011-12-06 21:45:25 +02:00
fcc17da1ad
[refs #2249 ] Add products specs. Fix some things in other specs
2011-12-06 19:24:33 +04:00
fc4643ce9b
[refs #2249 ] Fix some specs. Fix shared examples. Fix new/create repositories and products ability
2011-12-06 19:24:33 +04: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
d7c9452efa
Update gems. Redo exception catch for BuildServer.get_status. Write specs. Experiments with large file uploads. Refs #2261
2011-12-02 03:30:25 +02:00
96d4886f49
[refs #2249 ] Add new ACL relations
2011-12-01 18:20:24 +04:00
6d8e4f98b9
[refs #2249 ] Some ACL changes
2011-12-01 13:29:04 +04:00
e45ba6692a
Rename delete_build_list to cancel_build_list. Rescue XML get_status exception. Refs #2261
2011-12-01 00:55:47 +02:00
4ea4d7f56e
Refactor build_all - move to model. Apply delayed build_all. Refs #2261
2011-11-30 23:43:01 +02:00
76c5c86c27
Add db default value for build_lists field build_requires. Refs #2261
2011-11-30 21:03:58 +02:00
e7a6b01e09
Fix and refactor platform build_all. Add more settings. Refs #2261
2011-11-30 19:46:20 +02:00
81e290a9b3
Merge branch 'groups_reincarnation' of github.com:warpc/rosa-build into groups_reincarnation
2011-11-30 19:28:56 +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
19076c805e
Skip authorization for callback actions during project build. Refactor. Refs #2261
2011-11-30 15:56:00 +02:00
3a2215d0ee
Redo project versions to use tags and branches for build. Refs #2261
2011-11-30 15:56:00 +02:00
3bc2ff894c
Improve and fix project fork functionality. Fix project create and validation. Add user role display. Add user role at user edit form. Refs #2261
2011-11-30 15:55:59 +02:00
7023dda7e0
First iteration of groups refactoring.
2011-11-30 16:58:14 +04:00
7535fc124a
Skip authorization for callback actions during project build. Refactor. Refs #2261
2011-11-30 02:56:57 +02:00
4971fbbbde
Redo project versions to use tags and branches for build. Refs #2261
2011-11-30 02:22:26 +02:00
c4a31e3d29
Improve and fix project fork functionality. Fix project create and validation. Add user role display. Add user role at user edit form. Refs #2261
2011-11-29 23:42:58 +02:00
148a0fec28
[refs #2249 ] Global name to description and unixname to name renames
2011-11-29 14:51:14 +04:00
ea42fc19f2
Separate product XML build requests based on platform distrib_type. Adjust code to use new settings structure. Refactor settings and product builder. Refs #2261
2011-11-28 22:38:50 +02:00
02a813a474
Upgrade rails, devise and other gems. Refactor controllers. Fix application.yml config - remove unused keys and setup correct values for tests. Add product build lists status_build callback auth. Allow platform and project unixname uppercase. Write tests and fix bugs for ProductBuildList controller. Fix all unresolved test problems. Refs #2262
2011-11-26 02:54:40 +02:00
796ff75857
Great models refactoring. Refactor some cancan abilities and controllers authorization. Move some common parts to modules. Fix lots bugs. Remove unused files and code. Drop ACL tables. Add more can? helpers. Refs #2249
2011-11-24 23:48:58 +02:00
0573acb650
[refs #2249 ] Add more Collaborators and Projects controllers specs
2011-11-24 23:22:37 +04:00
141fe7677f
Apply project fork button. Refactor and cleanup code. Refs #2243
2011-11-23 17:52:33 +02:00
366ca320e0
Change and fix role assign logic and abilities. Other minor fixes. Refs #2261
2011-11-21 21:06:34 +02:00
b98453bd62
[refs #2249 ] Add new user managment logic
2011-11-21 22:26:56 +04:00
140eaf6265
[refs #2249 ] Remove old roles managment system
2011-11-21 21:43:37 +04:00
5e7ded2e93
[refs #2249 ] Remove custom ACL from project
2011-11-19 16:11:44 +04:00
44191926f7
[refs #2249 ] Some CanCan fixes. Add ru exception message
2011-11-19 15:49:14 +04:00
e50959e205
[refs #2249 ] Add full rules, helpers and filters of CanCan
2011-11-19 15:41:11 +04:00
d49880f24e
Merge branch 'smart_http' into staging
...
Conflicts:
app/models/relation.rb
app/models/user.rb
2011-11-18 20:35:12 +02:00
7b750a6f93
Merge branch 'cancan' into staging
2011-11-18 22:30:23 +04:00
4d78ce371f
Merge branch 'master' into staging
...
Conflicts:
app/models/build_list.rb
2011-11-18 20:27:33 +02:00
05bb9ce0c7
[refs #2249 ] CanCan rules update. Add admin role to relations. Change collaboratots edit logic and code
2011-11-18 22:26:22 +04:00
4be634a8fb
Add slash to easy_urpmi url. Refs #test_prepare
2011-11-18 15:00:31 +02:00
a819185ecc
Try to fix deploy. Fix easy_urpmi url. Refs #test_prepare
2011-11-18 14:50:06 +02:00
5f39e76b12
Merge branch 'master' into smart_http
...
Conflicts:
app/controllers/projects_controller.rb
app/models/build_list.rb
app/models/project.rb
2011-11-18 11:59:21 +02:00
497e8f64f4
Redo commit diffs display. Fix tree blob blame display. Refs #2162
2011-11-18 11:48:50 +02:00
d7702b9901
Sort project versions as numbers. Do not create duplicate build lists. Refs #test_prepare
2011-11-18 03:28:34 +02:00
2503503252
Process auto_build through DJ. Refs #test_prepare
2011-11-18 02:07:51 +02:00
cbfa5858d4
Add tags ordering, check and fix. Refactor auto_build. Refs #test_prepare
2011-11-18 00:28:02 +02:00
3b36943b91
Remove gitolite and it callbacks. Add git repo create, destroy callbacks. Improve grack wrappers: separate read/write requests, ask password for push even for public repo, prepare for cancan, apply hooks, refactor. Fix auto_build_lists order. Refactor auto_build - move to model. Redo git_repo_url. Improve and test project import script. Fix bugs, refactor and cleanup. Refs #2243
2011-11-17 23:57:30 +02:00
2772bddc06
[refs #2249 ] Add new rules. Fix joins trouble. Add new relations dynamic methods.
2011-11-17 23:34:02 +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
827936a06c
Remove custom ACL calls. Add CanCan and some rules. Add bitmask_attribute
2011-11-16 00:05:08 +04:00
b36cc24a64
Redo commit diffs display. Fix tree blob blame display. Refs #2162
2011-11-11 23:57:10 +02:00
e7f9d8251a
Rename product field build to build_script. Change links. Refs #2161
2011-11-11 21:12:15 +02: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
c64f93f6bd
One more fix build_lists#cancel logging. Improve XML RPC stubbing. Refactor. Refs #2161
2011-11-08 00:54:25 +02:00
fb165483b8
Refix platform clone with products. Refs #2162
2011-11-03 14:49:14 +02:00
8030ea1afb
Fix test sudo action
2011-11-03 15:18:26 +04:00
4b4df620ff
Fix test sudo action
2011-11-03 15:16:17 +04:00
d9a03013b4
[refs #2161 ] Fixes projects filter
2011-11-03 15:01:29 +04:00
117ae7bbff
[refs #2161 ] Repair projects filter
2011-11-03 14:56:41 +04:00
df2f3abe62
[refs #2161 ] Add test sudo action
2011-11-03 14:33:23 +04:00
49e4dea478
Redo platform clone. Refs #2162
2011-11-03 10:32:45 +02:00
f4c3bafb6d
[refs #2161 ] Change logic and output of urpmi commands
2011-11-03 12:03:08 +04:00
910446954c
Fixed access to BuildList
2011-11-03 02:13:58 +04:00
3e2e01deb6
Changed My Projects block
2011-11-03 01:39:50 +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
e1ba3dda2e
Merge branch 'master' of github.com:warpc/rosa-build
2011-11-03 00:34:52 +04:00
f1bd00545e
Show code of task
2011-11-03 00:34:31 +04:00
96e223d0eb
Fix project search during auto_build action. Refs #2162
2011-11-02 22:28:08 +02:00
ae6919a240
Add url for downloading file archive
2011-11-03 00:25:25 +04: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
18dae1e894
Fix for ProductBuild
2011-11-02 22:48:21 +04:00
5b475ef2b8
Send platform unixname as path
2011-11-02 22:21:02 +04:00
b048c54004
Added own projects sidebar
2011-11-02 20:22:42 +04:00
1dfb272ffc
Fixed removing project from repository.
2011-11-02 16:55:20 +04:00
4341155771
[refs #2161 ] Change private users and personal repos menus
2011-11-02 16:43:41 +04:00
18de67ba7d
Merge branch 'master' of github.com:warpc/rosa-build
2011-11-02 16:32:19 +04:00
33e8e49007
Changed platform clone
2011-11-02 16:30:47 +04:00
7b8df283eb
[refs #2161 ] Change regenerate logic for private_users
2011-11-02 14:42:08 +04:00
9c00f9b56b
Order correct on main page
2011-11-02 12:27:14 +04:00
392db40a31
Fixed bug with platforms#clone
2011-11-02 02:05:18 +04:00
103cb16f27
Added form to set name of platfroms clone
2011-11-02 02:00:44 +04:00
38f96adbba
Refix category display. Refs #2162
2011-11-01 23:56:50 +02:00
0255334bc5
Fix category display. Refs #2162
2011-11-01 23:28:41 +02:00
2c0422a3bc
[refs #2161 ] Split platforms on three groups
2011-11-02 00:53:48 +04:00
fffb73a484
[refs #2161 ] Update auto_build_lists controller scopes
2011-11-02 00:23:06 +04:00
ee02bc7a4a
Fix category projects counter. Fix git blame links. Stub error when git commit diff is too big. Refs #2162
2011-11-01 20:13:08 +02:00
b835c7ad3c
Find right @repositories in repositories#index
2011-11-01 20:27:34 +04:00
b9c4ab3170
Fix downloads message
2011-11-01 20:06:50 +04:00
e36389adfd
[refs #2161 ] Fix add_project
2011-11-01 18:34:35 +04:00
643bf964e4
[refs #2161 ] Fix private users key pair remove
2011-11-01 17:54:28 +04:00
e03d711d1b
[refs #2161 ] Global private users and repos fixes
2011-11-01 17:32:50 +04:00
5ac70da272
Fixed bug in ACL checks
2011-11-01 02:49:24 +04:00
dfc507ff59
Fixed some bugs in ACL checks.
2011-11-01 01:55:56 +04:00
28bc00e937
Merge branch 'master' of github.com:warpc/rosa-build
2011-10-31 22:14:55 +04:00
932251a190
Added ACL to controllers
2011-10-31 22:14:25 +04:00
43e1c31ced
[refs #2161 ] Fix privates controller filters
2011-10-31 21:12:35 +04:00
fcb9007a47
[refs #2161 ] Fix downloads actions
2011-10-31 20:18:55 +04:00
de959bb527
[refs #2161 ] Add refresh option to statistics
2011-10-31 19:58:04 +04:00
ea0be5cd97
Fix distr_types. Refs #2162
2011-10-31 17:20:16 +02:00
0556ebdf8e
Fixed bug with adding collaborators.
2011-10-31 17:24:46 +04:00
5fb704d3c5
Fixed bug with user registration and changed hardcoded 'mandriva2011'
2011-10-31 04:33:47 +04:00
afc1d492a8
Add events logging for platform change_visibility action. Improve autobuild events logging. Add events log for private access to hidden repositories. Change owner assign for platform and repository. Improve gitolite doc. Refactor. Refs #2162
2011-10-31 02:13:22 +02:00
b9ee6e365b
Added collaborators management.
2011-10-31 02:59:03 +04:00
cd14be75ce
[refs #2161 ] Fixed project versions collect
2011-10-31 01:11:59 +04:00
f39e51e516
Fix XML RPC responses. Refs #2162
2011-10-30 21:01:08 +02:00
0c3a044f81
Fix REXML Exception when using Unicorn or Passenger with XmlRPC. Add XML RPC events logging. Refactor. Improve after_rollback callback. Refs #2162
2011-10-30 18:46:52 +02:00
8f194e97c5
Fix auto build list
2011-10-29 23:24:57 +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
14bc7acc0b
Fixed mass assignment to global_role_id
2011-10-29 18:14:41 +04:00
a810c0fc3a
Added editing of global_role of user.
2011-10-29 17:39:40 +04:00
512364be32
[refs #2161 ] Add get_status call
2011-10-29 17:38:17 +04:00
4e0617a722
[refs #2161 ] Swap bpl and pl fields into BuildList
2011-10-29 16:18:41 +04:00
372d7dac4d
[refs #2161 ] Fix categories group by and select
2011-10-29 15:25:11 +04:00
05595c7ce6
Fix empty json answer
2011-10-29 13:38:52 +04:00
2f5e77ba56
Added call of visible_to to platforms and projects.
2011-10-29 02:34:51 +04:00
5910c8c29b
Apply event logs for build list create, cancel, publish. Refs #2136
2011-10-29 01:31:47 +03:00
cdedcee801
Skip ACL for some actions. Log git hook to system events log. Fix build_list version format. Fix sidebar for build list display. Translate for ACL. Doc for project bootstrap. Refs #2136
2011-10-28 22:59:07 +03:00
324b730a7d
Added checking of global rights to all controllers.
2011-10-28 21:55:40 +04:00
7b3167cfa7
Add personal repository rights. Add personal checker to controller
2011-10-28 18:28:45 +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
6238012fa9
[refs #2106 ] Move visibility logic to platforms
2011-10-28 11:20:13 +04:00
4f6bfac345
Fix rep destroy redirect
2011-10-28 03:16:22 +04:00
04b49c9f65
Add hidden field for platform_id within repository new form
2011-10-28 02:49:37 +04:00
f66216fa6a
Change project redirect rules. Fux git repo clone port. Refs #2136
2011-10-28 01:44:02 +03:00
37c37f5cbd
Merge branch 'master' of github.com:warpc/rosa-build
2011-10-27 18:49:14 +04: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
857ae7621a
Merge branch 'gitolito'
2011-10-27 15:50:21 +03:00
7b9fa26ac8
Remove git_projects_path application config var. usr root_path instead. Fix bugs. Improve links, usability, refactor. Refs #2136
2011-10-27 15:49:26 +03: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
879b7acf8e
[refs #2109 ] Fixed platform editing
2011-10-27 13:30:38 +04:00
d932999b8c
Fixed bug in determining visibility of object
2011-10-27 01:14:16 +04:00
0171a0a42a
Apply basic git repo functionality operation: add, change, destroy user ssh_key. Create, destroy, open/close project git repos. Calc project owner. Improve UI for users, groups and projects: fix links and routes, add actions refactor. Other minor fixes and refactoring. Add ssh_key uniqness check. Add uname uniqness check between User and Group. Check project owner ssh_key existance before project creation. Temporary disable uname and unixname change due to gitolite stranges. Refs #2136
2011-10-26 23:57:51 +03:00
26f405fccd
Removed old methods from ApplicationController
2011-10-26 15:01:09 +04:00
02a8a62f36
Added dump to yml and load from yml abilities for roles.
2011-10-26 04:35:01 +04:00
bc761b4ef3
Added authenticate filters.
2011-10-24 17:01:15 +04:00
9c182f0bda
Merge master and build_lists_queue
2011-10-24 14:40:36 +04:00
d04de6e2fc
[refs #1832 ] Fixed git repos web interface routes
2011-10-24 14:19:04 +04:00
f5033a224c
XML-PRC controller
2011-10-24 05:59:16 +04:00
82d72a851c
ACL for testing.
2011-10-24 01:39:44 +04:00
5a5529ba3e
[refs #1832 ] Build list process fixes
2011-10-23 15:24:46 +04:00
d047e3f2b2
[refs #1832 ] Replace branches to tags in the project
2011-10-23 14:34:42 +04:00
59bfac2be7
[refs #1832 ] Add some fixes to controllers. Add JS validation to project build
2011-10-23 11:37:54 +04:00
56df3d05b0
[refs #1832 ] Fix build lists controller and some templates
2011-10-23 10:49:56 +04:00
c24a9fae1b
[refs #1832 ] Build Lists updates. Project updates and fixes.
2011-10-22 19:28:41 +04:00
b61797e896
Merge branch 'easy_urpmi'
...
Conflicts:
app/controllers/application_controller.rb
2011-10-21 17:57:29 +03: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
559f3d2ee9
Fix bug and refactor role relation. Apply platforms JSON display in supplied format. Refs #1959
2011-10-20 23:23:38 +03:00
5b5761e80e
Fixed some bugs.
2011-10-20 21:01:01 +04:00
505cb74c34
Merge branch 'itima_web_refactoring'
...
Conflicts:
app/models/user.rb
2011-10-20 20:00:52 +04: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
b84ab42d00
add extension actions, model role_relations
2011-10-20 00:19:45 +04: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
126e9e1db1
Merge branch 'itima_web_refactoring' of github.com:warpc/rosa-build into itima_web_refactoring
...
Conflicts:
app/models/platform.rb
2011-10-19 17:23:23 +04:00
ee9af32fa6
Adding projects to repositories.
2011-10-19 17:16:29 +04:00
e5438b29bc
change roles/rights
2011-10-18 22:32:08 +04:00
5f17928423
[refs #1923 ] Add private repositories to project
2011-10-18 17:47:17 +04:00
099120e71b
Fix bugs. Refs #1858
2011-10-17 19:07:53 +03:00
3c31bdf29c
Changed Platforms representation
2011-10-17 18:27:07 +04:00
0d10c50710
Changed representation of Users
2011-10-17 18:23:51 +04:00
5a6248c1af
Changed representation of Projects
2011-10-17 18:21:29 +04:00
75cd0c7ae6
Changed representation of Repositories.
2011-10-17 18:20:35 +04:00
ff5aa09c30
Added method to determine current acter (group or user)
2011-10-17 18:16:21 +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
fa3359b025
Some changes in representation
2011-10-17 00:50:56 +04:00
konstantin.grabar
George Vinogradov
Vladimir Sharshov
Pavel Chipiga
Ilya Krasilnikov
Toljio