Alexander Machehin
e7549635f0
[refs #90 ] change translation
2012-09-28 23:44:26 +06:00
Alexander Machehin
abafbc6ef5
Merge again-and-again branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-09-28 00:09:34 +06:00
Alexander Machehin
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
Vladimir Sharshov
223aa33604
[refs #374 ] Add info about API doc site
2012-09-27 17:55:16 +04:00
Vladimir Sharshov
0dd103b7f4
[refs #374 ] Fix build list tests, remove unused code.
2012-09-27 03:54:56 +04:00
Vokhmin Alexey V
37fbb4632e
#90 : updated branch
2012-09-26 21:04:12 +04:00
Vokhmin Alexey V
613db04375
#90 : added limit for commits into the pull request
2012-09-26 21:00:58 +04:00
Vokhmin Alexey V
37c9a906c4
Merge branch '90-pull' into 90-separate-issues-and-pull-requests
2012-09-26 18:45:26 +04:00
Vokhmin Alexey V
6070c276f6
Merge branch 'master' into 90-pull
2012-09-26 18:33:04 +04:00
Vokhmin Alexey V
07b27b934f
#90 : updated #index page for pull-requests
2012-09-26 15:46:23 +04:00
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
06099a15b6
Merge pull request #657 from warpc/648-add-filters-to-projects-page
...
[refs #648 ]: Filters by owners in projects page
2012-09-25 03:41:11 -07: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
Vokhmin Alexey V
9be978eb68
#648 : updated models, JS, controller according to comments and discussions
2012-09-24 22:04:53 +04:00
Alexander Machehin
51c9375613
[refs #616 ] change preview translation
2012-09-24 23:40:41 +06:00
Vokhmin Alexey V
cee1ee6cb6
#648 : small refactoring
2012-09-23 20:22:49 +04:00
konstantin.grabar
7812adfdbc
[refs #374 ] Add custom http basic auth for api
2012-09-21 23:15:56 +04:00
Vokhmin Alexey V
ceeae09332
#648 : small revert, updated filter name
2012-09-21 22:08:19 +04:00
Vokhmin Alexey V
2406423483
#648 : added filters to Projects page
2012-09-21 21:57:22 +04:00
konstantin.grabar
e94c6f4f00
[refs #374 ] Merge master into 374-rest_api_for_builds
2012-09-21 13:20:04 +04:00
Alexander Machehin
1dcce7bf92
[refs #616 ] small fixes
2012-09-20 20:58:14 +06:00
Alexander Machehin
32e05de186
[refs #616 ] cheat sheet small i18n
2012-09-20 00:53:40 +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
Vokhmin Alexey V
967c5daaa8
#575 : added 'arch' to subject and body of email
2012-09-18 16:03:10 +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
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
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
e3bcd2382e
[refs #641 ] Show only public projects in group profile
2012-09-12 18:49:40 +04:00
Vokhmin Alexey V
b468b09529
#638 : some refactoring for adding new user
2012-09-12 17:07:34 +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
0a61ad613a
#631 : updated messages
2012-09-06 19:50:12 +04:00
Vokhmin Alexey V
71d14e43d6
#631 : fixed misprint
2012-09-06 19:39:26 +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
konstantin.grabar
b9a622acec
[refs #374 ] Add unixtime search and output. Fix rate limit configuration and 404 status
2012-09-05 17:47:25 +04:00
konstantin.grabar
ff8f9da14f
[refs #374 ] Refactor api build list create method
2012-09-04 16:44:28 +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
George Vinogradov
1aa5f73192
[issue #620 ] Fixed typo in localization.
2012-08-31 22:48:06 +04:00
George Vinogradov
68b86ba09a
[issue #620 ] Fixed migration && BuildList#actualize_packages.
2012-08-30 22:32:28 +04:00
George Vinogradov
f688985814
[issue #620 ] Changed maintainer assignment.
...
* Added `project:maintainer:set_to_owner` task to set projects maintainer
to its owner
* Removed callbacks and methods to find maintainer 'on-the-fly'
2012-08-28 01:12:53 +04:00
George Vinogradov
d24a149d9a
[issue #620 ] Added search of maintainer by package
2012-08-24 20:06:59 +04:00
George Vinogradov
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
Pavel Shved
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
Alexander Machehin
e637191a61
[refs #616 ] fixed caption of the button
2012-08-20 23:27:43 +06:00
George Vinogradov
84328742e4
[issue #590 ] Log returns through Rails with `tail -n`
2012-08-17 12:23:49 +04:00
Vladimir Sharshov
cada20ed63
Merge branch 'master' into 590-build_list_page_change
2012-08-14 15:46:16 +04:00
George Vinogradov
38e1d0c8ee
[issue #590 ] Added live log to BuildList
2012-08-14 01:41:15 +04:00
Alexander Machehin
b2ff7326d1
Merge branch 'master' into 90-pull
...
Conflicts:
config/locales/en.yml
config/locales/ru.yml
2012-08-13 15:01:43 +06:00
Vladimir Sharshov
e535ff2fed
Merge pull request #611 from warpc/590-build_list_page_change
...
[refs #590 ] Dirty hack to fix BuildList#index
2012-08-10 09:26:11 -07:00
George Vinogradov
9030056c1b
[issue #590 ] Changed _build_list partial.
2012-08-10 20:14:45 +04:00
Vladimir Sharshov
45169faf2f
Merge pull request #609 from warpc/590-build_list_page_change
...
[refs #590 ] add time notification and periodic page update
2012-08-09 14:49:12 -07:00
George Vinogradov
cc1a076516
[issue #590 ] Fixed translations.
2012-08-10 00:24:36 +04:00
George Vinogradov
e5e8cc7e7f
[issue #590 ] Changed time representation.
...
* Removed buggy jquery.countdown plugin
* Page reloads every minute
2012-08-09 20:39:01 +04:00
Alexander Machehin
3641b187bc
[refs #90 ] fixed locales
2012-08-08 21:57:33 +06:00
konstantin.grabar
0c9f3540f9
[refs #374 ] Merge master into 374-rest_api_for_builds
2012-08-08 18:21:56 +04:00
Alexander Machehin
a316105e9c
Merge branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-08-07 18:21:04 +06:00
George Vinogradov
710fef1f0b
Merge pull request #602 from warpc/601-add_status_check_for_product_bl_remove
...
[refs #601 ] Add status check for destroy action in product build list
2012-08-06 08:40:43 -07:00
Vladimir Sharshov
8934d310a0
Merge pull request #603 from warpc/590-build_list_page_change
...
[refs #590 ] On monitoring and build list pages change platform to repository.
2012-08-06 05:36:32 -07:00
George Vinogradov
dadbaefea4
[issue #590 ] On monitoring page platform changed to repository.
2012-08-06 16:31:44 +04:00
Vladimir Sharshov
c7a3addfb8
[refs #601 ] Add statuscheck for destroy action in product build list
2012-08-06 16:06:42 +04:00
Alexander Machehin
6a04f4ad7a
Merge again branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-08-06 11:19:06 +06:00
George Vinogradov
c7d13fd607
[issue #565 ] Added question description.
2012-08-04 02:28:43 +04:00
George Vinogradov
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
Pasha
23b4136d05
Merge pull request #598 from warpc/help_info
...
[refs #597 ] Add help page for new git repo. Remove link to README in project pages, small refactoring.
2012-08-03 09:24:26 -07:00
George Vinogradov
6eff6bffa5
[issue #590 ] Merge branch 'master' into 590-build_list_page_change
...
Conflicts:
db/schema.rb
2012-08-03 18:37:44 +04:00
Vladimir Sharshov
8bc229f933
[refs #597 ] Add help page for new git repo. Remove link to README in project pages, small refactoring.
2012-08-03 18:31:04 +04:00
Alexander Machehin
b299a51610
Merge branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-08-01 13:06:41 +06:00
George Vinogradov
7f5f147c36
[issue #590 ] Fixed translation
2012-08-01 09:15:56 +04:00
konstantin.grabar
f7f848e878
[refs #441 ] Merge master into 441-key_pairs
2012-07-31 17:16:07 +04:00
konstantin.grabar
931d4a7db0
[refs #441 ] Key Pairs fixes and refactoring
2012-07-31 16:50:53 +04:00
Vladimir Sharshov
43309d86e6
Merge branch 'master' into 441-key_pairs, fix schema, add migration
...
Conflicts:
db/schema.rb
2012-07-31 02:02:15 +04:00
Vladimir Sharshov
73a369ba49
[refs #441 ] Refactring: part 2. Fix integration with kernel, change view for keys list
2012-07-31 01:24:31 +04:00
George Vinogradov
d7e9cefd0b
[issue #590 ] Added validation on repository.
2012-07-30 23:26:51 +04:00
Vladimir Sharshov
89d67f9ea6
[refs #441 ] Refactring, fix errors
2012-07-30 23:08:14 +04:00
konstantin.grabar
724b36a4b4
Merge master into 570-mass_builds_status_counters_bug
2012-07-30 18:53:18 +04:00
konstantin.grabar
f674735c8c
[refs #374 ] Merge master into 374-rest_api_for_builds
2012-07-30 13:31:28 +04:00
George Vinogradov
cc66e2ee4a
[issue #590 ] Save repository to save to in BuildList.
2012-07-27 20:01:26 +04:00
Alexander Machehin
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
konstantin.grabar
354752f6cb
Merge remote-tracking branch 'origin/570-mass_builds_status_counters_bug' into 570-mass_builds_status_counters_bug
2012-07-26 15:47:33 +04:00
konstantin.grabar
48f8c3ad08
[refs #374 ] Add json responses for build lists api
2012-07-26 13:22:51 +04:00
George Vinogradov
f1839f0ad0
[issue #578 ] Added submit blocking to user creation
2012-07-26 02:12:06 +04:00
Pavel Chipiga
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
konstantin.grabar
15a86c2ecd
[refs #576 ] Add flash notifies
2012-07-23 18:25:37 +04:00
George Vinogradov
a69ad0f88a
[issue #565 ] Changed translation.
2012-07-20 20:58:23 +04:00
George Vinogradov
c37866d5e6
[issue #565 ] Added page title.
2012-07-20 20:36:09 +04:00
George Vinogradov
f61e9db5c6
[issue #565 ] Added Support link to bottom menu
2012-07-20 20:23:51 +04:00
George Vinogradov
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
Vladimir Sharshov
71fc19edc8
[refs #570 ] Change localization for fields
2012-07-18 23:04:26 +04:00
Alexander Machehin
b24a4a35b2
[refs #90 ] modify pull tab urls
2012-07-19 00:02:27 +06:00
Alexander Machehin
b903969aa6
[refs #90 ] changed displaying status message
2012-07-16 23:02:04 +06:00
Alexander Machehin
34e97510cd
[refs #90 ] modify pull headers
2012-07-16 22:27:41 +06:00
konstantin.grabar
70b2d62e52
[refs #441 ] Some small fixes of locales and code
2012-07-16 13:58:33 +04:00
konstantin.grabar
3cf3546c2e
[refs #441 ] Add secret to filter. Add repository key exist check
2012-07-13 18:16:56 +04:00
konstantin.grabar
b4059c67fc
[refs #441 ] Add key pairs for platform
2012-07-13 15:18:12 +04:00
Alexander Machehin
26617b7739
[refs #90 ] add close/reopen button
2012-07-12 20:15:28 +06:00
Alexander Machehin
3290adb0b1
[refs #90 ] fixed merge ability
2012-07-10 22:58:39 +06:00
Alexander Machehin
10b828c644
Merge branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
vendor/assets/javascripts/vendor.js
2012-07-10 18:35:49 +06:00
George Vinogradov
f83a1ae6c2
[issue #561 ] Changed translations.
2012-07-10 02:55:34 +04:00
George Vinogradov
7b3c74e97d
[issue #561 ] Changed BuildList pages
...
* Removed mass_build, cancel and updated_at fields from list
* Added link to commit in list (instead of version)
* Added platform field in list
* Added filter by main platforms
* Added cancel button and mass_build field to BuildList#show
2012-07-10 01:09:27 +04:00
George Vinogradov
3c8b77027e
[issue #428 ] Allowed any update_types when build for released platform.
2012-07-06 03:05:47 +04:00
George Vinogradov
fa5deed42f
[issue #428 ] Added BuildLists list to Advisory#show
2012-07-04 22:32:10 +04:00
George Vinogradov
1c4c91df5c
[issue #428 ] Fixed attaching projects to advisory.
2012-07-04 21:38:45 +04:00
George Vinogradov
a909a92ae8
[issue #428 ] Merge branch 'master' into 428-advisory
...
Conflicts:
db/schema.rb
2012-07-04 18:10:03 +04:00
George Vinogradov
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
George Vinogradov
094f25c049
[issue #428 ] Changed attaching advisory to BuildList.
...
Removed Chosen. Added text field with incremental search.
2012-07-04 02:52:13 +04:00
Alexander Machehin
89abd20c95
Merge branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-07-03 21:22:10 +06:00
konstantin.grabar
c7232c53e9
[refs #442 ] Fix some locales. Fix batch_size
2012-07-03 12:44:51 +04:00
konstantin.grabar
6507ad280f
[refs #442 ] Merge master into 442-mass_build
2012-06-29 16:40:54 +04:00
Vladimir Sharshov
7561abca08
[refs #462 ] refactoring: remove notified_at
2012-06-28 21:40:32 +04:00
konstantin.grabar
ce163f89a9
[refs #442 ] Add rep_name field. Add cancel builds ability
2012-06-28 19:23:33 +04:00
Vladimir Sharshov
174c4dab0b
Merge pull request #540 from warpc/442-mass_build
...
[refs #442 ] Support mass build statistic
2012-06-28 05:02:44 -07:00
konstantin.grabar
10aed58bdd
[refs #442 ] Small refactor. Remove bootstrap collapse
2012-06-28 15:31:25 +04:00
konstantin.grabar
b6d769ad66
[refs #442 ] Change mass builds table
2012-06-27 18:07:05 +04:00
Alexander Machehin
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
Alexander Machehin
1ac1e42894
small fix to Russian translation
2012-06-27 15:59:58 +06:00
konstantin.grabar
fc00f713b5
[refs #442 ] Add counters update checking. Add build_error counter
2012-06-27 13:48:54 +04:00
Alexander Machehin
9b41fd50af
[refs #90 ] fixed translation of titles & headers
2012-06-26 15:40:37 +06:00
Alexander Machehin
6aa9cfaa50
[refs #90 ] view pull status
2012-06-25 22:04:43 +06:00
konstantin.grabar
bdb97b8891
[refs #442 ] Add statistics data to mass builds. Small refactor for report
2012-06-25 19:20:35 +04:00
konstantin.grabar
5e3241a1f5
[refs #525 ] Rename erase to clear. Fix flash. Replace repository to platform in locales
2012-06-21 11:15:26 +04:00
konstantin.grabar
dfb1da97b4
[refs #525 ] Fix locales
2012-06-20 22:33:49 +04:00
konstantin.grabar
3ebd36f6fe
[refs #525 ] Erase corrections and refactor
2012-06-20 22:02:42 +04:00
George Vinogradov
e4f62ea592
[issue #428 ] Added filter by advisory_id to Advisories
2012-06-20 21:51:08 +04:00
George Vinogradov
3d38adcb94
[issue #428 ] Added Atom feed to advisories.
2012-06-20 18:44:32 +04:00
konstantin.grabar
270dbf2e9b
[refs #525 ] Add erase repository functional
2012-06-20 17:21:32 +04:00
Alexander Machehin
682f33a9bf
[refs #90 ] view merged status
2012-06-13 23:52:11 +06:00
Pavel Chipiga
ec21c042dd
Fix and refactor active menu. Refs #207
2012-06-09 19:04:06 +03:00
konstantin.grabar
26299c234b
[refs #510 ] Add resque to the admin submenu
2012-06-08 19:02:45 +04:00
Alexander Machehin
8fadbf2d41
[refs #90 ] rewrite diff
2012-06-07 23:23:28 +06:00
George Vinogradov
e7c0eab736
[issue #428 ] Merge branch 'master' into 428-advisory
...
Conflicts:
app/assets/stylesheets/design/custom.scss
2012-06-04 23:59:00 +04:00
George Vinogradov
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
Alexander Machehin
c185a13543
[refs #90 ] change russian translation
2012-06-04 23:00:56 +06:00
Alexander Machehin
11c67fb07d
Revert "[refs #90 ] issue status -> state" & changed state -> status
...
This reverts commit 7470ee76e4783a0fbbd98607406d7b770a2980d1.
Conflicts:
app/controllers/projects/issues_controller.rb
db/migrate/20120412173938_create_pull_requests.rb
db/schema.rb
2012-05-29 16:50:25 +06:00
Vladimir Sharshov
f8edecc915
Merge branch 'master' of github.com:warpc/rosa-build
2012-05-28 23:28:09 +04:00
konstantin.grabar
5e9f348074
[ref #442 ] Add id column
2012-05-28 23:18:50 +04:00
Vladimir Sharshov
3fbd2ae79e
Merge branch 'master' of github.com:warpc/rosa-build
2012-05-28 13:05:31 +04:00
Vladimir Sharshov
3ed195bb86
Merge pull request #502 from warpc/442-mass_build
...
[refs #442 ] Mass build refactor and fixes
2012-05-28 02:00:30 -07:00
Vladimir Sharshov
0f1c92cac2
Fix translation for build status
2012-05-26 00:22:23 +04:00
konstantin.grabar
df82cf69ca
[refs #442 ] Refactor mass_build
2012-05-25 21:31:57 +04:00
konstantin.grabar
a79d946b6b
[refs #442 ] Mass build refactor and fixes
2012-05-25 19:56:26 +04:00
Alexander Machehin
df610931d7
[refs #90 ] commits tab
2012-05-25 16:48:44 +06:00
Alexander Machehin
4f1d23a2a4
[refs #90 ] branch, merge validation
2012-05-24 23:10:49 +06:00
Vladimir Sharshov
0d3e06b5d9
Merge pull request #499 from warpc/478-project_build_failed
...
[refs #478 ] Add js handler to disable frozen platforms and their reps
2012-05-24 03:39:55 -07:00
konstantin.grabar
3d2bcdd019
[refs #478 ] Add js handler to disable frozen platforms and their reps
2012-05-24 14:21:57 +04:00
konstantin.grabar
45ff187875
[refs #442 ] Remove button. Add tab. Fix locales. Fix schema
2012-05-23 20:44:04 +04:00
Alexander Machehin
e211fa2fc3
[refs #90 ] fixed errors, add validations & tests
2012-05-23 22:09:11 +06:00
konstantin.grabar
a83927c812
[refs #442 ] Fix mass_build_id locales
2012-05-23 18:19:04 +04:00
konstantin.grabar
c74de8b84d
[refs #442 ] Add new page for mass rebuild, new fields and new functional
2012-05-23 18:08:11 +04:00
Alexander Machehin
0c89ca6575
[refs #90 ] broken tests
2012-05-23 00:23:00 +06:00
konstantin.grabar
7c45263799
[refs #442 ] Add mass build select to monitoring. Remove build lists from build_all action
2012-05-22 17:40:27 +04:00
konstantin.grabar
9aefce6b68
[refs #442 ] Merge master into 442-mass_build
2012-05-21 18:33:12 +04:00
Alexander Machehin
d643bb3cd0
[refs #90 ] try to prevent create same pull
2012-05-21 19:24:16 +06:00
Alexander Machehin
6b6887250b
Merge branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-05-21 17:31:49 +06:00
Alexander Machehin
1bcab2f7db
[refs #443 ] remove old file, fixed ru translation
2012-05-21 16:46:08 +06:00
konstantin.grabar
be2ab9154c
[refs #442 ] Fix checkboxes styles. Return delay for build all. Add mass build select and more fixes
2012-05-21 14:18:29 +04:00
Vladimir Sharshov
5133fe6bc3
Merge pull request #487 from warpc/443-tour
...
[refs #443 ] invite localization
2012-05-18 11:10:15 -07:00
Alexander Machehin
aad7a3a547
[refs #443 ] invite localization
2012-05-18 22:54:57 +06:00
konstantin.grabar
cd3564bb81
[refs #442 ] Add mass build model and new build_all fixes
2012-05-18 19:12:51 +04:00
Vladimir Sharshov
a804f3ef2c
[refs #461 ] Correct translation for is_package option
2012-05-18 00:40:30 +04: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
konstantin.grabar
ec9c19352e
[refs #461 ] Merge master into to 461-rename_is_rpm_to_is_package. Again
2012-05-17 12:00:21 +04:00
Vladimir Sharshov
2892689807
Merge pull request #469 from warpc/443-tour
...
[refs #466 ] Add localization for system tour. Fix for auto detecting users language.
2012-05-16 05:19:59 -07:00
konstantin.grabar
9d871af7ef
Merge master into 461-rename_is_rpm_to_is_package
2012-05-16 14:40:10 +04:00
konstantin.grabar
1385133ed5
[refs #461 ] Merge master into 461-rename_is_rpm_to_is_package
2012-05-16 14:37:35 +04:00
konstantin.grabar
79a9b3d107
[refs #461 ] Fix is_package locale. Fix schema.rb and rename migration
2012-05-16 14:33:14 +04:00
konstantin.grabar
5ad43c684e
Merge master into 429-uname_format_error_explain
2012-05-16 14:01:41 +04:00
Alexander Machehin
05746ea449
[refs #466 ] add i18n
2012-05-15 21:35:48 +06:00
konstantin.grabar
e807e5f3ec
[refs #429 ] Add format explain error message for uname
2012-05-15 15:11:18 +04:00
Vladimir Sharshov
56ad094b00
Merge pull request #463 from warpc/444-bl_package
...
[refs #444 ] Apply basic build list packages store functionality;
* Display build list package content;
* Write specs.
2012-05-14 13:12:37 -07:00
Pavel Chipiga
8470674c62
Apply basic build list packages store functionality. Display build list package content. Write specs. Refactor. Refs #444
2012-05-14 22:08:31 +03:00
Alexander Machehin
aa38017daa
[refs #340 ] restore page titles
2012-05-14 23:24:09 +06:00
Pavel Chipiga
52f5e01575
Fix build list controller bugs. Fix JS which controls checkboxes. Fix translations. Fix and refactor views. Refs #428
2012-05-06 00:43:04 +03:00
George Vinogradov
05ef799fa4
[issue #428 ] Added advisories list. Added translations.
2012-05-05 21:18:29 +04:00
Alexander Machehin
813afe53cf
[refs #90 ] minor interface changes
2012-05-04 23:13:41 +06:00
Alexander Machehin
c5731ff8dd
[refs #90 ] fixed merging errors
2012-05-04 16:56:11 +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
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
4ad39b05c0
[refs #90 ] model PullRequest, tests
2012-04-28 23:30:54 +06:00
Alexander Machehin
a8ccf454ee
[refs #90 ] first steps of pull rendering
2012-04-23 23:34:11 +06:00
Alexander Machehin
628fed40ea
[refs #90 ] issue status -> state
2012-04-23 23:34:11 +06: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
def76d134d
[refs #396 ] Fix some atom locales
2012-04-19 15:05:17 +04:00
konstantin.grabar
2fc4e2db61
[refs #396 ] Fix token migration. Fix atom link tag title
2012-04-19 14:50:43 +04:00
George Vinogradov
721fa1b0c0
[issue #408 ] Fixed translations
2012-04-18 14:59:41 +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
8d723ee0be
[refs #396 ] Fix title truncate and strip. Add feed main title.
2012-04-17 19:38:02 +04:00
George Vinogradov
8204196275
[issue #347 ] Removed comments. Added filter field to collaborators
...
table.
2012-04-17 17:39:14 +04:00
konstantin.grabar
2c9d4583e8
[refs #404 ] Remove downloads from menu
2012-04-17 13:17:52 +04:00
Alexander Machehin
2dedbd92d0
[refs #194 ] assignee & user
2012-04-14 01:44:04 +06:00
Vladimir Sharshov
100a166699
[Refs #223 ] Refactoring for pull request
2012-04-13 17:24:43 +04:00
Vladimir Sharshov
8ffc6be347
Merge branch '223-change_build_lists_new_js_handlers' into 223-build_list_notify_and_duration_updates
...
Conflicts:
app/models/build_list.rb
config/locales/models/build_list.en.yml
config/locales/models/build_list.ru.yml
2012-04-13 17:21:30 +04:00
Vladimir Sharshov
36447051ec
[Refs #223 ] Small refactoring for pull request
2012-04-13 13:48:57 +04:00
konstantin.grabar
65f1cfc822
[refs #223 ] Add current duration and project average build time
2012-04-12 18:55:32 +04:00
konstantin.grabar
26a468f6e3
[refs #223 ] Replace notified_at by updated_at
2012-04-12 16:12:06 +04:00
konstantin.grabar
742603ab7e
[refs #223 ] Add build list duration
2012-04-12 14:29:04 +04:00
konstantin.grabar
18bda07369
Merge master into 223-change_build_lists_new_js_handlers
2012-04-10 18:00:48 +04:00
konstantin.grabar
c619aa44b7
[refs #223 ] Fix build list status
2012-04-10 17:11:36 +04:00
konstantin.grabar
3cff036508
[refs #223 ] Add new build btn to project page
2012-04-10 17:07:09 +04:00
Alexander Machehin
dfddee82ab
[refs #353 ] fixed english translation
2012-04-10 01:43:45 +06:00
Alexander Machehin
cd938532d0
[refs #353 ] fixed russian translate
2012-04-10 01:10:44 +06:00
Alexander Machehin
5658707fe1
[refs #353 ] divide long string
2012-04-10 00:13:42 +06:00
Alexander Machehin
e349a69883
[refs #353 ] can fork project to group
2012-04-09 23:56:03 +06:00
konstantin.grabar
39dd53ff9b
[refs #358 ] Add git clone repo help hint
2012-04-05 11:26:03 +04:00
George Vinogradov
1e8021fe35
[issue #369 ] Added TOS page.
2012-03-31 17:18:22 +04:00
Vladimir Sharshov
0f597ad544
Merge pull request #368 from warpc/195-new_design_for_projects
...
[issue #195 ] Fixed access string in repo block
2012-03-31 03:39:52 -07:00
George Vinogradov
59f51d3b2f
[issue #195 ] read_access: read -> read-only
2012-03-31 14:36:36 +04:00
George Vinogradov
eb4679de0e
[issue #195 ] Fixed access string in repo block
2012-03-31 14:27:20 +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
4ce18b017e
Merge pull request #363 from warpc/195-new_design_for_projects
...
[issue #195 ] Added missed translations.
2012-03-30 13:51:07 -07:00
George Vinogradov
c70a7136d6
[issue #195 ] Fixed translations.
2012-03-31 00:47:49 +04:00
George Vinogradov
4e701dbddb
[issue #195 ] Added missed translations.
2012-03-31 00:20:23 +04:00
Alexander Machehin
b8cadd8a22
[refs #340 ] changed translations for monitoring pages
2012-03-31 00:24:32 +06:00
Alexander Machehin
4db9bf4587
[refs #340 ] add title to products page
2012-03-30 23:41:22 +06:00
Alexander Machehin
d18e55f180
[refs #340 ] titles - part2
2012-03-30 22:37:54 +06:00
Alexander Machehin
e14e2db6c3
[refs #340 ] first part of titles
2012-03-30 22:36:20 +06: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
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
Vladimir Sharshov
eac5461a29
Merge pull request #355 from warpc/195-new_design_for_projects
...
[issue #195 ] Fixed leave button. Added participant icons.
2012-03-29 09:29:37 -07:00
George Vinogradov
c03ae5015e
[issue #195 ] Fixed leave button. Added participant icons.
2012-03-29 20:27:33 +04:00
Vladimir Sharshov
1d344f441f
[Refs #263 ] Fix localization: mistakes, typos and missing translations. Special thanks to Eugeni Dodonov for help.
2012-03-29 14:48:15 +04:00
Alexander Machehin
69ccf18265
[refs #270 ] added statistics to admins menu
2012-03-28 19:19:42 +06:00
George Vinogradov
baf35da99c
[issue #195 ] Merge branch 'master' into 195-new_design_for_projects
...
Conflicts:
app/controllers/projects_controller.rb
2012-03-27 21:23:09 +04:00
George Vinogradov
9bb1d80172
[issue #195 ] Added AJAX to /projects list.
2012-03-27 19:50:00 +04:00
Alexander Machehin
c327ca8d61
[refs #270 ] fixed translation for admin menu
2012-03-27 21:28:22 +06:00
Alexander Machehin
6cac84e1bb
[refs #270 ] added register requests page to admins menu
2012-03-27 18:55:08 +06:00
George Vinogradov
dd8e3b0497
[issue #195 ] Added JQuery datatables to /projects
2012-03-25 01:36:56 +04:00
Vladimir Sharshov
0a2561549b
Merge pull request #339 from warpc/195-projects
...
[Refs #195 ] add lock/unlock icon, fixed edit button, changed translations
2012-03-23 12:26:30 -07:00
Alexander Machehin
863d2999c8
[refs #195 ] changed translations
2012-03-24 01:15:34 +06:00
Alexander Machehin
b08b1f7528
[refs #270 ] changed translation to Admin
2012-03-23 17:11:15 +06:00
Vladimir Sharshov
df32afbda6
[Refs #265 ] change text for load_messages link
2012-03-22 22:35:01 +04: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
George Vinogradov
9f23cf7727
[issue #195 ] Merge branch '3.2-master' into 195-new_design_for_projects
...
Conflicts:
app/views/projects/_sidebar.html.haml
2012-03-22 18:15:57 +04:00
George Vinogradov
524fa2302f
[issue #279 ] Changed buttons alignment.
2012-03-22 17:53:35 +04:00
Alexander Machehin
fcc1fad0d1
[refs #270 ] fixed translations
2012-03-22 18:00:34 +06: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
a6a5b722d2
[refs #270 ] use devise lockable to ban
2012-03-21 23:45:51 +06: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
Vladimir Sharshov
e2c1e59350
Merge pull request #314 from warpc/270-admins_menu
...
[Refs #270 ] created admins menu aside
2012-03-20 15:17:51 -07: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
f958c56a3e
[issue #279 ] Fixed typos
2012-03-20 21:44:56 +04:00