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
|
839daefc41
|
[refs #128] Small refactor of users#update action
|
2012-03-28 18:01:25 +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 |
Pavel Chipiga
|
c9f4cf0ea4
|
Fix and refactor project membered abilities. Refs #195
|
2012-03-28 00:28:50 +03:00 |
George Vinogradov
|
2ba4a282cd
|
[issue #195] Global admin can change members in all projects
|
2012-03-28 00:16:33 +04: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 |
Vladimir Sharshov
|
7143c7a9bc
|
Merge pull request #343 from warpc/263-refactoring
[Refs #263] Fix comment tests; refactoring.
|
2012-03-27 10:13:04 -07:00 |
Vladimir Sharshov
|
1967e35f5f
|
Merge pull request #345 from warpc/279-new_design_for_platforms
[issue #279] Fixed bug with connection info if main platforms does not exist
|
2012-03-27 10:02:43 -07:00 |
George Vinogradov
|
385e35493f
|
[issue #279] Fixed bug with connection info.
|
2012-03-27 20:51:34 +04:00 |
Alexander Machehin
|
c2960b7083
|
[refs #263] fixed commentable accessibility
|
2012-03-27 22:45:07 +06:00 |
Pavel Chipiga
|
b12f120962
|
Strip whitespaces during search. Refs #255
|
2012-03-27 19:22:45 +03:00 |
George Vinogradov
|
9bb1d80172
|
[issue #195] Added AJAX to /projects list.
|
2012-03-27 19:50:00 +04:00 |
Alexander Machehin
|
3b57bb56bc
|
[refs #263] removed project_id from access lists
|
2012-03-27 21:11:52 +06:00 |
Alexander Machehin
|
a0b7f243d6
|
[refs #263] changed and fixed comment tests; some refactoring
|
2012-03-27 21:09:04 +06:00 |
konstantin.grabar
|
f33ef75666
|
[refs #128] Add email confirmation on email change. Remove email confirmation after registration.
|
2012-03-27 17:45:09 +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 |
George Vinogradov
|
a3aaf4f7ce
|
[issue #195] Fixed bug with line numbers in blob show.
|
2012-03-27 14:12:26 +04: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 |
konstantin.grabar
|
a3d334f0c2
|
[refs #128] Merge 3.2-master into 128-account-activation
|
2012-03-26 13:55:45 +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
|
4b96c988d4
|
Reduce build batch size. Refs #263
|
2012-03-24 02:09:49 +02:00 |
Pavel Chipiga
|
099ba2a3dd
|
Build platform for both arches. Refs #263
|
2012-03-24 01:53:07 +02:00 |
Vladimir Sharshov
|
9ced817560
|
[Refs #279] Temporary fix for mass rebuild
|
2012-03-24 03:30:12 +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 |
Vladimir Sharshov
|
6a8b8fec3a
|
[Refs #66] User builds more priority than mass rebuild with zero priority
|
2012-03-24 01:29:51 +04:00 |
Vladimir Sharshov
|
115c90f03b
|
Merge pull request #331 from warpc/263-refactoring
[Refs #263] Fix broken tests
|
2012-03-23 13:49:20 -07: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 |
Vladimir Sharshov
|
75ae7f2189
|
[Refs #263] Update css for new version
|
2012-03-22 20:33:43 +04:00 |
George Vinogradov
|
d3184b846b
|
[issue #195] Fixed <Tab> in edit blobs.
|
2012-03-22 20:16:07 +04:00 |
konstantin.grabar
|
16c9e6aa24
|
[refs #263] Fix most of the failed tests
|
2012-03-22 19:48:28 +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 |
Vladimir Sharshov
|
a85ce1d1f7
|
Merge pull request #332 from warpc/195-new_design_for_projects
[Refs #195] new design for projects (support group as collaborators)
|
2012-03-22 08:08:26 -07:00 |
Vladimir Sharshov
|
ad39598823
|
Merge pull request #328 from warpc/325-new_error_pages_design
[refs #325] Add new design for error pages
|
2012-03-22 08:06:28 -07: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 |
konstantin.grabar
|
385bd8034b
|
[refs #263] Fix projects#index
|
2012-03-22 17:30:01 +04:00 |
konstantin.grabar
|
f354c53709
|
[refs #263] Merge 3.2-master into 263-refactoring
|
2012-03-22 17:28:09 +04:00 |
konstantin.grabar
|
c6eb68e903
|
[refs #325] Fixes descripton styles for project page into main css
|
2012-03-22 16:31:39 +04:00 |
konstantin.grabar
|
b7defd90f1
|
[refs #263] Remove unnessacesary projecsts#show action and test for it
|
2012-03-22 16:16:11 +04:00 |
Alexander Machehin
|
fcc1fad0d1
|
[refs #270] fixed translations
|
2012-03-22 18:00:34 +06:00 |
Alexander Machehin
|
787eed92a3
|
[refs #270] removed ssh_key
|
2012-03-22 17:47:56 +06:00 |
Alexander Machehin
|
71f1822fce
|
[refs #270] some refactoring
|
2012-03-22 17:17:11 +06:00 |
konstantin.grabar
|
5b1db0e041
|
[refs #263] Fix broken projects#show test and action
|
2012-03-22 14:13:56 +04:00 |
Alexander Machehin
|
b0eeb4f260
|
[refs #270] fix some errors
|
2012-03-22 14:48:33 +06:00 |
konstantin.grabar
|
21c33b384b
|
[refs #325] Add new design to error pages
|
2012-03-22 11:16:56 +04: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
|
2db7726d55
|
Merge branch '3.2-master' into 190-encodings
Conflicts:
db/schema.rb
|
2012-03-22 00:13:18 +02:00 |
Vladimir Sharshov
|
2571a75a3f
|
Merge pull request #327 from warpc/195-new_design_for_projects
[Refs #195] Fixed avatar in commits & comments
|
2012-03-21 15:08:29 -07:00 |
George Vinogradov
|
65e4e0f748
|
[issue #195] use avatar_url_by_email instead of gravatar_url
|
2012-03-22 02:06:33 +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 |
George Vinogradov
|
b902d8effe
|
[issue #195] Fixed avatar in commits & comments
|
2012-03-22 01:51:39 +04: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 |
Vladimir Sharshov
|
87e1ee4700
|
Merge pull request #317 from warpc/232-groups_tests
[refs #232] Add groups tests and mass assignment protect
|
2012-03-21 12:06:00 -07:00 |
Alexander Machehin
|
bf1340939b
|
[refs #270] fixed users filtration
|
2012-03-22 00:02:58 +06: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 |
Vladimir Sharshov
|
ee867aa8d4
|
Merge pull request #324 from warpc/200-new_build_repos_rules
[refs #200] Fix chbx behaviour for repos and their platforms
|
2012-03-21 08:06:54 -07:00 |
konstantin.grabar
|
5abf64e353
|
[refs #200] Fix chbx behaviour for repos and their platforms
|
2012-03-21 19:04:01 +04:00 |
konstantin.grabar
|
72c02282aa
|
[refs #232] Add mass-assignment fixes. Add create and mass-assig tests.
|
2012-03-21 17:52:35 +04:00 |
Alexander Machehin
|
3c7dec3b97
|
Merge branch '3.2-master' into 270-user_control
|
2012-03-21 19:39:55 +06:00 |
Pavel Chipiga
|
8b252d8c14
|
Add and tune devise lockable strategy. Refs #270
|
2012-03-21 15:37:16 +02: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 |
konstantin.grabar
|
f9850c6885
|
[refs #200] Fix checkbox checking on build list form
|
2012-03-21 15:34:11 +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 |