Commit Graph

3147 Commits

Author SHA1 Message Date
Vokhmin Alexey V 15a75077db Merge branch 'master' into 575-email-notification-for-build-tasks 2012-09-17 17:49:43 +04:00
konstantin.grabar 6a446c41a1 [refs #374] Add all jsons. Remove all unused data 2012-09-17 15:51:21 +04:00
Alexander Machehin a4c8e8eff8 Merge branch 'master' into 616-issues_and_comments
Conflicts:
	Gemfile
	app/assets/stylesheets/design/custom.scss
	app/controllers/projects/projects_controller.rb
2012-09-17 16:52:50 +06:00
Pavel Chipiga 2db88d90f3 Remove branch if alredy exists during branch fork action. Refs #112 2012-09-17 13:09:30 +03:00
Vokhmin Alexey V 2681a1c676 #575: added logic for BuildList notification 2012-09-16 22:18:41 +04:00
Vokhmin Alexey V 5326098884 #575: updated email template 2012-09-16 22:02:28 +04:00
Vokhmin Alexey V ef923d06c7 #575: added build_list_notification 2012-09-16 21:29:45 +04:00
Vokhmin Alexey V 01576702a0 #575: added migration, updated Settings page 2012-09-14 20:12:48 +04:00
Vladimir Sharshov 91f86aa18f Merge pull request #646 from warpc/645-fix-for-selecting-branch
[refs #645] Fix autoselection version depending on select repository to save for create build list page
2012-09-14 08:33:44 -07:00
Vokhmin Alexey V 7bb0ced8cb #645: fixed. 2012-09-14 18:49:08 +04:00
Vladimir Sharshov c690a8446a Merge pull request #644 from warpc/633-fix-ui-on-build-list-page
[refs #633] Fixed blocking auto publication in personal repository. Refactoring creating build list page.
2012-09-13 16:39:19 -07:00
Vokhmin Alexey V 6bdaf06d86 #633: removed unnecessary code 2012-09-14 02:30:54 +04:00
Vokhmin Alexey V bdb3eb288c #633: removed checkbox from name of platform 2012-09-14 02:22:10 +04:00
Vladimir Sharshov fc4eb189b5 Add new staging server;
Remove special application config;
Change localization (builded to built);
Add quotes to git command.
2012-09-14 00:46:56 +04:00
Vokhmin Alexey V 4138399ad3 #633: updated message 2012-09-13 20:23:49 +04:00
Vokhmin Alexey V fe20814b5a #633: hot fix 2012-09-13 20:18:09 +04:00
Vokhmin Alexey V ba6805598f #633: small refactoring 2012-09-13 20:16:13 +04:00
Vokhmin Alexey V a99bfee4a6 #633: UI has been updated 2012-09-13 20:08:41 +04:00
Vladimir Sharshov 5a699ad379 Merge pull request #640 from warpc/638-add-access-permissions-for-users-to-repository
[refs #638] Repository supervisor
2012-09-12 13:52:42 -07:00
Vokhmin Alexey V 1c9a9e803e #638: some refactoring 2012-09-13 00:47:39 +04:00
Vladimir Sharshov 87b71cf611 Merge pull request #643 from warpc/641-enable-disable-project-from-private-repository
[refs #641] Include/exclude project from personal owner repository according to value of option project is package
2012-09-12 13:39:56 -07:00
Vokhmin Alexey V 1a75a5a394 #638: updated Relation model, repositories and platforms controllers according to comments 2012-09-12 23:32:51 +04:00
Pasha ddf9fb4f6d Merge pull request #642 from warpc/641-fix-project-group-list
[refs #641] Show only public projects in group profile
2012-09-12 10:15:57 -07:00
Vokhmin Alexey V 4a071f88a3 #641: added specs 2012-09-12 19:36:00 +04:00
Vokhmin Alexey V 8d35786183 #641: added is_package checkbox to #new page, updated model 2012-09-12 19:06:34 +04:00
Vladimir Sharshov e3bcd2382e [refs #641] Show only public projects in group profile 2012-09-12 18:49:40 +04:00
Vokhmin Alexey V 3b622f54b9 #638: added before_filter to repositories_controller 2012-09-12 17:43:02 +04:00
Vokhmin Alexey V bc4043e558 #638: hot fix 2012-09-12 17:25:46 +04:00
Vokhmin Alexey V b468b09529 #638: some refactoring for adding new user 2012-09-12 17:07:34 +04:00
Vokhmin Alexey V ffa5950a5d #638: added new specs for check permissions for adding new members to repository 2012-09-12 16:40:57 +04:00
Vokhmin Alexey V aadfb39682 #638: added access to add/remove member to repository for owner and local_admin 2012-09-12 16:17:51 +04:00
Vokhmin Alexey V 506aa55496 #638: renamed shared_example 2012-09-12 15:49:42 +04:00
Vokhmin Alexey V 01703bb68a #638: add new specs and some refactoring for repositories_controller_spec 2012-09-12 15:47:53 +04:00
Vokhmin Alexey V 1f32e72508 #638: added access to remove_project for members of repository 2012-09-12 00:43:08 +04:00
Vokhmin Alexey V 96466b808b #638: fixed ability model 2012-09-12 00:40:16 +04:00
Vokhmin Alexey V b4c2c368e4 #638: added permissions to add new project for members of repository 2012-09-12 00:27:28 +04:00
Vokhmin Alexey V 1e40b9fb06 #638: some refactoring 2012-09-12 00:08:25 +04:00
Vokhmin Alexey V 405c09fc72 #638: created table of users as shared 2012-09-11 20:03:43 +04:00
Vokhmin Alexey V 3858bfa6b7 #638: added members to repository model, updated views 2012-09-11 19:30:14 +04:00
Vladimir Sharshov 459e1ba2fa Merge pull request #639 from warpc/637-change-language-for-approve-email
[refs #637] send an invite email to the language used in the registration form
2012-09-11 03:26:25 -07:00
Vokhmin Alexey V bff32c27c4 #637: removed comments 2012-09-11 12:36:33 +04:00
Vokhmin Alexey V 1768df5010 #637: removed unnecessary lines 2012-09-10 15:19:13 +04:00
Vokhmin Alexey V e530fa5b74 #637: updated message 2012-09-10 15:16:55 +04:00
Vokhmin Alexey V 5f941844f2 #637: added migration, updated approve_notification 2012-09-10 15:08:53 +04:00
Vladimir Sharshov 8c06b0c18d [refs #631] Fix right for publication build list using publish button 2012-09-07 22:45:03 +04:00
Pasha 8652cf3612 Merge pull request #632 from warpc/631-publish-to-the-repository-without-qa
#631: publish to the repository without qa
2012-09-07 11:01:55 -07:00
Vladimir Sharshov 216559024c [refs #631] Change list repositories view, add button for edit and delete action 2012-09-07 21:59:34 +04:00
konstantin.grabar 15ec2c2c90 [refs #374] Add nanoc api docs 2012-09-07 20:55:48 +04:00
Pavel Chipiga 7570f1cab7 Set publish_without_qa to false for all platform repos when released. Fix mgration. Refs #631 2012-09-07 18:41:42 +03:00
Pavel Chipiga 768e40ee2a Merge branch 'master' into 631-publish-to-the-repository-without-qa
Conflicts:
	app/models/ability.rb
2012-09-07 16:38:21 +03:00