Alexander Machehin
6706d27712
Merge pull request #393 from warpc/263-refactoring
...
Исправление восстановления пароля
2012-04-10 10:29:10 -07:00
Pavel Chipiga
68b3446747
Fix password restore routes. Change input field type. Refs #263
2012-04-10 20:12:30 +03:00
George Vinogradov
442b44a68e
[issue #347 ] Added not_member_of scope. Added ActsLikeMember module
2012-04-10 19:45:38 +04:00
Vladimir Sharshov
f0b9cabefa
[Refs #223 ] Change order for version select in build list creation page.
2012-04-10 19:45:18 +04: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
f7e09c993d
[refs #223 ] Optimise code by jQuery chains
2012-04-10 17:15: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
Alexander Machehin
38eb8aeee5
[refs #391 ] fixed bug when creation project
2012-04-10 15:40:38 +06: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
Pavel Chipiga
679765541e
Minor comments controller refactor. Refs #263
2012-04-05 20:21:25 +03:00
Pavel Chipiga
a9ecc683f2
Fix search bug. Write anonymous read specs for issues and search controllers. Refs #263
2012-04-05 20:11:02 +03:00
Pavel Chipiga
977ec8382c
Merge branch 'master' into 263-refactoring
2012-04-05 19:58:46 +03:00
Alexander Machehin
01976015a6
[refs #295 ] fix broken create/fork project
2012-04-05 22:52:21 +06:00
Vladimir Sharshov
4bb8a38fbb
Merge pull request #376 from warpc/263-dj
...
[Refs #295 ] Customized DJ jobs and workers:
* set priority to delayed jobs;
* 4 workers to dj;
* division init bare & fork.
2012-04-05 06:54:28 -07:00
Alexander Machehin
6d5cee2c04
[refs #383 ] added ability to destroy project
2012-04-05 17:36:53 +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
Alexander Machehin
302179eff8
[refs #295 ] set priority to delayed jobs
2012-04-04 18:13:10 +06: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
Vladimir Sharshov
1ef60a3f94
[Refs #263 ] Fix copy-past evil
2012-04-03 17:14:08 +04: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
1fb63cf1a7
[refs #263 ] division init bare & fork
2012-04-03 17:32:00 +06:00
Alexander Machehin
5a384c6846
[refs #263 ] added dj queues
2012-04-03 01:29:06 +06:00
Alexander Machehin
d06e452935
[refs #263 ] fixed feed with no repo
2012-04-03 01:27:36 +06: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
431ed14e83
Fix "NameError: undefined local variable or method `platform' for ProductBuildList"
2012-04-02 21:39:43 +04: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
Vladimir Sharshov
0c2850b455
[Refs #367 ] Fix hardcoded protocol for git repo urls
2012-03-31 20:36:32 +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
265090a172
Merge branch 'master' into 349-anonymous_access
...
Conflicts:
db/schema.rb
2012-03-31 02:41:25 +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
George Vinogradov
7234cb7f99
[issue #195 ] Changed scopes.
2012-03-31 03:13:09 +04:00
George Vinogradov
0c09568d74
[issue #195 ] Merge branch 'master' into 195-new_design_for_projects
...
Conflicts:
app/models/group.rb
app/models/user.rb
2012-03-31 02:48:44 +04:00
George Vinogradov
71c1a4afcf
[issue #195 ] Owner removed from list of collaborators when editing list
2012-03-31 02:45:05 +04: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
4dd97d8c63
[Refs #263 ] Remove xml-rpc gem, clear CanCan abilities and tests
2012-03-30 00:24:45 +04:00
Vladimir Sharshov
34011513b5
[Refs #263 ] Remove old xml-rpc API
2012-03-29 23:19:00 +04:00
Vladimir Sharshov
39c5da2445
[Refs #263 ] Remove EasyUrpmi support
2012-03-29 23:07:38 +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
66c285c796
[Refs #263 ] Delete AutoBuildList
2012-03-29 22:22:48 +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
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
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
d2da4fc0ba
[Refs #263 ] Fix css
2012-03-21 02:53:56 +04:00
Vladimir Sharshov
ba140c67f9
[Refs #263 ] Align the menu, change colors for text and background
2012-03-21 02:47:51 +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
Vladimir Sharshov
347b5283b0
Merge pull request #320 from warpc/279-new_design_for_platforms
...
[issue #279 ] Disable members for personal platforms
2012-03-20 11:49:21 -07:00
George Vinogradov
cd42c912d8
[issue #279 ] Fixed permissions for personal platforms.
2012-03-20 22:41:14 +04: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
981ea7d69f
[refs #200 ] Remove debug code from build_lists controller
2012-03-20 17:01:18 +04:00
Vladimir Sharshov
d3c3726a84
[Refs #66 ] Add priority in build list
2012-03-20 14:56:51 +04:00
konstantin.grabar
31e0c9191c
[refs #200 ] Fix build list form interface and include_repos logic
2012-03-20 14:36:31 +04:00
Vladimir Sharshov
56f1d06da8
[Refs #66 ] Add priority to build list
2012-03-20 14:08:24 +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
George Vinogradov
d5d2b7229b
[issue #279 ] Removed freeze & unfreeze actions from Platform
2012-03-19 19:03:09 +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
Alexander Machehin
9b2dc6538d
[refs #252 ] new user notifications
2012-03-19 20:45:47 +06: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
30038f4c9c
[refs #265 ] show 10 symbols of the commit hash
2012-03-19 15:58:30 +06: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
fb89eedca3
[refs #265 ] forgot build list setup
2012-03-17 00:58:41 +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
George Vinogradov
9911d9f25e
[issue #279 ] Removed can_clone? and can_build? from Product
2012-03-16 01:10:24 +04:00
Alexander Machehin
3719b40889
[refs #265 ] removed unused code
2012-03-16 00:22:56 +06:00
Alexander Machehin
4addff059b
[refs #265 ] added activity feed tabs
2012-03-15 23:52:54 +06:00
Vladimir Sharshov
09dcb43da8
Merge pull request #301 from warpc/265-activity_feed_messages
...
[refs #265 ] Fixed check rails env
2012-03-15 07:08:23 -07:00
Vladimir Sharshov
7bab315b96
[Refs #279 ] Fix url and submit button size
2012-03-15 18:02:10 +04:00
George Vinogradov
548550d355
[issue #279 ] Added filtering to repositories projects.
2012-03-15 17:53:36 +04:00
Alexander Machehin
e7ac387466
[refs #265 ] fixed check rails env
2012-03-15 18:10:10 +06: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
Alexander Machehin
d9c3f9ddc8
[refs #265 ] fixed comment to commit feed
2012-03-14 20:33:16 +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
4b8e9682b5
[refs #194 ] some refactor
2012-03-14 16:53:23 +06: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
Vladimir Sharshov
9f9eb23e43
Merge pull request #293 from warpc/265-new_design_for_activity_feed
...
[Refs #265 ] Fix subscribe dublicates
2012-03-13 13:48:32 -07:00
Alexander Machehin
b93032e226
[refs #265 ] fixed avatar sizes
2012-03-14 00:53:37 +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
George Vinogradov
952c9e46ea
[issue #279 ] Added datatables pagination extension
2012-03-13 18:36:42 +04:00
Alexander Machehin
5b932879e2
[refs #265 ] fixed subscribe dublicates
2012-03-13 19:56:58 +06:00
Vladimir Sharshov
2153f66ab1
Merge branch '3.2-master' of github.com:warpc/rosa-build into 3.2-master
2012-03-13 15:05:09 +04:00
Vladimir Sharshov
b07d81644a
[Refs #223 ] Monitoring colors code in index page
2012-03-13 15:04:29 +04:00
Pavel Chipiga
51e2584995
Fix abilities for invites. Refs #174
2012-03-12 23:24:05 +02: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
843d95b64e
[refs #257 ] fixed 'big' geometry
2012-03-12 23:02:02 +06:00
Alexander Machehin
4fd91e2bfe
[refs #257 ] force convert avatar to jpg
2012-03-12 22:28:56 +06:00
Alexander Machehin
24639b8684
[refs 257] renamed to profile
2012-03-12 21:03:25 +06:00
Alexander Machehin
fc465a4647
[refs #195 ] onfocus -> onclick
2012-03-12 20:46:11 +06:00
Vladimir Sharshov
19bcdf94d9
[Refs #195 ] More space for project url
2012-03-12 18:31:25 +04:00
Alexander Machehin
5f6ca140d9
[refs #257 ] add ability to destroy avatar
2012-03-12 18:51:07 +06:00
Vladimir Sharshov
64926498d6
[Refs #195 ] Fix pagination for index projects page
2012-03-12 16:05:19 +04:00
Pavel Chipiga
bb7cff5de8
Fix abilities - allow users search build_lists. Refs #223
2012-03-12 13:46:57 +02:00
Alexander Machehin
26e80af8cb
[refs #195 ] one click select
2012-03-12 16:13:34 +06:00
Vladimir Sharshov
04622790fc
Merge pull request #289 from warpc/265-new_design_for_activity_feed
...
[refs #265 ] Work today builds statistics
2012-03-12 02:15:26 -07:00
Alexander Machehin
ecfb4f81a0
[refs #265 ] fixed today builds
2012-03-12 14:52:38 +06:00
George Vinogradov
c2dc8d9e38
[issue #279 ] Added platform products list
2012-03-12 04:07:18 +04:00
George Vinogradov
61bd704cb1
[issue #279 ] Added platform repositories list.
2012-03-12 03:58:25 +04:00
George Vinogradov
535c075d3e
[issue #279 ] Added platform main page, menu & sidebar
2012-03-12 03:08:50 +04:00
Pavel Chipiga
3e344f90ad
Display only 10 last activities. Refs #265
2012-03-12 00:47:22 +02:00
Pavel Chipiga
a78b7b4155
Merge branch 'master' into 3.2-master
2012-03-11 23:39:11 +02:00
George Vinogradov
19a962560a
[issue #279 ] Merge branch '3.2-master' into 279-new_design_for_platforms
...
Conflicts:
app/assets/stylesheets/design/custom.scss
2012-03-12 01:38:20 +04:00
Vladimir Sharshov
b99be18466
Merge pull request #287 from warpc/265-new_design_for_activity_feed
...
[Refs #265 ] fixed multiple "All my projects" and last project size
2012-03-11 13:08:52 -07:00
Alexander Machehin
9c6ba7a584
[refs #265 ] fixed last project size
2012-03-12 02:04:49 +06:00
Alexander Machehin
de61bc8cee
[refs #265 ] fixed multiple "All my projects"
2012-03-12 02:00:54 +06:00
Vladimir Sharshov
a26aa9b919
Merge pull request #286 from warpc/265-new_design_for_activity_feed
...
[refs #265 ] fixed double wiki feed
2012-03-11 11:39:33 -07:00
Alexander Machehin
c4fd73b52b
[refs #265 ] fixed double wiki feed
2012-03-12 00:28:14 +06:00
Vladimir Sharshov
6f56a7787d
Merge pull request #267 from warpc/265-new_design_for_activity_feed
...
[Refs #265 ] Add first version of new design to activity feed
2012-03-11 10:33:47 -07:00
Alexander Machehin
35d1323549
[refs #265 ] fixed message format
2012-03-11 23:30:14 +06:00
Vladimir Sharshov
d86653e172
Split code and tracker options in notification center
2012-03-11 21:21:31 +04:00
Alexander Machehin
6a7d9636f5
[refs #265 ] fixed user avatars
2012-03-11 23:06:41 +06:00
Alexander Machehin
6d5120e5cc
Merge branch '3.2-master' into 265-new_design_for_activity_feed
2012-03-11 22:44:25 +06:00
Alexander Machehin
37f4676bfb
[refs #265 ] fuuu fix logo
2012-03-11 22:40:09 +06:00
Vladimir Sharshov
11434ff423
[Refs #285 ] Fix css style, rename button
2012-03-11 20:38:28 +04:00
Vladimir Sharshov
877d82aa06
Merge branch '3.2-master' of github.com:warpc/rosa-build into 3.2-master
2012-03-11 20:02:35 +04:00
Vladimir Sharshov
e2b3eb7b7f
[Refs #285 ] Fix current_user avatar for all user, replace button Edit
2012-03-11 20:02:07 +04:00
Alexander Machehin
849cbce913
[refs #265 ] add link to root
2012-03-11 21:30:45 +06:00
Alexander Machehin
66b57f7a0a
[refs #265 ] fixed issue assignee
2012-03-11 17:56:56 +06:00
Alexander Machehin
cc6390f3a1
[refs #265 ] fixed partial name
2012-03-11 16:18:11 +06:00
Pavel Chipiga
1cf2660cda
Fix search order. Refs #255
2012-03-08 02:32:12 +02:00
Pavel Chipiga
41ae79eb46
Add configurable arch parameter to project build_for method. Write rake task for projects build. Refs #282
2012-03-08 01:25:17 +02:00
Pavel Chipiga
41cd1ddaf3
Redo cusel assign to avoid side effects. Refactor and cleanup projects controller, routes, views. Apply new design and functionality for projcts list page. Add fork button and fix fork. Apply gap repo during repo fork. Apply attr_accessible for projects. Cleanup locales. Fix new_build link ability check. Refs #195
2012-03-07 23:34:49 +02:00
Vladimir Sharshov
e49551756c
Merge pull request #276 from warpc/194-issue_page
...
[Refs #194 ] Fix for manage labels and executor
2012-03-07 11:26:11 -08:00
Vladimir Sharshov
57c4c7032b
Merge pull request #280 from warpc/257-new_design_for_profiles
...
[refs #257 ] fix user update registration page
2012-03-07 11:07:36 -08:00
George Vinogradov
9c78a917a1
[issue #279 ] Added platforms page.
2012-03-07 22:59:37 +04:00
Alexander Machehin
de62aaad53
[refs #257 ] fix user update registration page
2012-03-08 00:47:19 +06:00
Alexander Machehin
185962890f
[refs #194 ] issue executor
2012-03-07 22:27:12 +06:00
Alexander Machehin
8df4fdfa5c
[refs #194 ] remove labels search from js
2012-03-07 22:26:43 +06:00
Alexander Machehin
b70e8db695
[refs #194 ] fix selected labels in the index page
2012-03-07 22:04:37 +06:00
Alexander Machehin
db8e1881ba
[refs #195 ] change repo url to readonly
2012-03-07 20:56:25 +06:00
Vladimir Sharshov
1cb109119d
Merge pull request #277 from warpc/274-file_detection_fixes
...
[Refs #274 ] file detection fixes
2012-03-07 06:53:16 -08:00
George Vinogradov
464de82c68
[issue #274 ] Added some MIME types. Changed MIME ordering.
2012-03-07 17:36:39 +04:00
Alexander Machehin
c657efc338
[refs #194 ] show all project labels without searching
2012-03-07 19:36:17 +06:00
Alexander Machehin
324a407161
[refs #223 ] move New build button to sidebar
2012-03-07 17:12:00 +06:00
Alexander Machehin
9a6beef2da
[refs #194 ] fix issue managing labels
2012-03-07 16:50:45 +06:00
Alexander Machehin
4b173932e5
[refs #194 ] fix managing issue executor
2012-03-07 16:44:42 +06:00
Alexander Machehin
82d26b08b9
[refs #223 ] fix selector
2012-03-07 16:27:29 +06:00
Alexander Machehin
7fbee6e90e
[refs #194 ] fix user avatar
2012-03-07 14:31:55 +06:00
George Vinogradov
d6d8410b0f
[issue #274 ] Fixed file detection.
...
TODO.
1. Change MIME in editor
2. Change MIME sorting
2012-03-07 05:20:35 +04:00
Alexander Machehin
7588a318da
Merge branch '3.2-master' into 265-new_design_for_activity_feed
...
Conflicts:
app/models/user.rb
2012-03-07 03:58:35 +06:00
Alexander Machehin
13ba125dc0
[refs #265 ] add project_id to comment & fix email notification
2012-03-07 03:49:29 +06:00
George Vinogradov
396540ffe3
[issue #193 ] Updated
2012-03-07 00:54:02 +04:00
George Vinogradov
0289f7cc3e
[issue #193 ] Fixed wiki history table.
2012-03-07 00:53:09 +04:00
Alexander Machehin
0f823bd9f3
[refs #265 ] fix security & commit to comments
2012-03-07 02:51:51 +06:00
Pavel Chipiga
e3f0b2fce2
Fix gravatar url
2012-03-06 22:16:31 +02:00
Alexander Machehin
4b9d0616d6
Merge branch '3.2-master' into 194-issue_page
...
Conflicts:
app/views/issues/_create_sidebar.html.haml
2012-03-07 01:19:34 +06:00
Pavel Chipiga
7308c4a0d2
Merge branch '3.2-master' into 255-search
...
Refactor avatars. Fix user bugs. Remove ssh_key delete migration
Conflicts:
app/assets/stylesheets/design/custom.scss
app/models/user.rb
2012-03-06 20:59:29 +02:00
Alexander Machehin
872132d8a6
[refs #265 ] fix find owner and project
2012-03-07 00:20:14 +06:00
Alexander Machehin
8ae7ebee2b
Merge branch '3.2-master' into 194-issue_page
2012-03-06 22:51:13 +06:00
Alexander Machehin
1791160b09
[refs #194 ] fix manage issue executor
2012-03-06 22:31:07 +06:00
konstantin.grabar
9565d58e8f
[refs #257 ] Merge 3.2-master into 257-new_design_for_profiles
2012-03-06 20:13:53 +04:00
Pavel Chipiga
d6f9b2c3e9
Minor gems update. Apply search design and controller. Add and refactor search scopes. Fix relations. Separate and refactor search translations. Refactor search form. Refs #255
2012-03-06 17:53:04 +02:00
Alexander Machehin
b9de81f4df
[refs #194 ] managing labels in the issue
2012-03-06 21:21:13 +06:00
konstantin.grabar
7e53a6c511
[refs #265 ] Fix git push and delete branch partials and logic
2012-03-06 18:57:05 +04:00
konstantin.grabar
f54d889f74
[refs #265 ] Fix activity partials messages and locales. Fix observer.
2012-03-06 18:04:05 +04:00
George Vinogradov
f070a9d729
[issue #193 ] Merge branch '3.2-master' into 193-new_design_for_wiki
...
Conflicts:
app/assets/stylesheets/custom.scss
2012-03-06 17:40:44 +04:00
George Vinogradov
2b1b5504cd
[issue #193 ] Added fullname to history table.
2012-03-06 17:20:30 +04:00
George Vinogradov
cd57da0946
[issue #193 ] Fixed searchbar in wiki.
2012-03-06 17:08:19 +04:00
Alexander Machehin
af69c02a6d
[refs #194 ] render user name
2012-03-06 18:29:42 +06:00
konstantin.grabar
de6490346b
[refs #257 ] Change error messages logic. Fix avatar ru translation
2012-03-06 15:24:42 +04:00
Alexander Machehin
4f995ca548
[refs #265 ] hook mode 775 -> 755
2012-03-06 15:39:23 +06:00
Alexander Machehin
de0f7c83c8
[refs #265 ] fix hook and add execute bit for it
2012-03-06 15:07:14 +06:00
Alexander Machehin
9e6d06f1c9
[refs #194 ] manage issue executer
2012-03-06 00:28:55 +06:00
Alexander Machehin
325497d040
Merge branch '3.2-master' into 194-issue_page
2012-03-06 00:11:32 +06:00
konstantin.grabar
637edabb4c
[refs #257 ] Fix some locales and headers
2012-03-05 22:00:44 +04:00
Vladimir Sharshov
9d8eb8a3f2
Merge pull request #269 from warpc/195-new_design_for_projects
...
[Refs #195 ] Add blane functions. Fixed syntax highlighting. Stub for rpm-specs.
2012-03-05 09:07:36 -08:00
konstantin.grabar
9558a1d65f
[refs #265 ] Fix wiki history link
2012-03-05 20:36:58 +04:00
George Vinogradov
8845ec17ff
[issue #195 ] Added translations.
2012-03-05 20:31:09 +04:00
Vladimir Sharshov
91ba8b1543
[Refs #257 ] Fix password change, refactoring.
2012-03-05 19:36:23 +04:00
George Vinogradov
93e2caccc8
[issue #195 ] Added blame view.
2012-03-05 19:29:05 +04:00
George Vinogradov
5290f0c712
[issue #195 ] Fixed syntax highlighting. Stub for rpm-specs
2012-03-05 19:27:16 +04:00
Alexander Machehin
e5d5ef11e3
[refs #194 ] fix submenu highlight
2012-03-05 20:00:49 +06:00
Alexander Machehin
695bacd4d2
[refs #194 ] fix rendering 'New issue' label
2012-03-05 19:57:01 +06:00
Alexander Machehin
c76a3e148f
[refs #194 ] more obvious name to partial
2012-03-05 19:55:15 +06:00
Alexander Machehin
dab45f9afe
[refs #228 ] fix checking remember me button
2012-03-05 16:49:31 +06:00
konstantin.grabar
73296059eb
[refs #257 ] Merge 3.2-master into 257-new_design_for_profiles
2012-03-05 13:42:39 +04:00
konstantin.grabar
c176304088
Add first version of new design to activity feed. Add new scope to BuildList model. Fix one moment into observer.
2012-03-05 13:11:50 +04:00
konstantin.grabar
9b68752ffd
[refs #257 ] Change avatar helper and logic. Add paperclip avatar to users
2012-03-03 22:05:02 +04:00
konstantin.grabar
f58e24b134
[refs #257 ] User edit pages fixes
2012-03-03 20:03:23 +04:00
konstantin.grabar
ecff8d2d41
[refs #257 ] Add new design to notifier settings. Fix sidebar. Add edit btn to user profile
2012-03-03 13:23:30 +04:00
konstantin.grabar
0dc22bae82
[refs #257 ] Add new design for users edit and private settings edit. Add new fields and action.
2012-03-03 12:01:32 +04:00
Pavel Chipiga
ce633f5838
Fix group owner. Refs #232
2012-03-03 03:34:24 +02:00
Pavel Chipiga
a0f0c24f88
Fix flash messages. Add styles. Refs #263
2012-03-03 03:05:19 +02:00
Pavel Chipiga
13f0d8223d
Remove compass-bootstrap. Take back DJ fix. Refs #263
2012-03-03 02:42:10 +02:00
Pavel Chipiga
159fbe65dc
Re-add compass. Add flash messages design. Refactor and fix bugs after merge. Remove duplicates, sync and separate locales . Fix some specs. Refs #263
2012-03-03 02:28:27 +02:00
George Vinogradov
ea0ecffd23
Merge branch '3.2-master' of github.com:warpc/rosa-build into 3.2-master
2012-03-03 04:27:07 +04:00
George Vinogradov
7e5e3ca609
[issue #195 ] Fixed another creating bug...
...
I feel like a slipper-man...
2012-03-03 04:24:57 +04:00
Pavel Chipiga
a831a4aa63
Merge branch '3.2-master' of github.com:warpc/rosa-build into 3.2-master
2012-03-03 01:43:14 +02:00
Pavel Chipiga
56a12dc9ea
Merge branch 'master' into 3.2-master
...
Conflicts:
app/models/comment.rb
app/models/issue.rb
config/locales/en.yml
2012-03-03 01:38:43 +02:00
George Vinogradov
9ee3942702
[issue #195 ] Fixed bug with project creating
2012-03-03 03:25:20 +04:00
Vladimir Sharshov
622d80c6d3
Merge pull request #261 from warpc/194-tracker
...
[Refs #194 ] Fix ACL and tests for issues
2012-03-02 11:48:10 -08:00
Alexander Machehin
7cd3e40efc
[refs #194 ] fix accessible list
2012-03-03 01:23:45 +06:00
Vladimir Sharshov
403a8a19ce
Merge pull request #262 from warpc/194-nice_radio_change
...
[Refs #194 ] Fix triggering change event for niceRadio buttons
2012-03-02 10:27:27 -08:00
Alexander Machehin
319fcdad86
[refs #194 ] refactoring
2012-03-03 00:21:46 +06:00
Alexander Machehin
dfa361f5c3
[refs #194 ] fix triggering change event for niceRadio buttons
2012-03-02 23:45:20 +06:00
Alexander Machehin
c7b412c0e0
[refs #194 ] some refactoring
2012-03-02 23:38:00 +06:00
George Vinogradov
6522650c5a
[issue #195 ] Merge branch '3.2-master' into 195-new_design_for_projects
...
Conflicts:
app/views/git/blobs/_show.html.haml
2012-03-02 20:58:28 +04:00
Alexander Machehin
41c0d1e856
[refs #194 ] fix security and tests
2012-03-02 22:52:15 +06:00
George Vinogradov
b3750f8644
[issue #195 ] Fixed branch selector.
2012-03-02 20:48:19 +04:00
George Vinogradov
7b37846a54
[issue #195 ] Fixed line numbering with files contains <>
2012-03-02 19:50:17 +04:00
Alexander Machehin
50fc094bce
[refs #228 ] fuuuuu...
2012-03-02 21:32:00 +06:00
Vladimir Sharshov
6bb3d36c81
Merge pull request #258 from warpc/230-error_messages
...
[refs #230 ] Fix error messages + some refactoring
2012-03-02 04:55:55 -08:00
Alexander Machehin
7164dd580e
[refs #230 ] fix error messages + some refactoring
2012-03-02 18:27:38 +06:00
konstantin.grabar
e147c2d6c5
[refs #257 ] Add new design for user public page. New field. Move locales to another file
2012-03-02 16:14:59 +04:00
konstantin.grabar
8677fa7493
[refs #232 ] Remove name field
2012-03-02 14:39:48 +04:00
konstantin.grabar
3369953b4c
[refs #232 ] Remove unused commented code from groups controller
2012-03-02 13:46:16 +04:00
konstantin.grabar
1700588b97
[refs #232 ] Merge 3.2-master into 232-new_groups_design
2012-03-02 13:44:54 +04:00
konstantin.grabar
d376b55a57
[refs #232 ] Move groups locales to another files. Remove unsused commented code. On small sidebar fix
2012-03-02 12:47:16 +04:00
George Vinogradov
4218006f47
[issue #195 ] Returned code highlighting.
2012-03-02 05:10:39 +04:00
George Vinogradov
6cfb5d0c3d
[issue #195 ] Fixed bug with encodings. Added avatar. Stubbed blame.
2012-03-02 04:39:43 +04:00
Pavel Chipiga
e66f0110fc
Merge branch '3.2-master' into 195-new_design_for_projects
...
Conflicts:
app/assets/javascripts/extra/syntax.highlighter-init.js
app/assets/stylesheets/design/common.scss
vendor/assets/stylesheets/vendor.scss
2012-03-02 02:12:11 +02:00
George Vinogradov
900c1fe2f5
[issue #195 ] Fixes.
...
* Fixed translations
* Fixed blob display
* Fixed routes
2012-03-02 02:07:04 +02:00
Pavel Chipiga
accf38a088
Fix build_list display width. Refs #223
2012-03-02 02:04:07 +02:00
Pavel Chipiga
b1ea9fe57f
Upgrade gems. Hide uncancelable and unpublishable lins. Add duplicate build_list search link. Fix build_list display. Refs #223
2012-03-02 02:04:07 +02:00
Alexander Machehin
cea7bc79bb
[refs #194 ] fix notification line style
2012-03-02 02:04:06 +02:00
Alexander Machehin
f79c8d6f16
[refs #230 ] shorter error messages
2012-03-02 02:04:06 +02:00
Alexander Machehin
d7dbe79357
[refs #230 ] edit password page
2012-03-02 02:04:06 +02:00
Alexander Machehin
de177f1d03
[refs #194 ] add space between list and create form
2012-03-02 02:04:05 +02:00