Commit Graph

396 Commits

Author SHA1 Message Date
Alexander Machehin aad7a3a547 [refs #443] invite localization 2012-05-18 22:54:57 +06:00
Alexander Machehin fcffff4178 Merge branch 'master' into 90-pull
Conflicts:
	app/assets/stylesheets/design/custom.scss
	config/locales/title.en.yml
	config/locales/title.ru.yml
	config/routes.rb
	db/schema.rb
2012-05-17 22:58:29 +06:00
Alexander Machehin 74aee232f9 [refs #90] some fixes and merge button 2012-05-17 22:49:29 +06:00
konstantin.grabar 3e57359c96 [refs #442] Add mass build page functional 2012-05-17 19:20:03 +04:00
Alexander Machehin f96990bd25 [refs #90] change view 2012-05-16 22:50:30 +06:00
Alexander Machehin ff016efe1c [refs #90] choose project 2012-05-14 23:09:18 +06:00
Pavel Chipiga f335863881 Fix dot in project name routes. Refactor and write basic route specs. Refs #454 2012-05-14 16:24:01 +03:00
George Vinogradov cada9f6e51 [issue #443] Changed tour routes. Fixed submenu position. 2012-05-12 01:05:48 +04:00
George Vinogradov a048509426 [issue #443] Numeric ids changed to words. 2012-05-12 00:45:37 +04:00
Alexander Machehin 5f5eb00c4f [refs #443] abf tour 2012-05-12 00:15:20 +06:00
George Vinogradov 5320fc2d3e [issue #428] AdvisoriesController moved from its scope 2012-05-10 21:17:59 +04:00
Alexander Machehin 3e0ebdc929 [refs #90] change route 2012-05-10 22:57:59 +06:00
George Vinogradov 05ef799fa4 [issue #428] Added advisories list. Added translations. 2012-05-05 21:18:29 +04:00
George Vinogradov 6fe0e5b530 [issue #428] Added AdvisoriesController & show view. 2012-05-05 02:53:45 +04:00
George Vinogradov 1f07332892 [issue #428] Merge branch 'master' into 428-advisory
Conflicts:
	app/controllers/projects/build_lists_controller.rb
	config/routes.rb
	db/schema.rb
2012-05-04 21:29:04 +04:00
George Vinogradov 8350fc8fb1 [issue 428] Added advisory. 2012-05-04 21:12:51 +04:00
Pavel Chipiga 5157f31081 Refactor routes to separate owner profile and project. Redo short groups profile URL. Improve specs. Refs #236 2012-05-04 00:52:56 +03:00
Alexander Machehin 178dbdc5f0 [refs #90] move files 2012-05-03 23:55:08 +06:00
Alexander Machehin 36b4ce2d99 Merge branch 'master' into 90-pull
Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/projects/issues_controller.rb
	app/models/project.rb
	config/locales/menu.en.yml
	config/routes.rb
	db/schema.rb
2012-05-03 23:19:43 +06:00
Pavel Chipiga b1b5363972 Fix deploy. Redo main group route. Refs #263 2012-05-03 19:48:22 +03:00
Pavel Chipiga abb60a503a Minor design fix. Refactor register requests. Refactor case insensitive search. Other minor fixes and code cleanup. Refacor and improve owner constraint. Refs #263 2012-05-03 17:08:02 +03:00
Pavel Chipiga 2539ef4795 Great controllers and routes refactor - separate them to namespaces. Add user/group routes in github style, refactor. Implement templates inheritance. Refactor and cleanup views. Fix specs. Other minor fixes. Refs #263 2012-05-02 12:18:07 +03:00
Alexander Machehin a8ccf454ee [refs #90] first steps of pull rendering 2012-04-23 23:34:11 +06:00
Pavel Chipiga c0d2d67c73 Merge branch 'master' into 263-refactoring
Conflicts:
	Gemfile
	Gemfile.lock
	config/routes.rb
2012-04-23 17:58:45 +03:00
Vladimir Sharshov 24922cc43c Merge pull request #388 from warpc/347-javascript_refactoring
[issue #347] Union users and groups into one table in collaborators page. Use backbone(JS framework) for it. Improve UI for collaborators page (AJAX).
2012-04-20 08:15:12 -07:00
Pavel Chipiga 701da7e1f9 Disable bluepill. Update gems. Github project style URLs. Fix project load. Fix abilities. Fic urls generation. Fix some specs. Refs #263 2012-04-19 22:45:50 +03:00
Pavel Chipiga 5efabc9d4e Fix atom feed urls. Refs #396 2012-04-19 20:35:35 +03:00
George Vinogradov 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
Vladimir Sharshov 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
konstantin.grabar cd153375dd [refs #396] Devise token auth update for atom feed. Some atom feed fixes. 2012-04-18 19:15:04 +04:00
konstantin.grabar 3d1cb4bfee Merge master into 396-rss_atom_feed 2012-04-18 16:53:53 +04:00
George Vinogradov 6c64125787 [issue #408] Changed behavior of build list for released platform 2012-04-17 22:18:39 +04:00
konstantin.grabar 2dafd49763 [refs #396] Add atom feed 2012-04-17 19:01:35 +04:00
George Vinogradov 8204196275 [issue #347] Removed comments. Added filter field to collaborators
table.
2012-04-17 17:39:14 +04:00
Alexander Machehin 2716c19635 [refs #385] add anonymous access to project archive 2012-04-17 16:18:03 +06:00
konstantin.grabar 1b871bf6dd [refs #404] Remove downloads statistics functional 2012-04-17 12:23:58 +04:00
George Vinogradov 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
Alexander Machehin 770030e180 [refs #385] zip archive 2012-04-12 00:29:08 +06:00
Pavel Chipiga 68b3446747 Fix password restore routes. Change input field type. Refs #263 2012-04-10 20:12:30 +03:00
George Vinogradov 71c8efabf9 [issue #347] Added backbone. Changed collaborators page. 2012-04-09 21:11:39 +04:00
George Vinogradov 1e8021fe35 [issue #369] Added TOS page. 2012-03-31 17:18:22 +04:00
Pavel Chipiga 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
Vladimir Sharshov 3cedef5f07 Merge branch 'master' into 344-fix_products_monitoring
Conflicts:
	db/schema.rb
2012-03-30 20:30:06 +04:00
konstantin.grabar d3c2bac226 [refs #344] Add product buils list filter and search 2012-03-30 15:26:28 +04:00
Vladimir Sharshov 34011513b5 [Refs #263] Remove old xml-rpc API 2012-03-29 23:19:00 +04:00
Vladimir Sharshov 39c5da2445 [Refs #263] Remove EasyUrpmi support 2012-03-29 23:07:38 +04:00
Vladimir Sharshov 0c2d0f4612 [Refs #263] Delete Categories 2012-03-29 23:01:25 +04:00
Vladimir Sharshov 5db485a4c0 [Refs #263] Remove Aut BuildList. Part 2 2012-03-29 22:43:46 +04:00
Pavel Chipiga 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
Alexander Machehin 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
Pavel Chipiga 90e027b8a6 Remove old project load. Fix project routes. Fix wiki history avatar load. Refs #190 2012-03-21 23:52:40 +02:00
Pavel Chipiga 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
Alexander Machehin 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
Alexander Machehin 5c408540ff [refs #270] can ban user 2012-03-21 02:06:51 +06:00
Alexander Machehin 20ff998f08 [refs #270] user control 2012-03-21 00:12:18 +06:00
George Vinogradov 7c0585ee87 [issue #279] Added members and other changes. 2012-03-20 20:24:18 +04:00
George Vinogradov 3d9f9b5c73 [issue #279] Fixed permissions and moved some buttons.
Removed Freeze/Unfreeze actions from Platform.
2012-03-16 17:25:34 +04:00
George Vinogradov 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
George Vinogradov 5a77b17a43 [issue #279] Almost finished design for platforms
TODO:
  *  Add design for crontab generator
  *  Fix path generation
2012-03-14 21:22:47 +04:00
Pavel Chipiga cf009c7388 Fix routes. Refs #257 2012-03-12 22:34:42 +02:00
Alexander Machehin 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
Alexander Machehin 24639b8684 [refs 257] renamed to profile 2012-03-12 21:03:25 +06:00
Alexander Machehin 6d5120e5cc Merge branch '3.2-master' into 265-new_design_for_activity_feed 2012-03-11 22:44:25 +06:00
Pavel Chipiga 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
Vladimir Sharshov e49551756c Merge pull request #276 from warpc/194-issue_page
[Refs #194] Fix for manage labels and executor
2012-03-07 11:26:11 -08:00
Alexander Machehin de62aaad53 [refs #257] fix user update registration page 2012-03-08 00:47:19 +06:00
Alexander Machehin c657efc338 [refs #194] show all project labels without searching 2012-03-07 19:36:17 +06:00
Alexander Machehin 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
Pavel Chipiga 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
Pavel Chipiga 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
konstantin.grabar 9214f79d91 [refs #265] Fix one more wiki compare route 2012-03-05 20:48:59 +04:00
konstantin.grabar 73296059eb [refs #257] Merge 3.2-master into 257-new_design_for_profiles 2012-03-05 13:42:39 +04:00
konstantin.grabar f58e24b134 [refs #257] User edit pages fixes 2012-03-03 20:03:23 +04:00
konstantin.grabar 0dc22bae82 [refs #257] Add new design for users edit and private settings edit. Add new fields and action. 2012-03-03 12:01:32 +04:00
Pavel Chipiga 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
konstantin.grabar 1700588b97 [refs #232] Merge 3.2-master into 232-new_groups_design 2012-03-02 13:44:54 +04:00
Pavel Chipiga 036dfb6dd5 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-02 02:04:04 +02:00
George Vinogradov 4b024d1728 [issue #195] Fixes.
*  Fixed translations
  *  Fixed blob display
  *  Fixed routes
2012-03-01 21:37:24 +04:00
konstantin.grabar eb689b7f18 [refs #232] Add new design and logic refactor for group members action 2012-03-01 19:41:40 +04:00
konstantin.grabar fc3d4c0b6d [refs #232] Add group members edit page design 2012-03-01 18:23:26 +04:00
George Vinogradov 6eb239385a [issue #195] Fixed bug with creating project 2012-03-01 17:37:35 +04:00
konstantin.grabar 55ff2c7f6b [refs #195] Change new project route and some other changes 2012-03-01 16:10:12 +04:00
George Vinogradov c3d7221f97 [issue #195] Fixed bugs
*  Highlighting in submenu
  *  File history
2012-02-29 21:53:14 +04:00
konstantin.grabar bc75b318ce [refs #195] Merge 3.2-master into 195-new_design_for_projects 2012-02-29 21:37:28 +04:00
George Vinogradov 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
konstantin.grabar 2ec2548390 [refs #195] Add base design and functional to project members page 2012-02-29 01:01:25 +04:00
konstantin.grabar e9ae923b60 [refs #195] Merge 3.2-master into 195-new_design_for_projects 2012-02-28 20:10:31 +04:00
Vladimir Sharshov 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
Alexander Machehin 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
Alexander Machehin 0d75a37451 [refs #194] show page beta version 2012-02-28 20:05:18 +06:00
konstantin.grabar 03663a8ed7 [refs #195] Add sections page and method to projects 2012-02-28 12:00:56 +04:00
Pavel Chipiga 70963d0943 Merge branch 'master' into 3.2-master 2012-02-27 22:34:21 +02:00
Pavel Chipiga 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
Vladimir Sharshov ddda2b92ab [Refs #221] Delete product build lists (only in web) 2012-02-28 00:00:33 +04:00
George Vinogradov 582063d066 [issue #195] Commits history, editing, showing... 2012-02-27 21:40:46 +04:00
Alexander Machehin 27c85d32df [refs #194] create page; index pagination; some bugs 2012-02-27 22:10:12 +06:00
Vladimir Sharshov 3685eafe57 Remove unused code [Refs #207] 2012-02-24 19:35:29 +04:00
Pavel Chipiga 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
Alexander Machehin 9e5e7cd5e4 [refs #194] labels manage 2012-02-23 20:48:46 +06:00
George Vinogradov 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
George Vinogradov 43b7ccd3dc [issue #195] Added blob show. Some changes. 2012-02-23 02:11:55 +04:00
konstantin.grabar ba1798fd71 [refs #195] Add design to form and edit page 2012-02-22 21:48:37 +04:00
Pavel Chipiga 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
Alexander Machehin ecb29d1762 [refs #194] tags -> labels 2012-02-22 02:28:04 +06:00
George Vinogradov 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
konstantin.grabar 2b675c6f84 [refs #193] Fix routes regex for wiki compare 2012-02-20 13:56:09 +04:00
konstantin.grabar d9025b093f [refs #193] Compare routes repair and compare design 2012-02-17 18:12:05 +04:00
konstantin.grabar 5039907431 Merge branch 'master' into 123-activity-feed 2012-02-14 14:30:27 +04:00
Pavel Chipiga 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
George Vinogradov 99c314fb11 [issue #133] Merge branch 'master' into 133-editing_from_web
Conflicts:
	db/schema.rb
2012-02-13 21:48:40 +04:00
George Vinogradov d0fe7f55d5 [issue #174] added static pages and some changes 2012-02-10 02:57:43 +04:00
George Vinogradov ce39cdd04f [issue #174] A half of work to create invitations system 2012-02-09 21:46:23 +04:00
Pavel Chipiga 7223b7deb9 Upgrade rails, devise, delayed_jobs and other gems. Fix dependencies. Apply assets pipeline, add to deploy. Refactor and cleanup Gemfile. Fix after upgrade bugs. Redo commentable_id from string to decimal. Refactor and code cleanup. Apply basic new design. Refactor main template. Automate menus. Improve translations. Refs #96 2012-02-09 01:46:25 +02:00
George Vinogradov 74d401d087 [issue #133] Writed draft of web editing. 2012-02-08 21:51:30 +04:00
konstantin.grabar 96d3b35bdf [refs #123] Merge master into 123-activity-feed 2012-02-06 19:46:32 +04:00
Vladimir Sharshov 4165b188eb Merge branch 'master' into 64-project_wiki
Conflicts:
	app/models/project.rb
	config/locales/en.yml
2012-02-03 00:55:16 +04:00
Vladimir Sharshov 8562b882da Merge pull request #136 from warpc/114-comment_notifications
Notifications and subscribtions about new comments in commit [Refs #114]
2012-02-01 11:12:24 -08:00
George Vinogradov d0717c8f9e [issue #64] Merge branch 'master' into 64-project_wiki
Conflicts:
	Gemfile.lock
	db/schema.rb
2012-02-01 22:39:04 +04:00
konstantin.grabar 502f06b65f [refs #127] Make route more short 2012-02-01 22:13:42 +04:00
konstantin.grabar 0559f1b678 [refs #127] Filter request refactor 2012-02-01 20:00:19 +04:00
Alexander Machehin f15cb90b87 Merge branch 'master' into 114-comment_notifications
Conflicts:
	config/locales/ru.yml
2012-01-31 21:42:37 +06:00
George Vinogradov 24124766f4 [issue #64] Merge branch 'master' into 64-project_wiki
Conflicts:
	Gemfile.lock
	config/locales/en.yml
	db/schema.rb
2012-01-31 02:07:11 +04:00
Pavel Chipiga 13780a1b53 Add magic encodings. Refs #95 2012-01-30 22:39:34 +02:00
Alexander Machehin e0b7699ffd Revert "Merge branch '114-comment_notifications' into user-emails-list"
This reverts commit 2179cbbf40334cbe5d4fa9ba3a7f297d8f543a0a, reversing
changes made to 9bf06e5e1a595f320dc4527ebd44f14be05fcd64.

Conflicts:

	app/models/user.rb
2012-01-30 12:22:54 +06:00
Alexander Machehin f6b6bbfb54 Revert "[refs #114] emails control"
This reverts commit 26fb1fcbfb843163231d8b8f0caf582bafccbe57.

Conflicts:

	app/models/subscribe.rb
	app/models/user.rb
	spec/models/comment_for_commit_spec.rb
2012-01-30 12:19:54 +06:00
Alexander Machehin dc39eefe62 Revert "[refs #114] add js"
This reverts commit 48a9c4d50b9f11a11cc4f2c5831c4b5b25fdc4d1.
2012-01-30 12:16:09 +06:00
George Vinogradov acdd1f22b6 [issue #64] Fixed bug with revert all wiki. 2012-01-28 16:10:43 +04:00
George Vinogradov 549f0a55e8 [issue #64] Merge branch 'master' into 64-project_wiki
Conflicts:
	Gemfile.lock
	app/models/project.rb
	app/models/user.rb
	app/views/projects/_form.html.haml
	config/locales/ru.yml
	db/schema.rb
2012-01-27 18:27:23 +04:00
Alexander Machehin 06ab99a1d0 [refs #114] add js 2012-01-27 18:20:07 +06:00
Alexander Machehin e71a9e84cb [refs #114] emails control 2012-01-27 02:11:07 +06:00
Alexander Machehin e04b2eb59b Merge branch '114-comment_notifications' into user-emails-list
Conflicts:
	app/models/subscribe.rb
	config/locales/en.yml
2012-01-26 14:55:16 +06:00
Alexander Machehin 77420d2a8f [refs #114] user emails 2012-01-26 14:53:40 +06:00
konstantin.grabar dd1493d677 [refs #123] Add activity feed page. Remove some unnessary code. Some logic fixes. 2012-01-25 17:05:39 +04:00
George Vinogradov 45877e8b5c [issue #64] Bug fix & views refactoring
*  Fixed bug with history
*  Navigation moved to partial.
2012-01-25 00:47:55 +04:00
Alexander Machehin 9127b6b689 [refs #114] changed logics 2012-01-24 01:42:54 +06:00
George Vinogradov 230c25eefd [issue #64] Some changes.
*  WikiController#compare splitted into WikiController#compare
   and WikiController#compate_wiki
*  Show only last 30 versions in history.
2012-01-23 16:45:38 +04:00
George Vinogradov 364f2e40c0 [issue #64] Added Wiki history, compare, revert. 2012-01-20 03:25:15 +04:00
Alexander Machehin 800b02f544 [refs #18] Add project subsribe, tests 2012-01-20 00:20:03 +06:00
George Vinogradov 0c527af291 [issue #64] Added revisions comparsion. 2012-01-19 17:49:32 +04:00
George Vinogradov 51e9b5d1f6 [issue #64] Some changes in views and routes. 2012-01-18 02:28:59 +04:00
Alexander Machehin 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
George Vinogradov 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
konstantin.grabar 52696791f2 [refs #54, #94] Merge master into issues 2012-01-16 13:42:44 +04:00
Alexander Machehin 794c55a030 Merge branch 'master' of github.com:warpc/rosa-build into 18-commit_comments 2012-01-13 22:01:30 +06:00
George Vinogradov 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
George Vinogradov 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
Alexander Machehin 07dc7a4800 [refs #18] add comments to commit 2012-01-12 17:19:22 +06:00
konstantin.grabar 2b8aca5f09 [refs #54] Add settings notifier 2012-01-11 17:58:13 +04:00
George Vinogradov 7c50b2c3f5 [issue #76] Added jQuery DataTable. But it doesn't work yet 2011-12-31 02:42:58 +04:00
konstantin.grabar a44530980e [refs #54] Remove some unnessacary comments 2011-12-30 18:44:47 +04:00
konstantin.grabar fa8656d1f5 [refs #54] Refactor subscires routes and authorize 2011-12-28 17:54:45 +04:00
konstantin.grabar 1c263c6e0a [refs #54] Notification DJ support. Routes fixes. 2011-12-28 14:47:54 +04:00
konstantin.grabar a783b460bd Merge issues with master 2011-12-28 13:22:57 +04:00
Pavel Chipiga 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
George Vinogradov ec95373d28 [#issue 64] Routes to Wiki and some methods in controller.
Useless yet.
2011-12-26 21:07:16 +04:00
konstantin.grabar ce6746f7a9 [refs #54] Add subscribes and notifications 2011-12-26 19:48:57 +04:00
konstantin.grabar 5237939f49 Merge issues with master 2011-12-26 13:26:13 +04:00
Pavel Chipiga 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
Pavel Chipiga 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
Pavel Chipiga 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
konstantin.grabar 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
Pavel Chipiga 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
George Vinogradov 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
konstantin.grabar 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
konstantin.grabar d20d43eb2b [refs #54] Base logic and templates for issues and comments to them 2011-12-19 19:30:14 +04:00
George Vinogradov 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
George Vinogradov 168e110169 [close #11] Changed adding members to group. 2011-12-10 03:40:13 +04:00
George Vinogradov 603e4b3691 fixed #4. Removed unnecessary routes and views parts. 2011-12-08 18:47:18 +04:00
Pavel Chipiga 6794ca42fb Fix date filter normalization. Add build, freeze, unfreeze confirmation. Refs #2261 2011-12-07 02:09:04 +02:00
George Vinogradov 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
George Vinogradov 9cc820080b Groups base functional. 2011-12-05 16:32:18 +04:00
konstantin.grabar 6d8e4f98b9 [refs #2249] Some ACL changes 2011-12-01 13:29:04 +04:00
George Vinogradov f154ccc132 Fixed groups creation. 2011-11-30 19:27:19 +04:00
konstantin.grabar 438bedd226 Add build all btn to platforms 2011-11-30 18:48:50 +04:00
George Vinogradov 7023dda7e0 First iteration of groups refactoring. 2011-11-30 16:58:14 +04:00
Pavel Chipiga 141fe7677f Apply project fork button. Refactor and cleanup code. Refs #2243 2011-11-23 17:52:33 +02:00
konstantin.grabar 140eaf6265 [refs #2249] Remove old roles managment system 2011-11-21 21:43:37 +04:00
konstantin.grabar 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
Pavel Chipiga 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
konstantin.grabar 4b4df620ff Fix test sudo action 2011-11-03 15:16:17 +04:00
konstantin.grabar df2f3abe62 [refs #2161] Add test sudo action 2011-11-03 14:33:23 +04:00
Pavel Chipiga 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
Pavel Chipiga 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
konstantin.grabar 7b8df283eb [refs #2161] Change regenerate logic for private_users 2011-11-02 14:42:08 +04:00
George Vinogradov 103cb16f27 Added form to set name of platfroms clone 2011-11-02 02:00:44 +04:00
konstantin.grabar fd5dc9fd01 [refs #2161] Small categories fix 2011-11-02 00:56:01 +04:00
konstantin.grabar 2c0422a3bc [refs #2161] Split platforms on three groups 2011-11-02 00:53:48 +04:00
Pavel Chipiga 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
konstantin.grabar de959bb527 [refs #2161] Add refresh option to statistics 2011-10-31 19:58:04 +04:00
George Vinogradov b9ee6e365b Added collaborators management. 2011-10-31 02:59:03 +04:00
George Vinogradov af91843f4d Changed routes. 2011-10-31 01:52:25 +04:00
konstantin.grabar 30564e8e17 [refs #2161] Add auto build lists functional 2011-10-29 23:09:50 +04:00
George Vinogradov 411e40267a Added stub for add_collaborators action. 2011-10-29 19:56:44 +04:00
Pavel Chipiga c39e01ba32 Add auto_build hook recivier. Remove XML RPC from project. Gitolite docs. Refs #2136 2011-10-28 16:27:12 +03:00
konstantin.grabar 89312375fd Merge master and personal_repos 2011-10-27 17:13:53 +04:00
konstantin.grabar 3114eb1ecc [refs #2106] Add personal repos to project. Some changes of private repos controller and logic 2011-10-27 17:04:03 +04:00
Pavel Chipiga 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
George Vinogradov 02a8a62f36 Added dump to yml and load from yml abilities for roles. 2011-10-26 04:35:01 +04:00
konstantin.grabar 9c182f0bda Merge master and build_lists_queue 2011-10-24 14:40:36 +04:00
konstantin.grabar 7053333296 [refs #1832] Change downloads controller routes to statistics 2011-10-24 14:27:00 +04:00