61a27bbb7d
Revert "[refs #90 ] more security"
...
This reverts commit 09d9cdcb4a54082a31a5d04e972609e434ad41ec.
2012-04-20 21:17:43 +06:00
24922cc43c
Merge pull request #388 from warpc/347-javascript_refactoring
...
[issue #347 ] Union users and groups into one table in collaborators page. Use backbone(JS framework) for it. Improve UI for collaborators page (AJAX).
2012-04-20 08:15:12 -07:00
aa83c14165
[refs #90 ] more security
2012-04-20 17:38:19 +06:00
678f7cc0ed
[issue #347 ] Changed search field.
2012-04-20 00:35:31 +04:00
701da7e1f9
Disable bluepill. Update gems. Github project style URLs. Fix project load. Fix abilities. Fic urls generation. Fix some specs. Refs #263
2012-04-19 22:45:50 +03:00
b1365fc567
[refs #90 ] some tests and questions
2012-04-20 01:09:00 +06:00
5efabc9d4e
Fix atom feed urls. Refs #396
2012-04-19 20:35:35 +03:00
c66931d347
[refs #90 ] fixing pull methods
2012-04-19 21:57:42 +06:00
d48a3413cc
[refs #90 ] initial
2012-04-19 21:57:41 +06:00
510b0c0c50
[issue #347 ] Merge branch 'master' into 347-javascript_refactoring
...
Conflicts:
app/assets/stylesheets/design/custom.scss
app/models/group.rb
app/models/user.rb
2012-04-19 19:32:11 +04:00
f9d2baef5a
[issue #347 ] Added filter.
2012-04-19 19:27:16 +04:00
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
714fe34883
[refs #396 ] Hide atom feed link from anonymus users
2012-04-19 18:37:20 +04:00
5b5aec490a
Merge pull request #409 from warpc/396-rss_atom_feed
...
[refs #396 ] Add atom feed for activity feed
2012-04-19 07:08:59 -07:00
be3daca1e6
[refs #396 ] Fix atom feed link tag
2012-04-19 18:06:54 +04:00
799ba33766
[refs #396 ] Add token to atom feed link tag
2012-04-19 17:57:22 +04:00
2fc4e2db61
[refs #396 ] Fix token migration. Fix atom link tag title
2012-04-19 14:50:43 +04:00
0324ead59b
Merge pull request #412 from warpc/408-frozen_platform
...
[issue #408 ] Fixed bug with selectbox
2012-04-18 10:39:59 -07:00
618d1ecb49
[issue #408 ] Fixed bug with selectbox
2012-04-18 21:31:11 +04:00
cd153375dd
[refs #396 ] Devise token auth update for atom feed. Some atom feed fixes.
2012-04-18 19:15:04 +04:00
3d1cb4bfee
Merge master into 396-rss_atom_feed
2012-04-18 16:53:53 +04:00
8ef020427d
[refs #396 ] Add token auth for atom feed
2012-04-18 16:46:09 +04:00
9566855110
[issue #347 ] Added missed lib
2012-04-18 16:17:11 +04:00
3e4eba7f9d
Merge pull request #411 from warpc/408-frozen_platform
...
[issue #408 ] Allow publish build list in released platform only for platform members. Add rejected function for bs.
2012-04-18 04:17:32 -07:00
9d96b2b565
[issue #408 ] Removed comment.
2012-04-18 14:46:34 +04:00
6c64125787
[issue #408 ] Changed behavior of build list for released platform
2012-04-17 22:18:39 +04:00
8d723ee0be
[refs #396 ] Fix title truncate and strip. Add feed main title.
2012-04-17 19:38:02 +04:00
2dafd49763
[refs #396 ] Add atom feed
2012-04-17 19:01:35 +04:00
644b95d5bd
Fuuu!
...
Revert "[refs #385 ] removed dublicate ability"
This reverts commit 72de5731722f0a5b7110983ecb97cba1beda3056.
2012-04-17 19:52:52 +06:00
8204196275
[issue #347 ] Removed comments. Added filter field to collaborators
...
table.
2012-04-17 17:39:14 +04:00
f31b243ae9
[refs #385 ] zip image
2012-04-17 18:06:04 +06:00
05ec6cbac3
[refs #385 ] removed dublicate ability
2012-04-17 16:21:45 +06:00
2716c19635
[refs #385 ] add anonymous access to project archive
2012-04-17 16:18:03 +06:00
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
31d9f54743
[refs #223 ] Move project version to right column
2012-04-17 13:37:09 +04:00
1b871bf6dd
[refs #404 ] Remove downloads statistics functional
2012-04-17 12:23:58 +04:00
871c8ed1f4
[issue #347 ] Fixed bugs. Some changes.
2012-04-16 23:22:08 +04:00
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
c339f2aee0
Merge pull request #403 from warpc/223-change_build_lists_new_js_handlers
...
[refs #223 ] Add platform branch auto select if this branch exist
2012-04-16 10:00:53 -07:00
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
d24422f757
[refs #223 ] Add branch auto select
2012-04-16 20:06:34 +04:00
d4aa61e81b
[refs #401 ] Fix build lists link filter on home page
2012-04-16 12:18:07 +04:00
40090f0903
[Refs #223 ] Fix human_average_build_time (wrong time)
2012-04-14 20:10:18 +04:00
afd82ab4ec
[Refs #223 ] Mass rebuild method now connect project platform repository and main if main exist.
2012-04-14 17:46:39 +04:00
c1ddc2204f
Fix scopes. Refs #223
2012-04-14 01:27:24 +03:00
afbfbcd9e4
[Refs #223 ] Fix time calculation
2012-04-14 01:20:56 +04:00
2c0f047b38
[Refs #223 ] Fix errors and tests
2012-04-14 00:49:29 +04:00
2dedbd92d0
[refs #194 ] assignee & user
2012-04-14 01:44:04 +06:00
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
42967381b6
[refs #223 ] some refactoring
2012-04-14 00:26:34 +06:00
652bc9c471
[Refs #223 ] Fix update_attributes for project
2012-04-13 21:00:43 +04:00
100a166699
[Refs #223 ] Refactoring for pull request
2012-04-13 17:24:43 +04:00
8ffc6be347
Merge branch '223-change_build_lists_new_js_handlers' into 223-build_list_notify_and_duration_updates
...
Conflicts:
app/models/build_list.rb
config/locales/models/build_list.en.yml
config/locales/models/build_list.ru.yml
2012-04-13 17:21:30 +04:00
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
5cfadcd723
[refs #385 ] add dropdown menu to choose archive format
2012-04-13 17:24:24 +06:00
36447051ec
[Refs #223 ] Small refactoring for pull request
2012-04-13 13:48:57 +04:00
a68d4a2926
[issue #347 ] Many changes.
...
Changes includes:
* Changed Collaborator model;
* Autocomplete now works through backbone;
* Changed autocomplete styles;
* Groups have their own avatar;
* Changed previous backbone scripts;
2012-04-13 02:01:24 +04:00
65f1cfc822
[refs #223 ] Add current duration and project average build time
2012-04-12 18:55:32 +04:00
26a468f6e3
[refs #223 ] Replace notified_at by updated_at
2012-04-12 16:12:06 +04:00
b281cdf65b
[refs #385 ] changed archive
2012-04-12 17:27:15 +06:00
742603ab7e
[refs #223 ] Add build list duration
2012-04-12 14:29:04 +04:00
770030e180
[refs #385 ] zip archive
2012-04-12 00:29:08 +06:00
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
7a8de3e1f4
[refs #353 ] disabling fork button after click
2012-04-11 00:48:13 +06:00
27f2be079d
[refs #353 ] always show fork popup
2012-04-11 00:05:06 +06:00
6706d27712
Merge pull request #393 from warpc/263-refactoring
...
Исправление восстановления пароля
2012-04-10 10:29:10 -07:00
68b3446747
Fix password restore routes. Change input field type. Refs #263
2012-04-10 20:12:30 +03:00
442b44a68e
[issue #347 ] Added not_member_of scope. Added ActsLikeMember module
2012-04-10 19:45:38 +04:00
f0b9cabefa
[Refs #223 ] Change order for version select in build list creation page.
2012-04-10 19:45:18 +04:00
4ba17be536
[refs #223 ] fixed rendering fork button
2012-04-10 20:15:15 +06:00
18bda07369
Merge master into 223-change_build_lists_new_js_handlers
2012-04-10 18:00:48 +04:00
f7e09c993d
[refs #223 ] Optimise code by jQuery chains
2012-04-10 17:15:48 +04:00
3cff036508
[refs #223 ] Add new build btn to project page
2012-04-10 17:07:09 +04:00
207be85ff4
[refs #223 ] Add group select to versions
2012-04-10 16:03:33 +04:00
38eb8aeee5
[refs #391 ] fixed bug when creation project
2012-04-10 15:40:38 +06:00
d6dc51ba93
[refs #223 ] Choosen rep auto set
2012-04-10 13:05:42 +04:00
6d4f94e2c4
Merge pull request #389 from warpc/353-fork
...
[Refs #353 ] can fork project to group
2012-04-09 12:46:15 -07:00
5b884e9d40
[refs #223 ] Remove comment
2012-04-09 23:26:22 +04:00
5658707fe1
[refs #353 ] divide long string
2012-04-10 00:13:42 +06:00
e349a69883
[refs #353 ] can fork project to group
2012-04-09 23:56:03 +06:00
71c8efabf9
[issue #347 ] Added backbone. Changed collaborators page.
2012-04-09 21:11:39 +04:00
6ccf7e8456
[refs #223 ] Change js handlers and some inputs logics
2012-04-09 18:33:51 +04:00
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
96b3c831b7
[refs #358 ] br -> p
2012-04-06 02:21:19 +06:00
679765541e
Minor comments controller refactor. Refs #263
2012-04-05 20:21:25 +03:00
a9ecc683f2
Fix search bug. Write anonymous read specs for issues and search controllers. Refs #263
2012-04-05 20:11:02 +03:00
977ec8382c
Merge branch 'master' into 263-refactoring
2012-04-05 19:58:46 +03:00
01976015a6
[refs #295 ] fix broken create/fork project
2012-04-05 22:52:21 +06:00
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
6d5cee2c04
[refs #383 ] added ability to destroy project
2012-04-05 17:36:53 +06:00
39dd53ff9b
[refs #358 ] Add git clone repo help hint
2012-04-05 11:26:03 +04:00
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
302179eff8
[refs #295 ] set priority to delayed jobs
2012-04-04 18:13:10 +06:00
a6ec36086c
[Refs #263 ] Refactoring ProductBuildList. Add tests
2012-04-04 00:56:21 +04:00
f4937559a6
Merge pull request #378 from warpc/263-product_refactoring
...
[Refs #263 ] Refactoring product. Add tests.
2012-04-03 06:56:46 -07:00
1ef60a3f94
[Refs #263 ] Fix copy-past evil
2012-04-03 17:14:08 +04:00
fe053537c3
[ fixed #377 ] Fixed Group.by_admin scope.
2012-04-03 17:08:22 +04:00
d382732e68
[Refs #263 ] Refactoring product. Add tests.
2012-04-03 16:21:39 +04:00
1fb63cf1a7
[refs #263 ] division init bare & fork
2012-04-03 17:32:00 +06:00
5a384c6846
[refs #263 ] added dj queues
2012-04-03 01:29:06 +06:00
d06e452935
[refs #263 ] fixed feed with no repo
2012-04-03 01:27:36 +06:00
dfa538abef
Merge pull request #375 from warpc/263-repository_refactoring
...
[Refs #263 ] Refactoring repository. Add tests
2012-04-02 10:44:28 -07:00
431ed14e83
Fix "NameError: undefined local variable or method `platform' for ProductBuildList"
2012-04-02 21:39:43 +04:00
d31d0c9672
[Refs #263 ] Refactoring repository. Add tests
2012-04-02 19:43:59 +04:00
b36e0c284f
[refs #130 ] Add ssl to html5 script into sessions layout
2012-04-02 15:26:00 +04:00
23cdfa102c
[refs #130 ] Add ssl to jQuery and html5 scripts
2012-04-02 15:01:16 +04:00
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
0c2850b455
[Refs #367 ] Fix hardcoded protocol for git repo urls
2012-03-31 20:36:32 +04:00
1e8021fe35
[issue #369 ] Added TOS page.
2012-03-31 17:18:22 +04:00
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
eb4679de0e
[issue #195 ] Fixed access string in repo block
2012-03-31 14:27:20 +04:00
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
265090a172
Merge branch 'master' into 349-anonymous_access
...
Conflicts:
db/schema.rb
2012-03-31 02:41:25 +03:00
d6e6959f46
Write basic robots.txt. Apply configurable anonymous access, hide some functionality from guests. Apply basic design for main page. Autoconfirm manually created users. Code refactor and cleanup. Remove unused code, routes, containers, rpms, personal_repositories. Redo product_build_lists monitoring and filtering. Fix add_project to repo bug. Add links to bottom menu. Switch off deploy assets sppedup. Refs #349 , #263
2012-03-31 02:37:54 +03:00
7234cb7f99
[issue #195 ] Changed scopes.
2012-03-31 03:13:09 +04:00
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
71c1a4afcf
[issue #195 ] Owner removed from list of collaborators when editing list
2012-03-31 02:45:05 +04:00
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
b8cadd8a22
[refs #340 ] changed translations for monitoring pages
2012-03-31 00:24:32 +06:00
4db9bf4587
[refs #340 ] add title to products page
2012-03-30 23:41:22 +06:00
0f91e0e8a1
[refs #344 ] fixed ability and submenu
2012-03-30 23:23:46 +06:00
a113efad3e
[refs #340 ] title -> set_meta_tags
2012-03-30 22:37:54 +06:00
d18e55f180
[refs #340 ] titles - part2
2012-03-30 22:37:54 +06:00
e14e2db6c3
[refs #340 ] first part of titles
2012-03-30 22:36:20 +06:00
3cedef5f07
Merge branch 'master' into 344-fix_products_monitoring
...
Conflicts:
db/schema.rb
2012-03-30 20:30:06 +04:00
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
78943fdc04
[issue #195 ] Added legend for projects table. Added titles.
2012-03-30 18:51:57 +04:00
d3c2bac226
[refs #344 ] Add product buils list filter and search
2012-03-30 15:26:28 +04:00
1f57d88957
Fix IE design. Refs #263
2012-03-30 01:52:34 +03:00
4dd97d8c63
[Refs #263 ] Remove xml-rpc gem, clear CanCan abilities and tests
2012-03-30 00:24:45 +04:00
34011513b5
[Refs #263 ] Remove old xml-rpc API
2012-03-29 23:19:00 +04:00
39c5da2445
[Refs #263 ] Remove EasyUrpmi support
2012-03-29 23:07:38 +04:00
0c2d0f4612
[Refs #263 ] Delete Categories
2012-03-29 23:01:25 +04:00
5db485a4c0
[Refs #263 ] Remove Aut BuildList. Part 2
2012-03-29 22:43:46 +04:00
66c285c796
[Refs #263 ] Delete AutoBuildList
2012-03-29 22:22:48 +04:00
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
c03ae5015e
[issue #195 ] Fixed leave button. Added participant icons.
2012-03-29 20:27:33 +04:00
9a45353ccb
Merge pull request #342 from warpc/128-account-activation
...
[Refs #128 ] account activation
2012-03-29 09:09:03 -07:00
bac8f0a285
Revert "[issue #195 ] Removed leave button from groups projects."
...
This reverts commit 014fd706db9894f09cbffa8372009290324dbfe8.
2012-03-29 00:46:42 +04:00
869fa0da31
[issue #195 ] Removed leave button from groups projects.
2012-03-29 00:24:15 +04:00
f912ff1fa0
[refs #128 ] Add multilanguage devise mails
2012-03-28 20:00:44 +04:00
839daefc41
[refs #128 ] Small refactor of users#update action
2012-03-28 18:01:25 +04:00
086d4fca67
[refs #344 ] Fix product name into table
2012-03-28 17:53:49 +04:00
c6d30b7ff3
[refs #344 ] Add link to product into product build lists list
2012-03-28 17:51:04 +04:00
69ccf18265
[refs #270 ] added statistics to admins menu
2012-03-28 19:19:42 +06:00
9ee350b007
Refactor search controllers and scopes. Add search query whitespace strip. Refs #263
2012-03-28 02:58:03 +03:00
c9f4cf0ea4
Fix and refactor project membered abilities. Refs #195
2012-03-28 00:28:50 +03:00
2ba4a282cd
[issue #195 ] Global admin can change members in all projects
2012-03-28 00:16:33 +04:00
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
7143c7a9bc
Merge pull request #343 from warpc/263-refactoring
...
[Refs #263 ] Fix comment tests; refactoring.
2012-03-27 10:13:04 -07:00
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
385e35493f
[issue #279 ] Fixed bug with connection info.
2012-03-27 20:51:34 +04:00
c2960b7083
[refs #263 ] fixed commentable accessibility
2012-03-27 22:45:07 +06:00
b12f120962
Strip whitespaces during search. Refs #255
2012-03-27 19:22:45 +03:00
9bb1d80172
[issue #195 ] Added AJAX to /projects list.
2012-03-27 19:50:00 +04:00
3b57bb56bc
[refs #263 ] removed project_id from access lists
2012-03-27 21:11:52 +06:00
a0b7f243d6
[refs #263 ] changed and fixed comment tests; some refactoring
2012-03-27 21:09:04 +06:00
f33ef75666
[refs #128 ] Add email confirmation on email change. Remove email confirmation after registration.
2012-03-27 17:45:09 +04:00
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
6cac84e1bb
[refs #270 ] added register requests page to admins menu
2012-03-27 18:55:08 +06:00
a3aaf4f7ce
[issue #195 ] Fixed bug with line numbers in blob show.
2012-03-27 14:12:26 +04:00
8b31c6373f
Merge branch 'master' into 128-account-activation
2012-03-27 13:46:21 +04:00
dafedb3dcf
Reroute and refactor admin user creation to force invitation and self registration work correct. Refs #270
2012-03-26 17:49:00 +03:00
ae0ca1ce99
[refs #128 ] Fix devise mails. Fix confirm ability
2012-03-26 18:33:02 +04:00
a3d334f0c2
[refs #128 ] Merge 3.2-master into 128-account-activation
2012-03-26 13:55:45 +04:00
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
dd8e3b0497
[issue #195 ] Added JQuery datatables to /projects
2012-03-25 01:36:56 +04:00
4b96c988d4
Reduce build batch size. Refs #263
2012-03-24 02:09:49 +02:00
099ba2a3dd
Build platform for both arches. Refs #263
2012-03-24 01:53:07 +02:00
9ced817560
[Refs #279 ] Temporary fix for mass rebuild
2012-03-24 03:30:12 +04:00
cacd9eb301
Improve add_branch task. Fix projects list JSON generation. Refs #207 , #279
2012-03-24 00:48:58 +02:00
6a8b8fec3a
[Refs #66 ] User builds more priority than mass rebuild with zero priority
2012-03-24 01:29:51 +04:00
115c90f03b
Merge pull request #331 from warpc/263-refactoring
...
[Refs #263 ] Fix broken tests
2012-03-23 13:49:20 -07:00
1fab6c642e
Minor design fix for product build lists. Refs #223
2012-03-23 22:39:37 +02:00
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
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
c2617bf1dd
[refs #195 ] fixed edit button
2012-03-24 01:13:52 +06:00
35c466820e
[refs #195 ] add lock/unlock icon
2012-03-23 23:36:37 +06:00
f085367659
Merge pull request #337 from warpc/193-wiki
...
[Refs #193 ] Restyle wiki
2012-03-23 08:59:17 -07:00
6864f22b35
[refs #193 ] remove button style from delete page link
2012-03-23 21:56:21 +06:00
86bd036418
[refs #193 ] changes in wiki
2012-03-23 21:36:47 +06:00
116dbb4ad7
Merge pull request #335 from warpc/194-tracker
...
[Refs #194 ] change styles at issues list
2012-03-23 06:51:44 -07:00
eb0545221c
[refs #194 ] change styles at issues list
2012-03-23 19:31:51 +06:00
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
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
b08b1f7528
[refs #270 ] changed translation to Admin
2012-03-23 17:11:15 +06:00
009f10acf5
[refs #270 ] added translate to search label
2012-03-23 16:51:18 +06:00
8299ebc338
[refs #270 ] moved Add button to sidebar
2012-03-23 16:46:58 +06:00
7f31246463
Tune project specific build_lists page filters. Cleanup. Refs #223
2012-03-22 22:58:02 +02:00
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
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
75ae7f2189
[Refs #263 ] Update css for new version
2012-03-22 20:33:43 +04:00
d3184b846b
[issue #195 ] Fixed <Tab> in edit blobs.
2012-03-22 20:16:07 +04:00
16c9e6aa24
[refs #263 ] Fix most of the failed tests
2012-03-22 19:48:28 +04:00
071c391a6e
Merge branch '3.2-master' into 270-user_control
...
Conflicts:
app/assets/stylesheets/design/custom.scss
2012-03-22 21:15:10 +06:00
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
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
efd46249ed
[issue #195 ] Fixed merge artefact
2012-03-22 18:53:06 +04:00
23eeb1cae7
[refs #270 ] changes in ban
2012-03-22 20:50:15 +06:00
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
Alexander Machehin
Vladimir Sharshov
George Vinogradov
Pavel Chipiga
konstantin.grabar
Pasha