konstantin.grabar
70b2d62e52
[refs #441 ] Some small fixes of locales and code
2012-07-16 13:58:33 +04:00
Alexander Machehin
56db0fffd0
[refs #90 ] small refactoring
2012-07-16 14:46:44 +06: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
cfb16f8118
[issue #561 ] Fixed bug on BuildList#show page
2012-07-10 03:57:25 +04:00
George Vinogradov
f83a1ae6c2
[issue #561 ] Changed translations.
2012-07-10 02:55:34 +04:00
George Vinogradov
3195969aab
[issue #561 ] Added bs_id to BuildList#show
2012-07-10 02:14:31 +04:00
George Vinogradov
f997e50905
[issue #561 ] Some cosmethic changes.
...
* Reordered columns in BuildLists table
* Reordered rows in BuildLists filter
* Removed created_at filter (Commented. See TODOs)
2012-07-10 01:49:19 +04:00
George Vinogradov
8c5a8c884d
[issue #561 ] Some DB query optimization.
2012-07-10 01:13:55 +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
Alexander Machehin
07e02d9a17
[refs #90 ] modified Update commits button
2012-07-10 00:41:39 +06:00
Vladimir Sharshov
d7ee0fe938
Merge pull request #559 from warpc/428-advisory
...
[refs #428 ] Advisory: new look
2012-07-09 08:44:13 -07:00
George Vinogradov
2839dc14b6
[issue #428 ] Using #name_with_owner in projects pages.
2012-07-09 19:19:30 +04:00
Alexander Machehin
dd221cc880
[refs #90 ] autocomplete
2012-07-06 23:30:01 +06: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
1cfd1975d5
[issue #428 ] Projects shows with owner name.
2012-07-04 22:52:09 +04:00
George Vinogradov
fa5deed42f
[issue #428 ] Added BuildLists list to Advisory#show
2012-07-04 22:32:10 +04:00
George Vinogradov
db66c7b3e1
[issue #428 ] Attempt to fix duplication in packages list
2012-07-04 22:01:06 +04:00
George Vinogradov
1c4c91df5c
[issue #428 ] Fixed attaching projects to advisory.
2012-07-04 21:38:45 +04:00
George Vinogradov
8c9cca39ef
[issue #428 ] Attempt to fix packages listing
2012-07-04 20:52:22 +04:00
George Vinogradov
a2d35d2538
[issue #527 ] Use User#fullname instead of string.
2012-07-04 19:53:18 +04:00
George Vinogradov
7a38335037
[issue #527 ] Fixed group members list
2012-07-04 19:27:20 +04:00
Vladimir Sharshov
ce1c1ff403
Merge pull request #528 from warpc/428-advisory
...
[issue #428 ] Advisories: final version:
* Added Many2Many relation between advisories and projects;
* Added autocompletion to build list's advisory;
* Bootstrap's JS moved to vendor;
* Added Atom feed for advisories;
* Added search in advisories page.
2012-07-04 07:29:30 -07:00
Alexander Machehin
7b0c135a24
[refs #90 ] fixed pull button
2012-07-04 20:22:23 +06:00
Vladimir Sharshov
1921bdae01
Merge pull request #556 from warpc/442-mass_build
...
[refs #442 ] Fix mass_builds link
2012-07-04 07:11:39 -07:00
George Vinogradov
a909a92ae8
[issue #428 ] Merge branch 'master' into 428-advisory
...
Conflicts:
db/schema.rb
2012-07-04 18:10:03 +04:00
konstantin.grabar
07372dd1a3
[refs #442 ] Fix mass_builds link
2012-07-04 18:09:59 +04:00
George Vinogradov
8687e343f8
[issue #554 ] Fixed tab+space json bug in AJAX.
2012-07-04 17:55:55 +04:00
konstantin.grabar
82612c368d
[refs #442 ] Move mass_builds to platforms dir
2012-07-04 16:15:12 +04:00
George Vinogradov
8c88e7a0da
[issue #428 ] Some code simplification.
2012-07-04 15:42:43 +04:00
George Vinogradov
7515f3515d
[issue #428 ] Fixed refs in advisory preview
2012-07-04 03:44:30 +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
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
konstantin.grabar
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
konstantin.grabar
004f603e02
[refs #442 ] Add new actions rights. Cancel build list btn rights fix
2012-06-29 23:10:18 +04:00
konstantin.grabar
8cfe262045
[refs #442 ] Fix status filter
2012-06-29 22:31:40 +04:00
konstantin.grabar
160bdca0c8
[refs #442 ] Add cancel_all to background. Add ownership and fix status links
2012-06-29 22:08:33 +04:00
konstantin.grabar
6507ad280f
[refs #442 ] Merge master into 442-mass_build
2012-06-29 16:40:54 +04:00
Alexander Machehin
01db786728
[refs #442 ] remove double checking
2012-06-29 17:39:54 +06: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
4187ef8873
[refs #442 ] Add links for statuses
2012-06-27 19:32:29 +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
konstantin.grabar
fc00f713b5
[refs #442 ] Add counters update checking. Add build_error counter
2012-06-27 13:48:54 +04:00
Vladimir Sharshov
96d284d5ee
Merge pull request #533 from warpc/531-fix_users_role
...
[refs #531 ] Changed the rules for granting user rights in the project
2012-06-26 05:44:16 -07:00
Alexander Machehin
8768317323
[refs #90 ] fix issue path
2012-06-26 15:52:20 +06: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
651dd57044
Merge branch 'master' into 442-mass_build
2012-06-25 18:29:16 +04:00
konstantin.grabar
edcc0c996f
Merge branch 'master' into 442-mass_build
2012-06-22 13:20:50 +04:00
konstantin.grabar
10efb2401a
[refs #442 ] Fix auto_publish select
2012-06-21 17:49:20 +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
3ebd36f6fe
[refs #525 ] Erase corrections and refactor
2012-06-20 22:02:42 +04:00
Alexander Machehin
4d91ea1d6e
[refs #531 ] fixed user roles
2012-06-20 23:59:47 +06:00
George Vinogradov
e4f62ea592
[issue #428 ] Added filter by advisory_id to Advisories
2012-06-20 21:51:08 +04:00
konstantin.grabar
4b9a04e3f7
[refs #525 ] Set erase route to post
2012-06-20 20:40:50 +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
George Vinogradov
735afaea15
[issue #428 ] Merge branch 'master' into 428-advisory
...
Conflicts:
db/schema.rb
2012-06-19 02:57:39 +04:00
George Vinogradov
ecd4498484
[issue #428 ] Changes in advisories.
...
* Added Many2Many relation between advisories and projects.
* Added autocompletion to build list's advisory
* Bootstrap's JS moved to vendor/
2012-06-19 02:49:17 +04:00
Alexander Machehin
8542c60838
[refs #522 ] to fork check own projects
2012-06-15 00:12:44 +06: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
724868e495
[refs #90 ] fixed view with #repo-wrapper
2012-06-08 14:28:23 +06:00
Alexander Machehin
29d01f33a5
[refs #90 ] dont redirect in tracker
2012-06-08 14:11:46 +06:00
Alexander Machehin
bf11afca4c
[refs #90 ] fixed diff view
2012-06-08 13:53:30 +06:00
Alexander Machehin
5f50bacbe6
[refs #90 ] some refactoring with rtruncate method
2012-06-08 13:38:24 +06:00
Alexander Machehin
62128d2c72
[refs #90 ] change diff anchors to digits
2012-06-08 01:20:06 +06:00
Alexander Machehin
0b9c0fdd07
[refs #90 ] fixed rendering file rename
2012-06-08 01:19:18 +06:00
Alexander Machehin
8fadbf2d41
[refs #90 ] rewrite diff
2012-06-07 23:23:28 +06:00
Alexander Machehin
65fd4a8340
[refs #90 ] add anchor to commits list
2012-06-06 00:13:20 +06:00
George Vinogradov
863213767b
[issue #428 ] Fixed typos. Removed unnecessary parts.
2012-06-05 19:58:11 +04:00
Alexander Machehin
614691a737
[refs #90 ] removed index action
2012-06-05 18:10:51 +06:00
Alexander Machehin
91bf65d65d
[refs #90 ] comments for pull requests (slow version)
2012-06-05 18:08:52 +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
4b8def5bd0
[refs #90 ] add pulls to tracker
2012-06-04 23:00:19 +06:00
Alexander Machehin
8ed8e10cd6
[refs #90 ] moved update form lower
2012-05-31 23:30:10 +06:00
Alexander Machehin
60aba754ae
[refs #90 ] pull title/body update
2012-05-31 22:57:52 +06:00
Alexander Machehin
3c3448e26f
[refs #90 ] new/show views refactoring
2012-05-31 17:16:54 +06:00
Alexander Machehin
26baf999f4
[refs #90 ] diff stats
2012-05-29 23:09:43 +06:00
konstantin.grabar
8eaec85aff
[refs #442 ] Fix auto_publish validate and default set
2012-05-29 17:44:30 +04: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
konstantin.grabar
a51737d58c
[refs #442 ] Add cellpadding and cellspasing to mass builds table
2012-05-28 23:51:43 +04:00
konstantin.grabar
5e9f348074
[ref #442 ] Add id column
2012-05-28 23:18:50 +04:00
konstantin.grabar
ce762be562
[refs #442 ] Add unbordered style to mass builds table
2012-05-28 18:41:51 +04:00
Vladimir Sharshov
c119ae0d20
Merge pull request #504 from warpc/442-mass_build
...
[refs #442 ] Add sidebar for mass rebuild page in platform
2012-05-28 05:45:48 -07:00
konstantin.grabar
82b5999e32
[refs #442 ] Add sidebar
2012-05-28 14:28:19 +04:00
Alexander Machehin
780cc351d5
[refs #263 ] use user fullname
2012-05-28 16:22:18 +06:00
Alexander Machehin
bc3212a374
fixed assignee uname for issue sidebar
2012-05-28 15:38:57 +06:00
konstantin.grabar
658bfc2ebd
[refs #442 ] Fix link to mass build creator
2012-05-28 12:56:49 +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
568df37570
Merge pull request #500 from warpc/478-project_build_failed
...
[refs #478 ] Change js handler logic for creating build build list for frozen platform
2012-05-24 06:11:36 -07:00
konstantin.grabar
0958299f51
[refs #478 ] Change js handler logic
2012-05-24 16:51:39 +04: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
konstantin.grabar
43e95b565e
[refs #442 ] Change build_all button to mass_builds
2012-05-23 20:27:06 +04: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
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
konstantin.grabar
b85cb31b88
[refs #442 ] Remove def is_rpm. Change auto_publish default value. Change MassBuild set_name. Fix schema
2012-05-21 17:59:04 +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
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
Alexander Machehin
f96990bd25
[refs #90 ] change view
2012-05-16 22:50:30 +06: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
Alexander Machehin
2651f0dc52
[refs #443 ] localize top image
2012-05-16 17:10:22 +06:00
konstantin.grabar
1385133ed5
[refs #461 ] Merge master into 461-rename_is_rpm_to_is_package
2012-05-16 14:37:35 +04:00
Alexander Machehin
05746ea449
[refs #466 ] add i18n
2012-05-15 21:35:48 +06:00
Pavel Chipiga
c1b4a0639d
Fix build list display
2012-05-15 13:12:07 +03:00
konstantin.grabar
1f088c0cfc
[refs #461 ] Rename is_rpm to is_package
2012-05-15 14:00:57 +04: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
ff016efe1c
[refs #90 ] choose project
2012-05-14 23:09:18 +06:00
Alexander Machehin
5fcf9c3ffa
Merge pull request #453 from warpc/451-advisories_partial_name_error
...
[refs #451 ] Fix partial name
2012-05-14 01:32:27 -07:00
konstantin.grabar
8060a9b8a9
[refs #451 ] Fix partial name
2012-05-14 12:16:37 +04:00
Vladimir Sharshov
64d5600e6f
Merge pull request #447 from warpc/443-tour
...
[refs #443 ] Tour about the system
2012-05-12 10:11:16 -07:00
Alexander Machehin
7a011606a5
[refs #443 ] add pirobox popup
2012-05-12 19:17:07 +06:00
Alexander Machehin
0e5b2ba25d
[refs #443 ] compact styles
2012-05-12 15:54:24 +06:00
George Vinogradov
a048509426
[issue #443 ] Numeric ids changed to words.
2012-05-12 00:45:37 +04:00
George Vinogradov
218904675d
[issue #443 ] Fixed styles. Removed whitespace between content and
...
footer.
2012-05-12 00:24:40 +04:00
Alexander Machehin
85d4489009
[refs #90 ] dont work pull
2012-05-12 00:23:09 +06:00
Alexander Machehin
5f5eb00c4f
[refs #443 ] abf tour
2012-05-12 00:15:20 +06:00
konstantin.grabar
60fdf9e998
[refs #396 ] Add atom feed icon
2012-05-11 19:44:19 +04: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
9a0f582a16
[issue #428 ] Fixed typo in PlatformsHelper
2012-05-10 20:04:48 +04:00
George Vinogradov
f8d32495b8
[issue #428 ] Added title. Changed BuildListsController#update
2012-05-10 19:15:50 +04:00
Alexander Machehin
4040a486fe
[refs #90 ] fix diff
2012-05-10 18:32:54 +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
26a643eed1
[issue #428 ] Merge branch 'master' into 428-advisory
...
Conflicts:
app/controllers/projects/build_lists_controller.rb
db/schema.rb
2012-05-05 21:33:39 +04:00
George Vinogradov
05ef799fa4
[issue #428 ] Added advisories list. Added translations.
2012-05-05 21:18:29 +04:00
Alexander Machehin
381ae0a8b9
[refs #90 ] diff - dont work
2012-05-05 22:57:12 +06:00
Pavel Chipiga
614f8cd5f9
Refactor active menu detection. Refs #433
2012-05-05 19:15:49 +03: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
Alexander Machehin
813afe53cf
[refs #90 ] minor interface changes
2012-05-04 23:13:41 +06:00
George Vinogradov
8350fc8fb1
[issue 428] Added advisory.
2012-05-04 21:12:51 +04:00
Alexander Machehin
c5731ff8dd
[refs #90 ] fixed merging errors
2012-05-04 16:56:11 +06: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
Alexander Machehin
f3cc6a03a5
[refs #263 ] dont show owner in the group members list
2012-05-03 18:34:30 +06:00
Alexander Machehin
9e5db741d3
Merge branch 'master' into 90-pull
...
Conflicts:
app/models/project.rb
db/schema.rb
2012-05-02 23:08:24 +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
Pavel Chipiga
b957600eda
Merge branch 'master' into 263-refactoring
...
Conflicts:
app/models/project.rb
app/views/projects/_repo_block.html.haml
db/schema.rb
spec/controllers/issues_controller_spec.rb
spec/controllers/projects_controller_spec.rb
2012-05-01 15:54:13 +03:00
Vladimir Sharshov
6f246b5684
Bringing the block 'My today builds' in utc
2012-04-29 01:55:20 +04:00
Alexander Machehin
4ad39b05c0
[refs #90 ] model PullRequest, tests
2012-04-28 23:30:54 +06:00
George Vinogradov
de093d7065
[issue #425 ] Changed object to actor in Relation and to eventable in
...
EventLog
2012-04-26 05:38:33 +04:00
Alexander Machehin
cb9588619a
[refs #416 ] dont show zip menu for empty project
2012-04-24 22:36:52 +06:00
Pavel Chipiga
cf907c19e8
Merge branch 'master' into 263-refactoring
...
Conflicts:
app/controllers/build_lists_controller.rb
2012-04-24 19:06:43 +03:00
Vladimir Sharshov
e9473f4a8a
Fix static date field in build list show page
2012-04-24 18:49:46 +04:00
Vladimir Sharshov
29750da420
[Refs #396 ] Change name to nickname in Atom feed title
2012-04-24 15:11:03 +04:00
konstantin.grabar
90c615d373
[refs #420 ] Add Yandex Metrika counter
2012-04-24 13:57:03 +04:00
Pavel Chipiga
7af06cc7ab
Downgrade unicorn. Fix project fork. Fix reserved_names validator. Add comments, cleanup code and refactor. Fix some bugs. Redo specs project URLs. Refs #263
2012-04-23 23:55:42 +03:00
Pavel Chipiga
9cae595d77
Merge branch 'master' into 263-refactoring
2012-04-23 22:22:24 +03:00
Pasha
0c8f8e14a6
Merge pull request #419 from warpc/347-javascript_refactoring
...
[issue #347 ] Fixed artefacts in Add Collaborators form.
2012-04-23 12:21:00 -07: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
Pavel Chipiga
c0d2d67c73
Merge branch 'master' into 263-refactoring
...
Conflicts:
Gemfile
Gemfile.lock
config/routes.rb
2012-04-23 17:58:45 +03:00
George Vinogradov
af18f4404f
[issue #347 ] Fixed artefacts in Add Collaborators form.
2012-04-22 13:17:33 +04: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
George Vinogradov
678f7cc0ed
[issue #347 ] Changed search field.
2012-04-20 00:35:31 +04: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
02095e62c1
Merge pull request #413 from warpc/396-rss_atom_feed
...
[Refs #396 ] Hide atom feed link from anonymus users
2012-04-19 07:47:29 -07:00
konstantin.grabar
714fe34883
[refs #396 ] Hide atom feed link from anonymus users
2012-04-19 18:37:20 +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
be3daca1e6
[refs #396 ] Fix atom feed link tag
2012-04-19 18:06:54 +04:00
konstantin.grabar
799ba33766
[refs #396 ] Add token to atom feed link tag
2012-04-19 17:57:22 +04:00
konstantin.grabar
2fc4e2db61
[refs #396 ] Fix token migration. Fix atom link tag title
2012-04-19 14:50:43 +04: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
8d723ee0be
[refs #396 ] Fix title truncate and strip. Add feed main title.
2012-04-17 19:38:02 +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
f31b243ae9
[refs #385 ] zip image
2012-04-17 18:06:04 +06:00
Vladimir Sharshov
3d1ef0ce4c
Merge pull request #406 from warpc/223-change_build_lists_new_js_handlers
...
[refs #223 ] Move project version to right column and change fields order
2012-04-17 02:42:20 -07:00
konstantin.grabar
31d9f54743
[refs #223 ] Move project version to right column
2012-04-17 13:37:09 +04:00
konstantin.grabar
1b871bf6dd
[refs #404 ] Remove downloads statistics functional
2012-04-17 12:23:58 +04:00
George Vinogradov
871c8ed1f4
[issue #347 ] Fixed bugs. Some changes.
2012-04-16 23:22:08 +04:00
Vladimir Sharshov
eb95492073
Merge pull request #402 from warpc/401-build_list_links_filter_on_home
...
[refs #401 ] Fix build lists link filter on home page
2012-04-16 10:08:11 -07:00
Vladimir Sharshov
07cc2db49e
Merge pull request #399 from warpc/194-assignee_and_user
...
[refs #194 ] Move user_id to assignee_id and creator_id to user_id, because user_id in project used only as author.
2012-04-16 09:39:23 -07:00
konstantin.grabar
d4aa61e81b
[refs #401 ] Fix build lists link filter on home page
2012-04-16 12:18:07 +04:00
Vladimir Sharshov
2c0f047b38
[Refs #223 ] Fix errors and tests
2012-04-14 00:49:29 +04:00
Alexander Machehin
2dedbd92d0
[refs #194 ] assignee & user
2012-04-14 01:44:04 +06:00
Alexander Machehin
ba9184cc49
Merge pull request #398 from warpc/223-build_list_notify_and_duration_updates
...
223 build list notify and duration updates
2012-04-13 11:43:57 -07:00
Alexander Machehin
42967381b6
[refs #223 ] some refactoring
2012-04-14 00:26:34 +06:00
Vladimir Sharshov
100a166699
[Refs #223 ] Refactoring for pull request
2012-04-13 17:24:43 +04:00
Pasha
d8edf8e673
Merge pull request #397 from warpc/223-change_build_lists_new_js_handlers
...
[refs #223 ] Add build list duration
2012-04-13 05:25:20 -07:00
Alexander Machehin
5cfadcd723
[refs #385 ] add dropdown menu to choose archive format
2012-04-13 17:24:24 +06: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
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
Alexander Machehin
b281cdf65b
[refs #385 ] changed archive
2012-04-12 17:27:15 +06:00
konstantin.grabar
742603ab7e
[refs #223 ] Add build list duration
2012-04-12 14:29:04 +04:00
Alexander Machehin
770030e180
[refs #385 ] zip archive
2012-04-12 00:29:08 +06:00
Vladimir Sharshov
d2612e63b6
Merge pull request #394 from warpc/353-fork_popup
...
[refs #353 ] always show fork popup and disabling fork button after click
2012-04-10 12:03:38 -07:00
Alexander Machehin
7a8de3e1f4
[refs #353 ] disabling fork button after click
2012-04-11 00:48:13 +06:00
Alexander Machehin
27f2be079d
[refs #353 ] always show fork popup
2012-04-11 00:05:06 +06:00
Pavel Chipiga
68b3446747
Fix password restore routes. Change input field type. Refs #263
2012-04-10 20:12:30 +03:00
Alexander Machehin
4ba17be536
[refs #223 ] fixed rendering fork button
2012-04-10 20:15:15 +06:00
konstantin.grabar
18bda07369
Merge master into 223-change_build_lists_new_js_handlers
2012-04-10 18:00:48 +04:00
konstantin.grabar
3cff036508
[refs #223 ] Add new build btn to project page
2012-04-10 17:07:09 +04:00
konstantin.grabar
207be85ff4
[refs #223 ] Add group select to versions
2012-04-10 16:03:33 +04:00
konstantin.grabar
d6dc51ba93
[refs #223 ] Choosen rep auto set
2012-04-10 13:05:42 +04:00
Vladimir Sharshov
6d4f94e2c4
Merge pull request #389 from warpc/353-fork
...
[Refs #353 ] can fork project to group
2012-04-09 12:46:15 -07:00
konstantin.grabar
5b884e9d40
[refs #223 ] Remove comment
2012-04-09 23:26:22 +04: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
George Vinogradov
71c8efabf9
[issue #347 ] Added backbone. Changed collaborators page.
2012-04-09 21:11:39 +04:00
konstantin.grabar
6ccf7e8456
[refs #223 ] Change js handlers and some inputs logics
2012-04-09 18:33:51 +04:00
Vladimir Sharshov
e491b8bfb4
Merge pull request #382 from warpc/358-git_help_info_div
...
[refs #358 ] Add git clone repo help hint
2012-04-05 13:23:13 -07:00
Alexander Machehin
96b3c831b7
[refs #358 ] br -> p
2012-04-06 02:21:19 +06:00
konstantin.grabar
39dd53ff9b
[refs #358 ] Add git clone repo help hint
2012-04-05 11:26:03 +04:00
Pavel Chipiga
20e5936d0c
Fix and refactor build lists, comments and other specs. Refactor comments controller, models and views. Code cleanup. Refs #263
2012-04-05 00:43:06 +03:00
Vladimir Sharshov
a6ec36086c
[Refs #263 ] Refactoring ProductBuildList. Add tests
2012-04-04 00:56:21 +04:00
Alexander Machehin
f4937559a6
Merge pull request #378 from warpc/263-product_refactoring
...
[Refs #263 ] Refactoring product. Add tests.
2012-04-03 06:56:46 -07:00
George Vinogradov
fe053537c3
[ fixed #377 ] Fixed Group.by_admin scope.
2012-04-03 17:08:22 +04:00
Vladimir Sharshov
d382732e68
[Refs #263 ] Refactoring product. Add tests.
2012-04-03 16:21:39 +04:00
Alexander Machehin
dfa538abef
Merge pull request #375 from warpc/263-repository_refactoring
...
[Refs #263 ] Refactoring repository. Add tests
2012-04-02 10:44:28 -07:00
Vladimir Sharshov
d31d0c9672
[Refs #263 ] Refactoring repository. Add tests
2012-04-02 19:43:59 +04:00
konstantin.grabar
b36e0c284f
[refs #130 ] Add ssl to html5 script into sessions layout
2012-04-02 15:26:00 +04:00
konstantin.grabar
23cdfa102c
[refs #130 ] Add ssl to jQuery and html5 scripts
2012-04-02 15:01:16 +04:00
Vladimir Sharshov
fef3affc07
[Refs #263 ] Refactoring platforms, add platform tests and software license, showing warning for errors in update project action
2012-04-01 19:19:54 +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
eb4679de0e
[issue #195 ] Fixed access string in repo block
2012-03-31 14:27:20 +04:00
Pavel Chipiga
36b2eaa784
Fix root page search field design. Allow aninymous search only projects. Fix activity_feeds routes. Show anonymous project build lists. Remove unused specs. Refs #349
2012-03-31 03:43:55 +03: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
c75f857014
Merge pull request #361 from warpc/340-titles
...
[Refs #340 ] Add title to all page in ABF
2012-03-30 11:44:09 -07: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
0f91e0e8a1
[refs #344 ] fixed ability and submenu
2012-03-30 23:23:46 +06:00
Alexander Machehin
a113efad3e
[refs #340 ] title -> set_meta_tags
2012-03-30 22:37:54 +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
Vladimir Sharshov
897c4b730b
Merge pull request #360 from warpc/195-new_design_for_projects
...
[Refs #195 ] Added legend for projects table. Added titles.
2012-03-30 09:20:22 -07:00
George Vinogradov
78943fdc04
[issue #195 ] Added legend for projects table. Added titles.
2012-03-30 18:51:57 +04:00
konstantin.grabar
d3c2bac226
[refs #344 ] Add product buils list filter and search
2012-03-30 15:26:28 +04:00
Pavel Chipiga
1f57d88957
Fix IE design. Refs #263
2012-03-30 01:52:34 +03: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
9a45353ccb
Merge pull request #342 from warpc/128-account-activation
...
[Refs #128 ] account activation
2012-03-29 09:09:03 -07:00
George Vinogradov
bac8f0a285
Revert "[issue #195 ] Removed leave button from groups projects."
...
This reverts commit 014fd706db9894f09cbffa8372009290324dbfe8.
2012-03-29 00:46:42 +04:00
George Vinogradov
869fa0da31
[issue #195 ] Removed leave button from groups projects.
2012-03-29 00:24:15 +04:00
konstantin.grabar
f912ff1fa0
[refs #128 ] Add multilanguage devise mails
2012-03-28 20:00:44 +04:00
konstantin.grabar
086d4fca67
[refs #344 ] Fix product name into table
2012-03-28 17:53:49 +04:00
konstantin.grabar
c6d30b7ff3
[refs #344 ] Add link to product into product build lists list
2012-03-28 17:51:04 +04:00
Alexander Machehin
69ccf18265
[refs #270 ] added statistics to admins menu
2012-03-28 19:19:42 +06:00
Pavel Chipiga
9ee350b007
Refactor search controllers and scopes. Add search query whitespace strip. Refs #263
2012-03-28 02:58:03 +03: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
385e35493f
[issue #279 ] Fixed bug with connection info.
2012-03-27 20:51:34 +04:00
George Vinogradov
9bb1d80172
[issue #195 ] Added AJAX to /projects list.
2012-03-27 19:50:00 +04:00
Vladimir Sharshov
993d480a13
Merge pull request #341 from warpc/270-admins-menu
...
[refs #270 ] added register requests page to admins menu
2012-03-27 06:01:56 -07:00
Alexander Machehin
6cac84e1bb
[refs #270 ] added register requests page to admins menu
2012-03-27 18:55:08 +06:00
konstantin.grabar
8b31c6373f
Merge branch 'master' into 128-account-activation
2012-03-27 13:46:21 +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
konstantin.grabar
ae0ca1ce99
[refs #128 ] Fix devise mails. Fix confirm ability
2012-03-26 18:33:02 +04:00
George Vinogradov
d03f364b18
Merge branch '195-new_design_for_projects' of github.com:warpc/rosa-build into 195-new_design_for_projects
2012-03-25 01:38:32 +04:00
George Vinogradov
dd8e3b0497
[issue #195 ] Added JQuery datatables to /projects
2012-03-25 01:36:56 +04:00
Pavel Chipiga
cacd9eb301
Improve add_branch task. Fix projects list JSON generation. Refs #207 , #279
2012-03-24 00:48:58 +02:00
Pavel Chipiga
1fab6c642e
Minor design fix for product build lists. Refs #223
2012-03-23 22:39:37 +02:00
Pavel Chipiga
d44de9f2bb
Redo projects list. Allow view projects through groups. Hide delete from project link from project owners. Refs #195
2012-03-23 22:37:17 +02: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
c2617bf1dd
[refs #195 ] fixed edit button
2012-03-24 01:13:52 +06:00
Alexander Machehin
35c466820e
[refs #195 ] add lock/unlock icon
2012-03-23 23:36:37 +06:00
Vladimir Sharshov
f085367659
Merge pull request #337 from warpc/193-wiki
...
[Refs #193 ] Restyle wiki
2012-03-23 08:59:17 -07:00
Alexander Machehin
6864f22b35
[refs #193 ] remove button style from delete page link
2012-03-23 21:56:21 +06:00
Alexander Machehin
86bd036418
[refs #193 ] changes in wiki
2012-03-23 21:36:47 +06:00
Vladimir Sharshov
116dbb4ad7
Merge pull request #335 from warpc/194-tracker
...
[Refs #194 ] change styles at issues list
2012-03-23 06:51:44 -07:00
Alexander Machehin
eb0545221c
[refs #194 ] change styles at issues list
2012-03-23 19:31:51 +06:00
Vladimir Sharshov
da5863ba0f
Merge pull request #334 from warpc/270-user_control
...
[Refs 270] Customize users admin menu
* moved Add button to sidebar;
* added translate to search label;
* changed translation to Admin.
2012-03-23 06:06:00 -07:00
Pavel Chipiga
861da824d0
Redirect to project build lists after build list creation. Add more columns for product build lists. Refs #223
2012-03-23 13:58:20 +02:00
Alexander Machehin
b08b1f7528
[refs #270 ] changed translation to Admin
2012-03-23 17:11:15 +06:00
Alexander Machehin
009f10acf5
[refs #270 ] added translate to search label
2012-03-23 16:51:18 +06:00
Alexander Machehin
8299ebc338
[refs #270 ] moved Add button to sidebar
2012-03-23 16:46:58 +06:00
Pavel Chipiga
7f31246463
Tune project specific build_lists page filters. Cleanup. Refs #223
2012-03-22 22:58:02 +02:00
Pavel Chipiga
4553affa56
Add missing magic_encodings. Fix blame commit select, hide blank blame. Fix git repo hooks - redo branch parse to support non-ascii branches. Refs #190 , #134
2012-03-22 19:11:12 +02:00
Vladimir Sharshov
f54ec81734
Merge pull request #333 from warpc/195-new_design_for_projects
...
[issue #195 ] Fixed <Tab> in edit blobs.
2012-03-22 09:38:27 -07:00
George Vinogradov
d3184b846b
[issue #195 ] Fixed <Tab> in edit blobs.
2012-03-22 20:16:07 +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
efd46249ed
[issue #195 ] Fixed merge artefact
2012-03-22 18:53:06 +04:00
Alexander Machehin
23eeb1cae7
[refs #270 ] changes in ban
2012-03-22 20:50:15 +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
71f1822fce
[refs #270 ] some refactoring
2012-03-22 17:17:11 +06:00
Alexander Machehin
b0eeb4f260
[refs #270 ] fix some errors
2012-03-22 14:48:33 +06:00
George Vinogradov
9e31ae75b1
[issue #195 ] Added groups support to project.
2012-03-22 04:44:05 +04:00
George Vinogradov
401e570dc7
[issue #195 ] Change projects/sidebar to be more standart.
2012-03-22 04:42:56 +04: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
Alexander Machehin
baf7fdac04
[refs #270 ] fix translation
2012-03-22 02:10:40 +06:00
Alexander Machehin
867d678dc4
[refs #270 ] some users tests
2012-03-22 02:05:27 +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
a562219706
[refs #270 ] some fixes when creating new user
2012-03-21 23:52:27 +06:00
Alexander Machehin
a6a5b722d2
[refs #270 ] use devise lockable to ban
2012-03-21 23:45:51 +06:00
Alexander Machehin
3c7dec3b97
Merge branch '3.2-master' into 270-user_control
2012-03-21 19:39:55 +06:00
Vladimir Sharshov
81d18b5337
Merge pull request #323 from warpc/200-new_build_repos_rules
...
[Refs #200 ] Move some fields to rights part of the form. Hide empty platform. Fix checkbox checking on build list form.
2012-03-21 05:17:23 -07:00
konstantin.grabar
e6622d29ea
[refs #200 ] Remove unused code
2012-03-21 15:53:54 +04:00
Vladimir Sharshov
2df89c6ae3
Merge branch '3.2-master' of github.com:warpc/rosa-build into 3.2-master
2012-03-21 14:50:38 +04:00
Vladimir Sharshov
375aa7e74e
Merge pull request #322 from warpc/265-activity_feed_messages
...
[refs #265 ] add ajax to older messages
2012-03-21 03:50:25 -07:00
Vladimir Sharshov
4393e8b30f
[Refs #263 ] Fix activity feed menu display
2012-03-21 14:48:06 +04:00
Alexander Machehin
b678320638
[refs #265 ] add ajax to older messages
2012-03-21 16:29:45 +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
7bf107f287
[Refs #263 ] Fix styles (layout and menu)
2012-03-21 03:11:58 +04: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
Vladimir Sharshov
eb4a18c0ff
Merge pull request #319 from warpc/279-new_design_for_platforms
...
[issue #279 ] Fixed bugs
2012-03-20 11:03:32 -07:00
George Vinogradov
f958c56a3e
[issue #279 ] Fixed typos
2012-03-20 21:44:56 +04:00
Vladimir Sharshov
047425a27f
Merge pull request #318 from warpc/279-new_design_for_platforms
...
[Refs #279 ] new design for platforms(add control for members, fix bugs)
2012-03-20 09:48:57 -07:00
George Vinogradov
77e8a4fe4b
[issue #279 ] Fixed "no method gsub for Nil class" bug
2012-03-20 20:29:05 +04:00
George Vinogradov
7c0585ee87
[issue #279 ] Added members and other changes.
2012-03-20 20:24:18 +04:00
konstantin.grabar
7f6f68872e
[refs #200 ] Move some fields to rights part of the form. Hide platforms with no repos
2012-03-20 19:45:01 +04:00
George Vinogradov
6886bf4e46
[issue #279 ] Fixed some bugs in views
2012-03-20 17:12:56 +04:00
Vladimir Sharshov
09fcc04489
Merge pull request #315 from warpc/200-new_build_repos_rules
...
[refs #200 ] Change build list repos and platforms interface
2012-03-20 06:02:49 -07:00
konstantin.grabar
31e0c9191c
[refs #200 ] Fix build list form interface and include_repos logic
2012-03-20 14:36:31 +04:00
konstantin.grabar
1d56dfad3d
[refs #200 ] Remove include repos block
2012-03-20 00:04:33 +04:00
konstantin.grabar
f0645be9c5
[refs #200 ] Change build list repos and platforms interface
2012-03-19 23:52:46 +04:00
Alexander Machehin
1066307fbb
[refs #270 ] created admins menu aside
2012-03-19 23:32:02 +06:00
Vladimir Sharshov
4ce3e5bf32
Merge pull request #310 from warpc/252-user_appeal
...
[refs #252 ] fixed appeal to user in email and in welcome message in activity feed
2012-03-19 09:07:21 -07:00
George Vinogradov
155a46cce9
[issue #279 ] Fixed some bugs in connection info.
2012-03-19 19:56:40 +04:00
Vladimir Sharshov
c932d14a24
Merge pull request #313 from warpc/279-new_design_for_platforms
...
[issue #279 ] Fixed some bugs in connection info
2012-03-19 08:43:23 -07:00
George Vinogradov
b6b1462de5
[issue #279 ] Fixed some bugs in connection info.
2012-03-19 19:37:08 +04:00
Vladimir Sharshov
d9cf26528b
Merge pull request #311 from warpc/279-new_design_for_platforms
...
[Refs #279 ] new design for platforms
* add connection info for personal platforms;
* fixed freezing in add/delete repo projects page;
* removed freeze & unfreeze actions from platform;
* fix permission and moved some buttons.
2012-03-19 08:20:43 -07:00
George Vinogradov
2c0ccb8489
[issue #279 ] Connection info for platform moved to partial
2012-03-19 19:16:35 +04:00
Vladimir Sharshov
fa6ecb1294
Merge pull request #312 from warpc/223-monitoring_design
...
[refs #223 ] Add link to project into submenu
2012-03-19 08:00:00 -07:00
konstantin.grabar
1a68a9145e
[refs #223 ] Add link to project into submenu
2012-03-19 18:58:13 +04:00
George Vinogradov
ddc95c25fb
[issue #279 ] Merge branch '3.2-master' into 279-new_design_for_platforms
...
Conflicts:
app/assets/stylesheets/design/custom.scss
2012-03-19 18:56:04 +04:00
George Vinogradov
1cbc3f5b7a
[issue #279 ] Added block of connection data for personal platform.
2012-03-19 18:46:12 +04:00
George Vinogradov
896301649e
[issue #279 ] Fixed json on repo page.
2012-03-19 18:45:40 +04:00
Alexander Machehin
d5dc05233f
[refs #252 ] fixed appeal to user
2012-03-19 20:34:57 +06:00
Alexander Machehin
c3bb559bfb
[refs #308 ] hide password & password confirmation
2012-03-19 19:47:57 +06:00
Alexander Machehin
0c1d57cd8c
[refs #279 ] can resize textarea in product edit page
2012-03-19 18:16:12 +06:00
Vladimir Sharshov
abe06b5068
Merge pull request #305 from warpc/223-monitoring_design
...
[Refs #223 ] monitoring design for current task
2012-03-19 03:28:30 -07:00
Alexander Machehin
5e08b89f6a
[refs #265 ] shoter commit hash in message
2012-03-19 15:23:59 +06:00
Alexander Machehin
296acd80da
[refs #265 ] added build waiting message
2012-03-19 15:07:09 +06:00
konstantin.grabar
348fd40daf
[refs #223 ] Fix build status color helpers
2012-03-19 12:39:46 +04:00
konstantin.grabar
b3d7091db0
Merge 3.2-master into 223-monitoring_design
2012-03-19 10:41:30 +04:00
konstantin.grabar
c8329d3783
[refs #223 ] Remove unnessecary things from build list page
2012-03-19 10:36:39 +04:00
konstantin.grabar
4b26eebeca
[refs #223 ] Add new design to build list task page
2012-03-18 12:20:31 +04:00
Alexander Machehin
86871ab32d
Merge branch '3.2-master' into 265-activity_feed_messages
...
Conflicts:
config/locales/menu.en.yml
config/locales/menu.ru.yml
2012-03-17 01:09:04 +06:00
Alexander Machehin
22d7f8d975
[refs #265 ] shit
2012-03-17 00:55:03 +06:00
Alexander Machehin
dd5f51de71
[refs #265 ] added build tasks feed
2012-03-16 21:37:58 +06: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
Vladimir Sharshov
42eb250942
Merge pull request #302 from warpc/279-new_design_for_platforms
...
[issue #279 ] Fixed some bugs:
* Redirect to repositroies page when remove repository.
* Fixed sorting background in Datatables styles.
* Fixed save button translation in platforms form.
* Fixed platform save & create flashes.
* Fixed cancel buttons in platform, product & repository forms.
* Redirect to created product on creation.
* Redirect to platform's products page after product destruction.
* Fixed permissions to Build button on product page.
* Fixed permissions to Add button on repository page.
* Fixed forbidden redirect when trying to acces
* RepositoriesController#projects_list by unprivilleged user.
2012-03-15 16:15:58 -07:00
George Vinogradov
cc68163238
[issue #279 ] Fixed some bugs:
...
* Redirect to repositroies page when remove repository.
* Fixed sorting background in Datatables styles.
* Fixed save button translation in platforms form.
* Fixed platform save & create flashes.
* Fixed cancel buttons in platform, product & repository forms.
* Redirect to created product on creation.
* Redirect to platform's products page after product destruction.
* Fixed permissions to Build button on product page.
* Fixed permissions to Add button on repository page.
* Fixed forbidden redirect when trying to acces
RepositoriesController#projects_list by unprivilleged user.
2012-03-16 02:56:12 +04:00
Vladimir Sharshov
e719633862
Merge pull request #300 from warpc/279-new_design_for_platforms
...
[Refs #279 ] new design for platforms (bugfixes, ACL and filters)
2012-03-15 14:50:37 -07:00
Alexander Machehin
4addff059b
[refs #265 ] added activity feed tabs
2012-03-15 23:52:54 +06:00
George Vinogradov
548550d355
[issue #279 ] Added filtering to repositories projects.
2012-03-15 17:53:36 +04:00
George Vinogradov
76af82805d
[issue #279 ] Fixes.
...
* Fixed permissions.
* Added pagination in repository view.
2012-03-15 04:07:53 +04:00
George Vinogradov
3c60347a23
[issue #279 ] Fixes.
...
* Almost finished permissions fixes
* Removed is_template from product
* Some fixes in crontab_generator partial
2012-03-15 03:34:09 +04:00
Vladimir Sharshov
8acb512a2e
Merge pull request #299 from warpc/279-new_design_for_platforms
...
[Refs #279 ] new design for platforms
2012-03-14 13:22:10 -07:00
Vladimir Sharshov
3761f0a7ff
Merge pull request #297 from warpc/194-issue_page
...
[refs #194 ] Fix ACL issue executor bug
2012-03-14 12:07:22 -07:00
Alexander Machehin
bce8618c30
[refs #194 ] removed reduntant check
2012-03-15 00:51:22 +06: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
Vladimir Sharshov
79e56eec52
Merge pull request #298 from warpc/265-activity_feed_messages
...
[Refs #265 ] Restyle comments and issues feeds messages, refactoring, fix bugs
2012-03-14 10:29:10 -07:00
Alexander Machehin
e30cc70728
[refs #265 ] some refactoring
2012-03-14 23:23:55 +06: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
Alexander Machehin
51e4cafe4c
Revert "[refs #194 ] fixed executor bug"
...
This reverts commit 9f5176fb9990e61e3ca7a14fe0a5346f042d36d6.
2012-03-14 23:18:37 +06:00
Alexander Machehin
6359acd917
[refs #194 ] fixed executor bug
2012-03-14 23:01:23 +06:00
Alexander Machehin
3642163fd7
[refs #265 ] changed feed messages
2012-03-14 23:00:26 +06:00
Alexander Machehin
f11fc179d3
[refs #194 ] fixed executor bug
2012-03-14 22:05:08 +06:00
Alexander Machehin
20079d4fc5
[refs #265 ] changed comments feed
2012-03-14 20:40:41 +06:00
Alexander Machehin
ffc1c6d0b7
[refs #265 ] fixed new issue feed
2012-03-14 20:33:51 +06:00
Vladimir Sharshov
9c429e893e
Merge pull request #294 from warpc/265-activity_feed_messages
...
[refs #265 ] changed activity feed messages; fixed avatar sizes; fixed message for deleted branch
2012-03-14 05:20:48 -07:00
Vladimir Sharshov
dc6e380647
Merge pull request #296 from warpc/194-issue_page
...
[refs #194 ] fixed remove executor from issue
2012-03-14 04:18:29 -07:00
Alexander Machehin
5ffd976086
[refs #194 ] fixed remove executor from issue
2012-03-14 16:39:59 +06:00
Alexander Machehin
1ff3cf5662
[refs #265 ] fixed message for deleted branch
2012-03-14 15:38:22 +06:00
Alexander Machehin
ba437f7703
[refs #265 ] changed activity feed messages
2012-03-14 00:47:37 +06:00
George Vinogradov
304141b1ba
[issue #279 ] Added views and removed datatables plugin
...
* Datatables plugin moved to lib.
* Added views to platform and repositories.
2012-03-13 19:12:06 +04:00
Vladimir Sharshov
b07d81644a
[Refs #223 ] Monitoring colors code in index page
2012-03-13 15:04:29 +04:00
Vladimir Sharshov
61b8c70f4b
[Refs #257 ] Fix edit profile labels
2012-03-12 22:13:10 +04: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
4fd91e2bfe
[refs #257 ] force convert avatar to jpg
2012-03-12 22:28:56 +06:00