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