Alexander Machehin
|
dfbf8a8d58
|
Merge branch 'master' into 90-pull
Fucking conflicts:
app/controllers/projects/issues_controller.rb
app/models/ability.rb
app/views/projects/issues/show.html.haml
config/routes.rb
db/schema.rb
lib/tasks/import.rake
spec/models/comment_for_commit_spec.rb
vendor/assets/javascripts/bootstrap-tab.js
vendor/assets/stylesheets/bootstrap.css
|
2012-09-25 17:55:30 +06:00 |
Vladimir Sharshov
|
c426f81abe
|
Merge pull request #656 from warpc/616-issues_and_comments
[refs #616] Markdown in issues descriptions and comments, ability to preview, help info about markdown, refactoring.
|
2012-09-25 03:37:44 -07:00 |
Alexander Machehin
|
855f1f356d
|
[refs #616] remove some inline styles
|
2012-09-21 18:10:47 +06:00 |
Alexander Machehin
|
94c3863e27
|
[refs #616] fixed markdown image example
|
2012-09-21 16:43:54 +06:00 |
Alexander Machehin
|
d25bdb2329
|
[refs #616] fixed preview bug
|
2012-09-21 16:32:53 +06:00 |
Vokhmin Alexey V
|
799a1464fb
|
#385: fixed
|
2012-09-20 18:26:26 +04:00 |
Vladimir Sharshov
|
7e28920bc7
|
Merge pull request #653 from warpc/385-change-name-for-git-archives
[refs #385] Support download project source code by build clients(rpmbuild)
|
2012-09-20 06:37:13 -07:00 |
Vokhmin Alexey V
|
b398a0e456
|
#634: fixed
|
2012-09-20 16:43:23 +04:00 |
Vokhmin Alexey V
|
07f5224e76
|
#385: removed before_filter
|
2012-09-20 15:21:54 +04:00 |
Vokhmin Alexey V
|
c76618441e
|
#385: revert some changes according to discussion
|
2012-09-20 15:10:52 +04:00 |
Vokhmin Alexey V
|
805521c486
|
Merge branch 'master' into 385-change-name-for-git-archives
|
2012-09-20 14:53:29 +04:00 |
Vladimir Sharshov
|
0acc4ce1c7
|
Improve invite email(prevent falling into the spam)
|
2012-09-20 12:29:07 +04:00 |
Vokhmin Alexey V
|
f39adfd2f7
|
#385: fixed specs, updated controller, view
|
2012-09-19 23:29:36 +04:00 |
Alexander Machehin
|
32e05de186
|
[refs #616] cheat sheet small i18n
|
2012-09-20 00:53:40 +06:00 |
Alexander Machehin
|
11c67b7951
|
[refs #616] fixed bug on new issue
|
2012-09-19 23:59:46 +06:00 |
Alexander Machehin
|
fbc5f3a925
|
[refs #616] small refactoring
|
2012-09-19 23:59:14 +06:00 |
Alexander Machehin
|
a85a95d18a
|
[refs #616] markdown cheat sheet
|
2012-09-19 23:35:43 +06:00 |
Alexander Machehin
|
4fc9ba7aeb
|
[refs #616] add lost i18n
|
2012-09-19 15:41:08 +06:00 |
Alexander Machehin
|
daf845705a
|
[refs #616] comment update
|
2012-09-19 00:42:22 +06:00 |
Vokhmin Alexey V
|
7fbf17a824
|
updated email templates
|
2012-09-18 19:34:39 +04:00 |
Vokhmin Alexey V
|
967c5daaa8
|
#575: added 'arch' to subject and body of email
|
2012-09-18 16:03:10 +04:00 |
Alexander Machehin
|
a492367a17
|
[refs #616] some fixes and refactoring
|
2012-09-18 16:00:21 +06: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 |
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
|
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
|
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
|
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 |
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
|
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
|
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 |
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 |
Vladimir Sharshov
|
216559024c
|
[refs #631] Change list repositories view, add button for edit and delete action
|
2012-09-07 21:59:34 +04: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 |
Vladimir Sharshov
|
3247db53c6
|
[refs #635] Fixed the lack of choice owner on create a project page
|
2012-09-07 14:25:04 +04:00 |
Vladimir Sharshov
|
54c6ba55be
|
[refs #349] Disable global menu Projects and Platforms; Allowed full search; Protect user and maintainer emails; Refactoring right rules
|
2012-09-06 21:09:10 +04:00 |
Vokhmin Alexey V
|
71d14e43d6
|
#631: fixed misprint
|
2012-09-06 19:39:26 +04:00 |
Vokhmin Alexey V
|
4d1166e6b3
|
#631: updated UI and JS validation for build_lists, rewrote migration
|
2012-09-06 19:34:33 +04:00 |
Vokhmin Alexey V
|
f0f11cb9dc
|
#631: added #edit #update actions to platforms/repositories_controller, wrote migration, updated models
|
2012-09-06 17:43:50 +04:00 |
Vladimir Sharshov
|
ff20c0b199
|
Merge pull request #622 from warpc/620-maintainer_db
[refs #620] Maintainer DB
|
2012-08-31 11:50:02 -07:00 |
Alexander Machehin
|
067615d79f
|
[refs #616] small js fix
|
2012-08-31 19:18:38 +06:00 |
Alexander Machehin
|
3225274425
|
[refs #616] change styles
|
2012-08-31 19:02:03 +06:00 |
konstantin.grabar
|
0607eedb15
|
[refs #626] Set invites redirect add register link to top menu
|
2012-08-30 14:30:07 +04:00 |