feefe8ed89
#374 : added #platforms_for_build action for Platforms API
2012-10-08 22:02:44 +04:00
ed7aec602f
[refs #579 ] alpha version of the pull inline comments
2012-10-06 01:19:05 +06:00
e085784d51
Merge branch 'master' into 579-code_line_comments
...
Conflicts:
app/assets/stylesheets/design/custom.scss
app/helpers/diff_helper.rb
app/models/ability.rb
app/views/projects/comments/_list.html.haml
app/views/projects/git/commits/_commit_diff.html.haml
lib/ext/git/inline_callback.rb
2012-10-05 15:32:29 +06:00
527dd210bf
[refs #579 ] alpha version of inline comments for commit
2012-10-05 00:40:12 +06:00
4b72501159
#671 : added Architectures API
2012-10-04 16:45:49 +04:00
94029c3cda
[refs #90 ] base -> to, head -> from
2012-10-03 17:58:34 +06:00
d2c338e4e4
Merge pull request #665 from warpc/90-ui
...
[refs #90 ] pull request ui + fixes
2012-10-02 10:41:06 -07:00
cb994c6fd6
#349 : created autocompletes_controller, refactoring, updated specs
2012-10-02 20:54:55 +04:00
eaf29713cc
[refs #90 ] autoload refs
2012-10-01 22:03:08 +06:00
abafbc6ef5
Merge again-and-again branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-09-28 00:09:34 +06:00
2b4e2f03e5
Merge pull request #585 from warpc/374-rest_api_for_builds
...
[refs #374 ] Add json responses for build lists api
2012-09-27 07:00:19 -07:00
397d411252
#90 : added #index action, updated routes
2012-09-26 00:50:40 +04:00
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
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
e94c6f4f00
[refs #374 ] Merge master into 374-rest_api_for_builds
2012-09-21 13:20:04 +04:00
799a1464fb
#385 : fixed
2012-09-20 18:26:26 +04:00
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
1a75a5a394
#638 : updated Relation model, repositories and platforms controllers according to comments
2012-09-12 23:32:51 +04:00
3858bfa6b7
#638 : added members to repository model, updated views
2012-09-11 19:30:14 +04:00
ff20c0b199
Merge pull request #622 from warpc/620-maintainer_db
...
[refs #620 ] Maintainer DB
2012-08-31 11:50:02 -07:00
0607eedb15
[refs #626 ] Set invites redirect add register link to top menu
2012-08-30 14:30:07 +04:00
d775fa0d08
[refs #616 ] ugly md preview
2012-08-29 21:24:06 +06:00
03986b7c21
[refs #374 ] Remove index actions from projects and reps. Add projects#get_id. Update tests. Fix build list show template
2012-08-28 20:57:12 +04:00
d24a149d9a
[issue #620 ] Added search of maintainer by package
2012-08-24 20:06:59 +04:00
2fbb72e537
[issue #620 ] Changes in Maintainer db:
...
* Added maintainer selection on project page (see TODO in sources);
* Added `actual` field to BuildList::Package;
* Added rake task to set BuildList::Package.actual field.
Run it after migration (see TODO in sources);
* Packages after publising of BuildList becomes actual;
* Added MaintainerPresenter to avoid long method chains.
2012-08-24 19:21:24 +04:00
8629d67030
Add javascript callback for "assignee"
...
To make intrgration with external trackers easier, add JS API for
assignee retrieval. It returns a script that calls a function that
should act somehow depending on how it was defined.
2012-08-21 23:58:15 +04:00
e75a676895
Add "assignee" JSON callback
...
The callback reports the assignee of a package in a platform given.
Used for integration with external bug trackers.
2012-08-21 23:58:15 +04:00
388a0028da
Add Maintainer Database and list view for it
...
This commit adds list of maintainers of a platform to page
/platforms/:id/maintainers. This list is intended to serve as a
counterpart for http://maint.mandriva.com/listpkgs.php .
The commit adds a "view" on a build_list_packages table: it selects only
the latest builds for each package, and summarizes the information about
such packages in "maintainers" table.
This is a testing mode only, so the link to maintainers table is not
shown.
2012-08-21 23:57:39 +04:00
5dc50056df
[refs #374 ] Add repositories, platforms and projects read API
2012-08-21 14:19:38 +04:00
84328742e4
[issue #590 ] Log returns through Rails with `tail -n`
2012-08-17 12:23:49 +04:00
9bf2f728a7
[refs #90 ] change new action from post to get
2012-08-08 23:21:49 +06:00
0c9f3540f9
[refs #374 ] Merge master into 374-rest_api_for_builds
2012-08-08 18:21:56 +04:00
6a04f4ad7a
Merge again branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-08-06 11:19:06 +06:00
a1b7bcac32
[issue #565 ] Merge branch 'master' into 565-feedback_form
...
Conflicts:
app/assets/stylesheets/design/custom.scss
2012-08-03 23:36:14 +04:00
f3db00832a
[refs #374 ] Api v1 base functional and specs
2012-08-03 14:05:05 +04:00
b299a51610
Merge branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-08-01 13:06:41 +06:00
43309d86e6
Merge branch 'master' into 441-key_pairs, fix schema, add migration
...
Conflicts:
db/schema.rb
2012-07-31 02:02:15 +04:00
944c6fc0e2
Merge branch 'master' into 90-pull
...
Conflicts:
app/assets/stylesheets/design/custom.scss
app/controllers/projects/git/commits_controller.rb
app/helpers/git_helper.rb
app/models/project.rb
app/views/projects/git/commits/_commit_diff.html.haml
db/schema.rb
lib/ext/core/string.rb
2012-07-27 18:37:25 +06:00
fb60dac748
Merge branch 'master' into 263-refactoring
...
Conflicts:
db/schema.rb
2012-07-27 00:19:36 +03:00
e09a9467e2
Fix flash notifies display bug. Add admin section link. Move controller to admin namspace. Refactor and fix notifies controller. Refs #576
2012-07-25 21:05:25 +03:00
15a86c2ecd
[refs #576 ] Add flash notifies
2012-07-23 18:25:37 +04:00
d6c65a1626
[issue #565 ] Added feedback form.
...
* Added web pages to send request
* Added mailer to send feedback message.
2012-07-20 20:06:31 +04:00
b24a4a35b2
[refs #90 ] modify pull tab urls
2012-07-19 00:02:27 +06:00
611b22baa5
Update gems, fix conflicts. Raise 404 error instead of redirect. Refactor git controllers. Refactor git methods, move to modules. Cleanup git helpers, refactor and remove unused variables from views, refactor git templates. Refactor project load. Refactor git routes and links, refactor constraints. Fix branches with slashes and dots. Apply github linguist and libmagic for binary file detection. Other refactor and code cleanup. Fix specs and deprecations. Refs #263
2012-07-17 11:02:56 +03:00
b4059c67fc
[refs #441 ] Add key pairs for platform
2012-07-13 15:18:12 +04:00
10b828c644
Merge branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
vendor/assets/javascripts/vendor.js
2012-07-10 18:35:49 +06:00
dd221cc880
[refs #90 ] autocomplete
2012-07-06 23:30:01 +06:00
a909a92ae8
[issue #428 ] Merge branch 'master' into 428-advisory
...
Conflicts:
db/schema.rb
2012-07-04 18:10:03 +04:00
e00e88340b
[issue #428 ] Merge branch 'master' into 428-advisory
...
Conflicts:
app/assets/stylesheets/design/custom.scss
db/schema.rb
2012-07-04 03:31:51 +04:00
094f25c049
[issue #428 ] Changed attaching advisory to BuildList.
...
Removed Chosen. Added text field with incremental search.
2012-07-04 02:52:13 +04:00
89abd20c95
Merge branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-07-03 21:22:10 +06:00
6afe8c0375
[refs #442 ] Merge master into 442-mass_build
2012-07-03 18:41:02 +04:00
0827cf5100
[refs #442 ] Add other mass builds action to mass_builds controller. Rename cancel_mass_builds action
2012-07-03 18:34:07 +04:00
b46a7aba39
Fix branch with dots. Refs #263
2012-07-03 15:05:27 +03:00
8f9a6ee2d2
[refs #442 ] Change cancel btn. Move some actions to mass_builds controller. Add more ability rights
2012-07-02 18:50:47 +04:00
6507ad280f
[refs #442 ] Merge master into 442-mass_build
2012-06-29 16:40:54 +04:00
46161253ab
[refs #462 ] Product status does not change
2012-06-28 19:54:58 +04:00
ce163f89a9
[refs #442 ] Add rep_name field. Add cancel builds ability
2012-06-28 19:23:33 +04:00
b6d769ad66
[refs #442 ] Change mass builds table
2012-06-27 18:07:05 +04:00
1ffb1b3940
Merge branch 'master' into 90-pull
...
Conflicts:
Gemfile
app/assets/stylesheets/design/custom.scss
app/models/project.rb
db/schema.rb
2012-06-27 16:20:38 +06:00
5e3241a1f5
[refs #525 ] Rename erase to clear. Fix flash. Replace repository to platform in locales
2012-06-21 11:15:26 +04:00
3ebd36f6fe
[refs #525 ] Erase corrections and refactor
2012-06-20 22:02:42 +04:00
4b9a04e3f7
[refs #525 ] Set erase route to post
2012-06-20 20:40:50 +04:00
270dbf2e9b
[refs #525 ] Add erase repository functional
2012-06-20 17:21:32 +04:00
ec21c042dd
Fix and refactor active menu. Refs #207
2012-06-09 19:04:06 +03:00
e7c0eab736
[issue #428 ] Merge branch 'master' into 428-advisory
...
Conflicts:
app/assets/stylesheets/design/custom.scss
2012-06-04 23:59:00 +04:00
abe2b8a30d
[issue #428 ] Work with existing advisories.
...
* Added advisories page to platform
* Added attacing of existing advisories to BuildList.
2012-06-04 23:49:20 +04:00
8478ca405f
[refs #90 ] disable index action for pull request
2012-06-04 23:13:45 +06:00
4fb74cdd50
[refs #510 ] Remove double admin namespace
2012-06-01 17:30:11 +04:00
526bdbe60f
[refs #510 ] Resque sinatra app secure
2012-05-31 17:36:41 +04:00
c74de8b84d
[refs #442 ] Add new page for mass rebuild, new fields and new functional
2012-05-23 18:08:11 +04:00
9aefce6b68
[refs #442 ] Merge master into 442-mass_build
2012-05-21 18:33:12 +04:00
6b6887250b
Merge branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-05-21 17:31:49 +06:00
5133fe6bc3
Merge pull request #487 from warpc/443-tour
...
[refs #443 ] invite localization
2012-05-18 11:10:15 -07:00
aad7a3a547
[refs #443 ] invite localization
2012-05-18 22:54:57 +06:00
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
74aee232f9
[refs #90 ] some fixes and merge button
2012-05-17 22:49:29 +06:00
3e57359c96
[refs #442 ] Add mass build page functional
2012-05-17 19:20:03 +04:00
f96990bd25
[refs #90 ] change view
2012-05-16 22:50:30 +06:00
ff016efe1c
[refs #90 ] choose project
2012-05-14 23:09:18 +06:00
f335863881
Fix dot in project name routes. Refactor and write basic route specs. Refs #454
2012-05-14 16:24:01 +03:00
cada9f6e51
[issue #443 ] Changed tour routes. Fixed submenu position.
2012-05-12 01:05:48 +04:00
a048509426
[issue #443 ] Numeric ids changed to words.
2012-05-12 00:45:37 +04:00
5f5eb00c4f
[refs #443 ] abf tour
2012-05-12 00:15:20 +06:00
5320fc2d3e
[issue #428 ] AdvisoriesController moved from its scope
2012-05-10 21:17:59 +04:00
3e0ebdc929
[refs #90 ] change route
2012-05-10 22:57:59 +06:00
05ef799fa4
[issue #428 ] Added advisories list. Added translations.
2012-05-05 21:18:29 +04:00
6fe0e5b530
[issue #428 ] Added AdvisoriesController & show view.
2012-05-05 02:53:45 +04:00
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
8350fc8fb1
[issue 428] Added advisory.
2012-05-04 21:12:51 +04:00
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
178dbdc5f0
[refs #90 ] move files
2012-05-03 23:55:08 +06:00
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
b1b5363972
Fix deploy. Redo main group route. Refs #263
2012-05-03 19:48:22 +03:00
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
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
a8ccf454ee
[refs #90 ] first steps of pull rendering
2012-04-23 23:34:11 +06:00
c0d2d67c73
Merge branch 'master' into 263-refactoring
...
Conflicts:
Gemfile
Gemfile.lock
config/routes.rb
2012-04-23 17:58:45 +03:00
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
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
5efabc9d4e
Fix atom feed urls. Refs #396
2012-04-19 20:35:35 +03:00
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
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
cd153375dd
[refs #396 ] Devise token auth update for atom feed. Some atom feed fixes.
2012-04-18 19:15:04 +04:00
3d1cb4bfee
Merge master into 396-rss_atom_feed
2012-04-18 16:53:53 +04:00
6c64125787
[issue #408 ] Changed behavior of build list for released platform
2012-04-17 22:18:39 +04:00
2dafd49763
[refs #396 ] Add atom feed
2012-04-17 19:01:35 +04:00
8204196275
[issue #347 ] Removed comments. Added filter field to collaborators
...
table.
2012-04-17 17:39:14 +04:00
2716c19635
[refs #385 ] add anonymous access to project archive
2012-04-17 16:18:03 +06:00
1b871bf6dd
[refs #404 ] Remove downloads statistics functional
2012-04-17 12:23:58 +04:00
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
770030e180
[refs #385 ] zip archive
2012-04-12 00:29:08 +06:00
68b3446747
Fix password restore routes. Change input field type. Refs #263
2012-04-10 20:12:30 +03:00
71c8efabf9
[issue #347 ] Added backbone. Changed collaborators page.
2012-04-09 21:11:39 +04:00
1e8021fe35
[issue #369 ] Added TOS page.
2012-03-31 17:18:22 +04:00
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
3cedef5f07
Merge branch 'master' into 344-fix_products_monitoring
...
Conflicts:
db/schema.rb
2012-03-30 20:30:06 +04:00
d3c2bac226
[refs #344 ] Add product buils list filter and search
2012-03-30 15:26:28 +04:00
34011513b5
[Refs #263 ] Remove old xml-rpc API
2012-03-29 23:19:00 +04:00
39c5da2445
[Refs #263 ] Remove EasyUrpmi support
2012-03-29 23:07:38 +04:00
0c2d0f4612
[Refs #263 ] Delete Categories
2012-03-29 23:01:25 +04:00
5db485a4c0
[Refs #263 ] Remove Aut BuildList. Part 2
2012-03-29 22:43:46 +04:00
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
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
90e027b8a6
Remove old project load. Fix project routes. Fix wiki history avatar load. Refs #190
2012-03-21 23:52:40 +02:00
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
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
5c408540ff
[refs #270 ] can ban user
2012-03-21 02:06:51 +06:00
20ff998f08
[refs #270 ] user control
2012-03-21 00:12:18 +06:00
7c0585ee87
[issue #279 ] Added members and other changes.
2012-03-20 20:24:18 +04:00
3d9f9b5c73
[issue #279 ] Fixed permissions and moved some buttons.
...
Removed Freeze/Unfreeze actions from Platform.
2012-03-16 17:25:34 +04:00
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
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
cf009c7388
Fix routes. Refs #257
2012-03-12 22:34:42 +02:00
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
24639b8684
[refs 257] renamed to profile
2012-03-12 21:03:25 +06:00
6d5120e5cc
Merge branch '3.2-master' into 265-new_design_for_activity_feed
2012-03-11 22:44:25 +06:00
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
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
de62aaad53
[refs #257 ] fix user update registration page
2012-03-08 00:47:19 +06:00
c657efc338
[refs #194 ] show all project labels without searching
2012-03-07 19:36:17 +06:00
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
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
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
9214f79d91
[refs #265 ] Fix one more wiki compare route
2012-03-05 20:48:59 +04:00
73296059eb
[refs #257 ] Merge 3.2-master into 257-new_design_for_profiles
2012-03-05 13:42:39 +04:00
f58e24b134
[refs #257 ] User edit pages fixes
2012-03-03 20:03:23 +04:00
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
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
1700588b97
[refs #232 ] Merge 3.2-master into 232-new_groups_design
2012-03-02 13:44:54 +04:00
Vokhmin Alexey V
Alexander Machehin
Vladimir Sharshov
konstantin.grabar
George Vinogradov
Pavel Shved
Pavel Chipiga