Pavel Chipiga
b47b4ec075
Update rails and gems. Redo resque jobs enqueue and perform through plugins. Redo emails async sending. Redo hook process. Refactor and code cleanup. Refs #510
2012-06-16 21:27:46 +03:00
Alexander Machehin
682f33a9bf
[refs #90 ] view merged status
2012-06-13 23:52:11 +06:00
Pavel Chipiga
d45e95b0e9
Merge branch 'master' into 207-platform_clone
...
Conflicts:
app/views/layouts/menu/_top.html.haml
2012-06-09 19:08:55 +03:00
Pavel Chipiga
ec21c042dd
Fix and refactor active menu. Refs #207
2012-06-09 19:04:06 +03:00
konstantin.grabar
cdf2316a76
[refs #510 ] Add queues to capistrano deploy. Add 4 workers to config
2012-06-09 18:53:00 +04:00
konstantin.grabar
f37e0e54a3
[refs #510 ] Replace dj with resque
2012-06-09 16:52:29 +04:00
konstantin.grabar
26299c234b
[refs #510 ] Add resque to the admin submenu
2012-06-08 19:02:45 +04:00
konstantin.grabar
da33173700
[refs #510 ] Add multiple workers. Change kill and start logic
2012-06-08 16:40:50 +04:00
Alexander Machehin
8fadbf2d41
[refs #90 ] rewrite diff
2012-06-07 23:23:28 +06:00
konstantin.grabar
597ac65dee
[refs #510 ] Resque deploy refactor. Turn off bluepill
2012-06-07 19:13:58 +04:00
konstantin.grabar
da9d7574d1
[refs #510 ] Return daemonize option back to production.pill
2012-06-07 14:53:21 +04:00
konstantin.grabar
ac2e267a8a
[refs #510 ] Remove daemonize option from production.pill
2012-06-07 14:39:32 +04:00
konstantin.grabar
7db11f40c8
[refs #510 ] Remove children kill from production.pill
2012-06-07 14:25:38 +04:00
konstantin.grabar
a266e57219
[refs #510 ] Add bluepill stop, start and restart to depoy and stop recipe
2012-06-07 13:27:19 +04:00
konstantin.grabar
ae6a3e6506
[refs #510 ] Change resque queue name
2012-06-06 22:57:45 +04:00
konstantin.grabar
8dbdcee5e6
[refs #510 ] Add resque start to bluepill
2012-06-06 18:54:03 +04:00
George Vinogradov
e7c0eab736
[issue #428 ] Merge branch 'master' into 428-advisory
...
Conflicts:
app/assets/stylesheets/design/custom.scss
2012-06-04 23:59:00 +04:00
George Vinogradov
abe2b8a30d
[issue #428 ] Work with existing advisories.
...
* Added advisories page to platform
* Added attacing of existing advisories to BuildList.
2012-06-04 23:49:20 +04:00
Alexander Machehin
8478ca405f
[refs #90 ] disable index action for pull request
2012-06-04 23:13:45 +06:00
Alexander Machehin
c185a13543
[refs #90 ] change russian translation
2012-06-04 23:00:56 +06:00
konstantin.grabar
d29065a12a
[refs #510 ] Remove fork and import queues from bluepill instruction
2012-06-01 17:58:14 +04:00
konstantin.grabar
4fb74cdd50
[refs #510 ] Remove double admin namespace
2012-06-01 17:30:11 +04:00
konstantin.grabar
7d58937149
[refs #510 ] Add resque recipes for capistrano
2012-06-01 16:54:58 +04:00
konstantin.grabar
526bdbe60f
[refs #510 ] Resque sinatra app secure
2012-05-31 17:36:41 +04:00
Alexander Machehin
11c67fb07d
Revert "[refs #90 ] issue status -> state" & changed state -> status
...
This reverts commit 7470ee76e4783a0fbbd98607406d7b770a2980d1.
Conflicts:
app/controllers/projects/issues_controller.rb
db/migrate/20120412173938_create_pull_requests.rb
db/schema.rb
2012-05-29 16:50:25 +06:00
Vladimir Sharshov
f8edecc915
Merge branch 'master' of github.com:warpc/rosa-build
2012-05-28 23:28:09 +04:00
konstantin.grabar
5e9f348074
[ref #442 ] Add id column
2012-05-28 23:18:50 +04:00
Vladimir Sharshov
2479c1c98b
Merge branch 'master' of github.com:warpc/rosa-build
2012-05-28 16:06:02 +04:00
Alexander Machehin
b6e0e81b90
[refs #263 ] fixed do-not-reply emails
2012-05-28 16:22:36 +06:00
Vladimir Sharshov
3fbd2ae79e
Merge branch 'master' of github.com:warpc/rosa-build
2012-05-28 13:05:31 +04:00
Vladimir Sharshov
3ed195bb86
Merge pull request #502 from warpc/442-mass_build
...
[refs #442 ] Mass build refactor and fixes
2012-05-28 02:00:30 -07:00
Vladimir Sharshov
0f1c92cac2
Fix translation for build status
2012-05-26 00:22:23 +04:00
konstantin.grabar
df82cf69ca
[refs #442 ] Refactor mass_build
2012-05-25 21:31:57 +04:00
konstantin.grabar
a79d946b6b
[refs #442 ] Mass build refactor and fixes
2012-05-25 19:56:26 +04:00
Alexander Machehin
df610931d7
[refs #90 ] commits tab
2012-05-25 16:48:44 +06:00
Alexander Machehin
4f1d23a2a4
[refs #90 ] branch, merge validation
2012-05-24 23:10:49 +06:00
Vladimir Sharshov
0d3e06b5d9
Merge pull request #499 from warpc/478-project_build_failed
...
[refs #478 ] Add js handler to disable frozen platforms and their reps
2012-05-24 03:39:55 -07:00
konstantin.grabar
3d2bcdd019
[refs #478 ] Add js handler to disable frozen platforms and their reps
2012-05-24 14:21:57 +04:00
konstantin.grabar
45ff187875
[refs #442 ] Remove button. Add tab. Fix locales. Fix schema
2012-05-23 20:44:04 +04:00
Alexander Machehin
e211fa2fc3
[refs #90 ] fixed errors, add validations & tests
2012-05-23 22:09:11 +06:00
konstantin.grabar
a83927c812
[refs #442 ] Fix mass_build_id locales
2012-05-23 18:19:04 +04:00
konstantin.grabar
c74de8b84d
[refs #442 ] Add new page for mass rebuild, new fields and new functional
2012-05-23 18:08:11 +04:00
Alexander Machehin
0c89ca6575
[refs #90 ] broken tests
2012-05-23 00:23:00 +06:00
konstantin.grabar
7c45263799
[refs #442 ] Add mass build select to monitoring. Remove build lists from build_all action
2012-05-22 17:40:27 +04:00
konstantin.grabar
9aefce6b68
[refs #442 ] Merge master into 442-mass_build
2012-05-21 18:33:12 +04:00
Alexander Machehin
d643bb3cd0
[refs #90 ] try to prevent create same pull
2012-05-21 19:24:16 +06:00
Alexander Machehin
6b6887250b
Merge branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-05-21 17:31:49 +06:00
Alexander Machehin
1bcab2f7db
[refs #443 ] remove old file, fixed ru translation
2012-05-21 16:46:08 +06:00
konstantin.grabar
be2ab9154c
[refs #442 ] Fix checkboxes styles. Return delay for build all. Add mass build select and more fixes
2012-05-21 14:18:29 +04:00
Vladimir Sharshov
5133fe6bc3
Merge pull request #487 from warpc/443-tour
...
[refs #443 ] invite localization
2012-05-18 11:10:15 -07:00
Alexander Machehin
aad7a3a547
[refs #443 ] invite localization
2012-05-18 22:54:57 +06:00
konstantin.grabar
cd3564bb81
[refs #442 ] Add mass build model and new build_all fixes
2012-05-18 19:12:51 +04:00
Vladimir Sharshov
130a45f584
Merge pull request #485 from warpc/438-remove_rsync_mount_from_app
...
[refs #438 ] Fix symlink stubbing
2012-05-18 02:19:41 -07:00
konstantin.grabar
9920802006
[refs #438 ] Fix symlink stubbing
2012-05-18 13:03:42 +04:00
Vladimir Sharshov
a804f3ef2c
[refs #461 ] Correct translation for is_package option
2012-05-18 00:40:30 +04:00
Alexander Machehin
fcffff4178
Merge branch 'master' into 90-pull
...
Conflicts:
app/assets/stylesheets/design/custom.scss
config/locales/title.en.yml
config/locales/title.ru.yml
config/routes.rb
db/schema.rb
2012-05-17 22:58:29 +06:00
Alexander Machehin
74aee232f9
[refs #90 ] some fixes and merge button
2012-05-17 22:49:29 +06:00
konstantin.grabar
3e57359c96
[refs #442 ] Add mass build page functional
2012-05-17 19:20:03 +04:00
konstantin.grabar
ec9c19352e
[refs #461 ] Merge master into to 461-rename_is_rpm_to_is_package. Again
2012-05-17 12:00:21 +04:00
Alexander Machehin
f96990bd25
[refs #90 ] change view
2012-05-16 22:50:30 +06:00
Vladimir Sharshov
2892689807
Merge pull request #469 from warpc/443-tour
...
[refs #466 ] Add localization for system tour. Fix for auto detecting users language.
2012-05-16 05:19:59 -07:00
konstantin.grabar
9d871af7ef
Merge master into 461-rename_is_rpm_to_is_package
2012-05-16 14:40:10 +04:00
konstantin.grabar
1385133ed5
[refs #461 ] Merge master into 461-rename_is_rpm_to_is_package
2012-05-16 14:37:35 +04:00
konstantin.grabar
79a9b3d107
[refs #461 ] Fix is_package locale. Fix schema.rb and rename migration
2012-05-16 14:33:14 +04:00
konstantin.grabar
5ad43c684e
Merge master into 429-uname_format_error_explain
2012-05-16 14:01:41 +04:00
Alexander Machehin
05746ea449
[refs #466 ] add i18n
2012-05-15 21:35:48 +06:00
konstantin.grabar
e807e5f3ec
[refs #429 ] Add format explain error message for uname
2012-05-15 15:11:18 +04:00
Vladimir Sharshov
56ad094b00
Merge pull request #463 from warpc/444-bl_package
...
[refs #444 ] Apply basic build list packages store functionality;
* Display build list package content;
* Write specs.
2012-05-14 13:12:37 -07:00
Pavel Chipiga
8470674c62
Apply basic build list packages store functionality. Display build list package content. Write specs. Refactor. Refs #444
2012-05-14 22:08:31 +03:00
Alexander Machehin
aa38017daa
[refs #340 ] restore page titles
2012-05-14 23:24:09 +06:00
Alexander Machehin
ff016efe1c
[refs #90 ] choose project
2012-05-14 23:09:18 +06:00
Pavel Chipiga
f335863881
Fix dot in project name routes. Refactor and write basic route specs. Refs #454
2012-05-14 16:24:01 +03:00
Vladimir Sharshov
64d5600e6f
Merge pull request #447 from warpc/443-tour
...
[refs #443 ] Tour about the system
2012-05-12 10:11:16 -07:00
Alexander Machehin
398cec4806
[refs #443 ] add js to precompile
2012-05-12 21:23:33 +06:00
George Vinogradov
cada9f6e51
[issue #443 ] Changed tour routes. Fixed submenu position.
2012-05-12 01:05:48 +04:00
George Vinogradov
a048509426
[issue #443 ] Numeric ids changed to words.
2012-05-12 00:45:37 +04:00
Alexander Machehin
5f5eb00c4f
[refs #443 ] abf tour
2012-05-12 00:15:20 +06:00
George Vinogradov
1a9f529152
[issue #430 ] Added rake task to remove outdated BuildLists.
2012-05-11 21:44:19 +04:00
George Vinogradov
5320fc2d3e
[issue #428 ] AdvisoriesController moved from its scope
2012-05-10 21:17:59 +04:00
Alexander Machehin
3e0ebdc929
[refs #90 ] change route
2012-05-10 22:57:59 +06:00
Pavel Chipiga
52f5e01575
Fix build list controller bugs. Fix JS which controls checkboxes. Fix translations. Fix and refactor views. Refs #428
2012-05-06 00:43:04 +03:00
George Vinogradov
05ef799fa4
[issue #428 ] Added advisories list. Added translations.
2012-05-05 21:18:29 +04:00
George Vinogradov
6fe0e5b530
[issue #428 ] Added AdvisoriesController & show view.
2012-05-05 02:53:45 +04:00
George Vinogradov
1f07332892
[issue #428 ] Merge branch 'master' into 428-advisory
...
Conflicts:
app/controllers/projects/build_lists_controller.rb
config/routes.rb
db/schema.rb
2012-05-04 21:29:04 +04:00
Alexander Machehin
813afe53cf
[refs #90 ] minor interface changes
2012-05-04 23:13:41 +06:00
George Vinogradov
8350fc8fb1
[issue 428] Added advisory.
2012-05-04 21:12:51 +04:00
Alexander Machehin
c5731ff8dd
[refs #90 ] fixed merging errors
2012-05-04 16:56:11 +06:00
Pavel Chipiga
5157f31081
Refactor routes to separate owner profile and project. Redo short groups profile URL. Improve specs. Refs #236
2012-05-04 00:52:56 +03:00
Alexander Machehin
178dbdc5f0
[refs #90 ] move files
2012-05-03 23:55:08 +06:00
Alexander Machehin
36b4ce2d99
Merge branch 'master' into 90-pull
...
Conflicts:
Gemfile
Gemfile.lock
app/controllers/projects/issues_controller.rb
app/models/project.rb
config/locales/menu.en.yml
config/routes.rb
db/schema.rb
2012-05-03 23:19:43 +06:00
Pavel Chipiga
b1b5363972
Fix deploy. Redo main group route. Refs #263
2012-05-03 19:48:22 +03:00
Pavel Chipiga
abb60a503a
Minor design fix. Refactor register requests. Refactor case insensitive search. Other minor fixes and code cleanup. Refacor and improve owner constraint. Refs #263
2012-05-03 17:08:02 +03:00
Alexander Machehin
9e5db741d3
Merge branch 'master' into 90-pull
...
Conflicts:
app/models/project.rb
db/schema.rb
2012-05-02 23:08:24 +06:00
Pavel Chipiga
2539ef4795
Great controllers and routes refactor - separate them to namespaces. Add user/group routes in github style, refactor. Implement templates inheritance. Refactor and cleanup views. Fix specs. Other minor fixes. Refs #263
2012-05-02 12:18:07 +03:00
Pavel Chipiga
b957600eda
Merge branch 'master' into 263-refactoring
...
Conflicts:
app/models/project.rb
app/views/projects/_repo_block.html.haml
db/schema.rb
spec/controllers/issues_controller_spec.rb
spec/controllers/projects_controller_spec.rb
2012-05-01 15:54:13 +03:00
Alexander Machehin
4ad39b05c0
[refs #90 ] model PullRequest, tests
2012-04-28 23:30:54 +06:00
George Vinogradov
de093d7065
[issue #425 ] Changed object to actor in Relation and to eventable in
...
EventLog
2012-04-26 05:38:33 +04:00
Alexander Machehin
a8ccf454ee
[refs #90 ] first steps of pull rendering
2012-04-23 23:34:11 +06:00
Alexander Machehin
628fed40ea
[refs #90 ] issue status -> state
2012-04-23 23:34:11 +06:00
Pavel Chipiga
c0d2d67c73
Merge branch 'master' into 263-refactoring
...
Conflicts:
Gemfile
Gemfile.lock
config/routes.rb
2012-04-23 17:58:45 +03:00
konstantin.grabar
e984402068
[refs #417 ] Rename pingwinsoft configs to school
2012-04-23 18:37:12 +04:00
konstantin.grabar
95c795e3ab
[refs #417 ] Remove http and slash symbols from action mailer hosts
2012-04-23 17:37:15 +04:00
konstantin.grabar
0ca6c76ce2
[refs #417 ] Make changes for devise action mailer host set
2012-04-23 16:53:30 +04:00
Vladimir Sharshov
24922cc43c
Merge pull request #388 from warpc/347-javascript_refactoring
...
[issue #347 ] Union users and groups into one table in collaborators page. Use backbone(JS framework) for it. Improve UI for collaborators page (AJAX).
2012-04-20 08:15:12 -07:00
Pavel Chipiga
701da7e1f9
Disable bluepill. Update gems. Github project style URLs. Fix project load. Fix abilities. Fic urls generation. Fix some specs. Refs #263
2012-04-19 22:45:50 +03:00
Pavel Chipiga
5efabc9d4e
Fix atom feed urls. Refs #396
2012-04-19 20:35:35 +03:00
George Vinogradov
510b0c0c50
[issue #347 ] Merge branch 'master' into 347-javascript_refactoring
...
Conflicts:
app/assets/stylesheets/design/custom.scss
app/models/group.rb
app/models/user.rb
2012-04-19 19:32:11 +04:00
Vladimir Sharshov
5b5aec490a
Merge pull request #409 from warpc/396-rss_atom_feed
...
[refs #396 ] Add atom feed for activity feed
2012-04-19 07:08:59 -07:00
konstantin.grabar
def76d134d
[refs #396 ] Fix some atom locales
2012-04-19 15:05:17 +04:00
konstantin.grabar
2fc4e2db61
[refs #396 ] Fix token migration. Fix atom link tag title
2012-04-19 14:50:43 +04:00
konstantin.grabar
cd153375dd
[refs #396 ] Devise token auth update for atom feed. Some atom feed fixes.
2012-04-18 19:15:04 +04:00
konstantin.grabar
3d1cb4bfee
Merge master into 396-rss_atom_feed
2012-04-18 16:53:53 +04:00
George Vinogradov
721fa1b0c0
[issue #408 ] Fixed translations
2012-04-18 14:59:41 +04:00
George Vinogradov
6c64125787
[issue #408 ] Changed behavior of build list for released platform
2012-04-17 22:18:39 +04:00
konstantin.grabar
8d723ee0be
[refs #396 ] Fix title truncate and strip. Add feed main title.
2012-04-17 19:38:02 +04:00
konstantin.grabar
2dafd49763
[refs #396 ] Add atom feed
2012-04-17 19:01:35 +04:00
George Vinogradov
8204196275
[issue #347 ] Removed comments. Added filter field to collaborators
...
table.
2012-04-17 17:39:14 +04:00
Alexander Machehin
2716c19635
[refs #385 ] add anonymous access to project archive
2012-04-17 16:18:03 +06:00
konstantin.grabar
2c9d4583e8
[refs #404 ] Remove downloads from menu
2012-04-17 13:17:52 +04:00
konstantin.grabar
1b871bf6dd
[refs #404 ] Remove downloads statistics functional
2012-04-17 12:23:58 +04:00
Alexander Machehin
2dedbd92d0
[refs #194 ] assignee & user
2012-04-14 01:44:04 +06:00
Alexander Machehin
ba9184cc49
Merge pull request #398 from warpc/223-build_list_notify_and_duration_updates
...
223 build list notify and duration updates
2012-04-13 11:43:57 -07:00
Vladimir Sharshov
100a166699
[Refs #223 ] Refactoring for pull request
2012-04-13 17:24:43 +04:00
Vladimir Sharshov
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
Pasha
d8edf8e673
Merge pull request #397 from warpc/223-change_build_lists_new_js_handlers
...
[refs #223 ] Add build list duration
2012-04-13 05:25:20 -07:00
Vladimir Sharshov
36447051ec
[Refs #223 ] Small refactoring for pull request
2012-04-13 13:48:57 +04:00
George Vinogradov
a68d4a2926
[issue #347 ] Many changes.
...
Changes includes:
* Changed Collaborator model;
* Autocomplete now works through backbone;
* Changed autocomplete styles;
* Groups have their own avatar;
* Changed previous backbone scripts;
2012-04-13 02:01:24 +04:00
konstantin.grabar
65f1cfc822
[refs #223 ] Add current duration and project average build time
2012-04-12 18:55:32 +04:00
konstantin.grabar
26a468f6e3
[refs #223 ] Replace notified_at by updated_at
2012-04-12 16:12:06 +04:00
konstantin.grabar
742603ab7e
[refs #223 ] Add build list duration
2012-04-12 14:29:04 +04:00
Alexander Machehin
770030e180
[refs #385 ] zip archive
2012-04-12 00:29:08 +06:00
Pavel Chipiga
68b3446747
Fix password restore routes. Change input field type. Refs #263
2012-04-10 20:12:30 +03:00
konstantin.grabar
18bda07369
Merge master into 223-change_build_lists_new_js_handlers
2012-04-10 18:00:48 +04:00
konstantin.grabar
c619aa44b7
[refs #223 ] Fix build list status
2012-04-10 17:11:36 +04:00
konstantin.grabar
3cff036508
[refs #223 ] Add new build btn to project page
2012-04-10 17:07:09 +04:00
Alexander Machehin
dfddee82ab
[refs #353 ] fixed english translation
2012-04-10 01:43:45 +06:00
Alexander Machehin
cd938532d0
[refs #353 ] fixed russian translate
2012-04-10 01:10:44 +06: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
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
Pavel Chipiga
76f7507b22
Fix DJ deploy recipies. Refs #263
2012-04-05 22:26:18 +03:00
konstantin.grabar
39dd53ff9b
[refs #358 ] Add git clone repo help hint
2012-04-05 11:26:03 +04:00
Alexander Machehin
349e173f60
[refs #295 ] deploy recipes for dj
2012-04-04 23:00:35 +06:00
Alexander Machehin
06cd8a3c45
[refs #295 ] 4 workers to dj
2012-04-03 21:12:11 +06: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
59f51d3b2f
[issue #195 ] read_access: read -> read-only
2012-03-31 14:36:36 +04:00
George Vinogradov
eb4679de0e
[issue #195 ] Fixed access string in repo block
2012-03-31 14:27:20 +04: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
4ce18b017e
Merge pull request #363 from warpc/195-new_design_for_projects
...
[issue #195 ] Added missed translations.
2012-03-30 13:51:07 -07:00
George Vinogradov
c70a7136d6
[issue #195 ] Fixed translations.
2012-03-31 00:47:49 +04:00
George Vinogradov
4e701dbddb
[issue #195 ] Added missed translations.
2012-03-31 00:20:23 +04: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
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
konstantin.grabar
d3c2bac226
[refs #344 ] Add product buils list filter and search
2012-03-30 15:26:28 +04:00
Pavel Chipiga
050398c39f
Merge branch 'master' into 263-refactoring
...
Conflicts:
db/schema.rb
2012-03-30 00:02:59 +03:00
Pavel Chipiga
583918fa68
Upgrade gems. Upgrade FactoryGirl syntax. Move code out from vendor/plugins, redo plugins structure. Fix all deprecations. Great refactor for lib and initializers folders. Add magic encodings. Code cleanup. Fix some specs. Refs #263
2012-03-29 23:34:22 +03: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
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
Vladimir Sharshov
1d344f441f
[Refs #263 ] Fix localization: mistakes, typos and missing translations. Special thanks to Eugeni Dodonov for help.
2012-03-29 14:48:15 +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
9bb1d80172
[issue #195 ] Added AJAX to /projects list.
2012-03-27 19:50:00 +04:00
Alexander Machehin
c327ca8d61
[refs #270 ] fixed translation for admin menu
2012-03-27 21:28:22 +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
Vladimir Sharshov
3d2fedb594
[Refs #263 ] Speed up deploy if assets didn't change
2012-03-27 02:21:35 +04:00
Vladimir Sharshov
5c574a74e4
* Fix for non en_US.UTF-8 user locale deploy
...
* Fix missing data in pingwinsoft application config
2012-03-26 23:18:33 +04:00
Vladimir Sharshov
90024065a8
Change settings for pingwinsoft deploy env
2012-03-26 22:45:28 +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
George Vinogradov
dd8e3b0497
[issue #195 ] Added JQuery datatables to /projects
2012-03-25 01:36:56 +04: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
863d2999c8
[refs #195 ] changed translations
2012-03-24 01:15:34 +06:00
Alexander Machehin
b08b1f7528
[refs #270 ] changed translation to Admin
2012-03-23 17:11:15 +06:00
Pavel Chipiga
7f31246463
Tune project specific build_lists page filters. Cleanup. Refs #223
2012-03-22 22:58:02 +02:00
Vladimir Sharshov
df32afbda6
[Refs #265 ] change text for load_messages link
2012-03-22 22:35:01 +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
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
fcc1fad0d1
[refs #270 ] fixed translations
2012-03-22 18:00:34 +06: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
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
a6a5b722d2
[refs #270 ] use devise lockable to ban
2012-03-21 23:45:51 +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
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
4b4b718838
Fix errors in unicorn config
2012-03-20 23:11:59 +04:00
Vladimir Sharshov
41d98f5040
Fix path for unicorn working_directory
2012-03-20 22:59:12 +04:00
Vladimir Sharshov
abbe849f32
Fix(?) for zero time deploy restart
2012-03-20 22:47:09 +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
0dd0cb091c
Fix for unicorn zero deploy restarting
2012-03-20 20:54:51 +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
a8b457a173
[issue #279 ] Fixed translation typo
2012-03-20 20:46:50 +04:00
George Vinogradov
7c0585ee87
[issue #279 ] Added members and other changes.
2012-03-20 20:24:18 +04:00
Alexander Machehin
1066307fbb
[refs #270 ] created admins menu aside
2012-03-19 23:32:02 +06:00
George Vinogradov
155a46cce9
[issue #279 ] Fixed some bugs in connection info.
2012-03-19 19:56:40 +04:00
Vladimir Sharshov
8bf3837fcb
Merge branch '3.2-master' of github.com:warpc/rosa-build into 3.2-master
2012-03-19 19:46:09 +04:00
Vladimir Sharshov
ec791f2616
Fix for non restart unicorn with zero time deploy
...
http://unicorn.bogomips.org/SIGNALS.html (about 'preload_app')
2012-03-19 19:45:44 +04:00
George Vinogradov
b6b1462de5
[issue #279 ] Fixed some bugs in connection info.
2012-03-19 19:37:08 +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
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
296acd80da
[refs #265 ] added build waiting message
2012-03-19 15:07:09 +06:00
konstantin.grabar
b3d7091db0
Merge 3.2-master into 223-monitoring_design
2012-03-19 10:41:30 +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
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
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
Alexander Machehin
dce26c79e0
[refs #265 ] fixed en locale
2012-03-16 00:25:05 +06:00
Alexander Machehin
4addff059b
[refs #265 ] added activity feed tabs
2012-03-15 23:52:54 +06: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
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
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
3642163fd7
[refs #265 ] changed feed messages
2012-03-14 23:00:26 +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
Pavel Chipiga
cf009c7388
Fix routes. Refs #257
2012-03-12 22:34:42 +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
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
a800b4364d
[refs #257 ] fixed translation
2012-03-12 18:52:32 +06:00
Alexander Machehin
5f6ca140d9
[refs #257 ] add ability to destroy avatar
2012-03-12 18:51:07 +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
535c075d3e
[issue #279 ] Added platform main page, menu & sidebar
2012-03-12 03:08:50 +04: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
6d5120e5cc
Merge branch '3.2-master' into 265-new_design_for_activity_feed
2012-03-11 22:44:25 +06:00
Vladimir Sharshov
11434ff423
[Refs #285 ] Fix css style, rename button
2012-03-11 20:38:28 +04: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
Alexander Machehin
de62aaad53
[refs #257 ] fix user update registration page
2012-03-08 00:47:19 +06: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
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
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
8ae7ebee2b
Merge branch '3.2-master' into 194-issue_page
2012-03-06 22:51:13 +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
konstantin.grabar
f54d889f74
[refs #265 ] Fix activity partials messages and locales. Fix observer.
2012-03-06 18:04:05 +04:00
konstantin.grabar
de6490346b
[refs #257 ] Change error messages logic. Fix avatar ru translation
2012-03-06 15:24:42 +04:00
Alexander Machehin
9e6d06f1c9
[refs #194 ] manage issue executer
2012-03-06 00:28:55 +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
9214f79d91
[refs #265 ] Fix one more wiki compare route
2012-03-05 20:48:59 +04:00
George Vinogradov
8845ec17ff
[issue #195 ] Added translations.
2012-03-05 20:31:09 +04: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
0c194f5b50
Fix DJ deploy callbacks. Remove capistrano-ext. Refs #263
2012-03-03 03:54:56 +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
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
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
George Vinogradov
b3750f8644
[issue #195 ] Fixed branch selector.
2012-03-02 20:48:19 +04: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
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
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
3aae663811
[refs #194 ] add comments to issues
2012-03-02 02:04:05 +02:00
Pavel Chipiga
036dfb6dd5
Fix build_lists bugs. Add build list display and new build list pages design, apply compass. Refactor and cleanup assets. Refactor abilities. Refactor build_list search. Improve layout_class helper. Change defaul build_lists index filter and fix specs. Fix assets path. Refs #223
2012-03-02 02:04:04 +02:00
George Vinogradov
4b024d1728
[issue #195 ] Fixes.
...
* Fixed translations
* Fixed blob display
* Fixed routes
2012-03-01 21:37:24 +04:00
konstantin.grabar
eb689b7f18
[refs #232 ] Add new design and logic refactor for group members action
2012-03-01 19:41:40 +04:00
konstantin.grabar
fc3d4c0b6d
[refs #232 ] Add group members edit page design
2012-03-01 18:23:26 +04:00
George Vinogradov
6eb239385a
[issue #195 ] Fixed bug with creating project
2012-03-01 17:37:35 +04:00
konstantin.grabar
157f9a1a68
[refs #232 ] Add sidebar and group edit page
2012-03-01 16:28:38 +04:00
konstantin.grabar
55ff2c7f6b
[refs #195 ] Change new project route and some other changes
2012-03-01 16:10:12 +04:00
George Vinogradov
2a4e978857
[issue #195 ] Merge branch '3.2-master' into 195-new_design_for_projects
...
Conflicts:
app/assets/stylesheets/custom.scss
2012-03-01 14:22:39 +04:00
George Vinogradov
fe5ad9ebf3
[issue #195 ] Added missed js. Some changes.
2012-03-01 05:07:31 +04:00
George Vinogradov
bc96fcdcc3
[issue #195 ] Added missed translation.
2012-03-01 03:34:36 +04:00
Alexander Machehin
cadd1995d1
[refs #230 ] fix forgot password SignUp style
2012-03-01 01:50:08 +06:00
Vladimir Sharshov
d3231b5faa
Merge pull request #243 from warpc/230-registration_page
...
[Refs #230 ] Fix I18n and remove wrong js for registration page
2012-02-29 11:23:35 -08:00
Alexander Machehin
ceae6730d8
[refs #230 ] fix I18n
2012-03-01 01:14:46 +06:00
Vladimir Sharshov
d9ca8ff8b6
Merge pull request #231 from warpc/195-new_design_for_projects
...
[Refs #195 ] new design for projects
2012-02-29 09:54:42 -08:00
George Vinogradov
c3d7221f97
[issue #195 ] Fixed bugs
...
* Highlighting in submenu
* File history
2012-02-29 21:53:14 +04:00
konstantin.grabar
bc75b318ce
[refs #195 ] Merge 3.2-master into 195-new_design_for_projects
2012-02-29 21:37:28 +04:00
konstantin.grabar
12d8f5e7b8
[refs #232 ] Add new design to some group pages
2012-02-29 21:12:06 +04:00
Alexander Machehin
ba4fae071f
[refs #230 ] error messages
2012-02-29 23:01:30 +06:00
Alexander Machehin
322e68212f
[refs #230 ] add registration to precompile list
2012-02-29 22:59:09 +06:00
Alexander Machehin
3136159777
[refs #230 ] add red borders to invalid attributes
2012-02-29 22:59:09 +06:00
Alexander Machehin
632e908442
[refs #228 ] add logins to precompile array
2012-02-29 22:59:09 +06:00
Alexander Machehin
ee84ac84cf
[refs #228 ] fix I18n
2012-02-29 22:59:08 +06:00
Alexander Machehin
a1bfe66791
[refs #228 ] sign_in page
2012-02-29 22:59:08 +06:00
George Vinogradov
5b9d20154b
[issue #195 ] Added translations and maybe missed partials
2012-02-29 20:27:32 +04:00
George Vinogradov
662ea4018c
[issue #195 ] Changed commit header on commit page.
2012-02-29 19:08:21 +04:00
konstantin.grabar
c5d8041296
[refs #195 ] Add global fixes to projects and collaborators logic
2012-02-29 18:45:04 +04:00
Pavel Chipiga
cefaa902b1
Apply new design for projects build monitoring page. Improve and refactor filters. Improve abilities. Switch off old statuses. Separate build_lists translations. Refactor and remove duplicate translations. Refactor and code cleanup. Fix specs. Apply layout class helper. Refs #223
2012-02-29 16:04:38 +02:00
George Vinogradov
fe46e53ad8
[issue #195 ] Many changes.
...
* Base presenter moved to lib
* Added diff display
* Changes in some views
TODO Add translations.
TODO Change commit page layout.
TODO Change representation of commit on commit page.
TODO Fix bug with tree/branch select.
2012-02-29 06:02:07 +04:00
konstantin.grabar
2ec2548390
[refs #195 ] Add base design and functional to project members page
2012-02-29 01:01:25 +04:00
Pavel Chipiga
9860624a0d
Temporary disable SSL force
2012-02-28 19:00:43 +02:00
Alexander Machehin
c4719f12da
[refs #194 ] some change in the issue managing
2012-02-28 22:33:38 +06:00
Alexander Machehin
895b095058
Merge branch '3.2-master' into 194-tracker
...
Conflicts:
app/assets/stylesheets/custom.scss
app/assets/stylesheets/main.scss
2012-02-28 22:31:00 +06:00
konstantin.grabar
e9ae923b60
[refs #195 ] Merge 3.2-master into 195-new_design_for_projects
2012-02-28 20:10:31 +04:00
Vladimir Sharshov
529d8d3708
Merge pull request #192 from warpc/123-activity-feed
...
[Refs #123 ] activity feed (commits notifcation not work)
2012-02-28 07:46:55 -08:00
Pavel Chipiga
2f39b050ae
Merge branch 'master' into 3.2-master
...
Conflicts:
config/deploy.rb
2012-02-28 17:44:11 +02:00
Pavel Chipiga
07b081cc0d
Fresh up assets. Force production SSL. Refs #223
2012-02-28 17:40:22 +02:00
Alexander Machehin
bc4a157703
Merge branch '3.2-master' into 194-tracker
...
Conflicts:
app/assets/stylesheets/application.scss
app/views/issues/_form.html.haml
app/views/platforms/show.html.haml
2012-02-28 20:13:08 +06:00
Alexander Machehin
0d75a37451
[refs #194 ] show page beta version
2012-02-28 20:05:18 +06:00
Vladimir Sharshov
b17ae2f53b
[Refs #196 ] Disable bluepill, turn on DJ receipts
2012-02-28 14:09:27 +04:00
Vladimir Sharshov
5cc32d61c2
[Refs #196 ] Fix bluepill and DJ option for deploy and restarting
2012-02-28 13:41:02 +04:00
konstantin.grabar
03663a8ed7
[refs #195 ] Add sections page and method to projects
2012-02-28 12:00:56 +04:00
Pavel Chipiga
e004822bd3
Remove/replace old assets to avoid production bugs. Fix deploy settings.
2012-02-28 01:16:14 +02:00
Pavel Chipiga
70963d0943
Merge branch 'master' into 3.2-master
2012-02-27 22:34:21 +02:00
Pavel Chipiga
159ef26b38
Merge branch 'master' into 3.2-master
...
Conflicts:
app/views/wiki/_compare.html.haml
app/views/wiki/_diff_data.html.haml
db/schema.rb
2012-02-27 22:32:57 +02:00
Vladimir Sharshov
ddda2b92ab
[Refs #221 ] Delete product build lists (only in web)
2012-02-28 00:00:33 +04:00
Pavel Chipiga
7508bb1339
Fix bugs to force new design work. Minor refactor and improvements. Refs #193
2012-02-27 20:58:37 +02:00
George Vinogradov
b6a52fb840
Merge branch '195-new_design_for_projects' of github.com:warpc/rosa-build into 195-new_design_for_projects
2012-02-27 21:47:05 +04:00
George Vinogradov
582063d066
[issue #195 ] Commits history, editing, showing...
2012-02-27 21:40:46 +04:00
Pavel Chipiga
1005fbd64f
Add link to product container. Refs #217
2012-02-27 18:21:56 +02:00
Alexander Machehin
27c85d32df
[refs #194 ] create page; index pagination; some bugs
2012-02-27 22:10:12 +06:00
konstantin.grabar
72fec3b314
[refs #195 ] Add owner choose on project create
2012-02-27 13:03:28 +04:00
Pavel Chipiga
4d2459c60c
Refactor, fix and cleanup wiki templates and translations. Refs #193
2012-02-24 23:39:40 +02:00
Alexander Machehin
dde81b5554
[refs #123 ] fix activity feed for commit comments; remove reply notification
2012-02-25 00:25:35 +06:00
Vladimir Sharshov
46a5ab1c76
Merge branch 'master' into 123-activity-feed
...
Conflicts:
config/deploy.rb
db/schema.rb
2012-02-24 20:44:36 +04:00
Vladimir Sharshov
3685eafe57
Remove unused code [Refs #207 ]
2012-02-24 19:35:29 +04:00
Pavel Chipiga
482874409d
Force bluepill restart after deploy. Refs #196
2012-02-24 17:28:46 +02:00
Vladimir Sharshov
63c89edfda
Isolated localization for activity feed
2012-02-24 19:28:01 +04:00
Pavel Chipiga
600df031f5
Refactor platform clone controller and routes. Refactor and fix clone process for platform, repository, product. Place XML RPC clone request to DJ. Refs #207
2012-02-24 19:27:59 +04:00
Pavel Chipiga
432b6ac276
Refactor bluepill deploy recipies. Restart DJ through bluepill. Refs #196
2012-02-24 19:27:58 +04:00
Vladimir Sharshov
e93d5c08b0
[Refs#196] Update text message for empty text[en]
2012-02-24 19:27:57 +04:00
Vladimir Sharshov
f4f542811d
[Refs#196] Update text message for empty text[ru]
2012-02-24 19:27:57 +04:00
Pavel Chipiga
4daf50b34e
Change blank repo message. Refs #196
2012-02-24 19:27:57 +04:00
George Vinogradov
50ad3edab4
Fixed default host in mailer
2012-02-24 19:27:56 +04:00
konstantin.grabar
aedfc0df8c
Change nginx log rotate period to 1 day
2012-02-24 19:27:55 +04:00
Pavel Chipiga
fd15a39f7a
Fix cancan regsiter_requests specs. Temporary fix specs running bug through file rename. Refs #161
2012-02-24 19:27:54 +04:00
konstantin.grabar
45905babd8
[refs #123 ] Add lost notification locales
2012-02-24 15:51:30 +04:00
konstantin.grabar
395fb812a6
[refs #123 ] Move notifications locales into another file
2012-02-24 15:34:23 +04:00
Alexander Machehin
9e5e7cd5e4
[refs #194 ] labels manage
2012-02-23 20:48:46 +06:00
George Vinogradov
6fe88ed69d
[issue #195 ] Merge branch '195-new_design_for_projects' of github.com:warpc/rosa-build into 195-new_design_for_projects
...
Conflicts:
app/presenters/git_presenters/commit_as_message_presenter.rb
2012-02-23 02:16:20 +04:00
George Vinogradov
43b7ccd3dc
[issue #195 ] Added blob show. Some changes.
2012-02-23 02:11:55 +04:00
konstantin.grabar
ba1798fd71
[refs #195 ] Add design to form and edit page
2012-02-22 21:48:37 +04:00
konstantin.grabar
b99a7d5aa9
[refs #193 ] Move wiki locales to another file
2012-02-22 16:11:40 +04:00
Pavel Chipiga
5b29de93af
Refactor platform clone controller and routes. Refactor and fix clone process for platform, repository, product. Place XML RPC clone request to DJ. Refs #207
2012-02-21 23:27:11 +02:00
Alexander Machehin
ecb29d1762
[refs #194 ] tags -> labels
2012-02-22 02:28:04 +06:00
George Vinogradov
85f3d956f5
[issue #195 ] Merge branch '203-feed_message' into 195-new_design_for_projects
...
Conflicts:
app/views/layouts/application.html.haml
2012-02-21 19:42:30 +04:00
Alexander Machehin
0ce76207af
[refs #194 ] Add issue tags
2012-02-21 00:41:40 +06:00
Alexander Machehin
5dcc4eabf8
[refs #194 ] tracker without tags manage
2012-02-20 22:54:45 +06:00
konstantin.grabar
2b675c6f84
[refs #193 ] Fix routes regex for wiki compare
2012-02-20 13:56:09 +04:00
George Vinogradov
edc8774387
[issue #203 ] Some layout changes & presenters.
...
* Fixed bugs in layout
* Fixed typos
* Fixed bugs in JS
* Added universal partial _feed_message.html.haml
* Added presenters
* Added CommitAsMessage presenter, that prepares Grit::Commit
to be shown as message.
2012-02-19 02:47:57 +04:00
Pavel Chipiga
3347a74653
Refactor bluepill deploy recipies. Restart DJ through bluepill. Refs #196
2012-02-17 16:32:03 +02:00
konstantin.grabar
d9025b093f
[refs #193 ] Compare routes repair and compare design
2012-02-17 18:12:05 +04:00
Vladimir Sharshov
3d7b6ea9d6
[Refs#196] Update text message for empty text[en]
2012-02-16 23:10:58 +04:00
Vladimir Sharshov
6a08704866
[Refs#196] Update text message for empty text[ru]
2012-02-16 23:08:54 +04:00
Pavel Chipiga
689d15f9fd
Change blank repo message. Refs #196
2012-02-16 20:23:49 +02:00
Alexander Machehin
55379ed9c8
[refs #194 ] first steps
2012-02-16 00:53:58 +06:00
George Vinogradov
2b170fcbf1
Fixed default host in mailer
2012-02-15 22:02:47 +04:00
Alexander Machehin
fab80d97eb
[refs #194 ] project submenu partial
2012-02-15 22:32:26 +06:00
konstantin.grabar
00e2043f51
Change nginx log rotate period to 1 day
2012-02-15 14:37:27 +04:00
Pavel Chipiga
02478f5451
Merge branch 'master' into 96-upgrade_rails
2012-02-14 14:05:27 +02:00
Pavel Chipiga
7bca61c58d
Fix cancan regsiter_requests specs. Temporary fix specs running bug through file rename. Refs #161
2012-02-14 13:50:01 +02:00
konstantin.grabar
5039907431
Merge branch 'master' into 123-activity-feed
2012-02-14 14:30:27 +04:00
Pavel Chipiga
7d74b0af13
Merge branch 'master' into 96-upgrade_rails
...
Conflicts:
Gemfile
Gemfile.lock
app/models/group.rb
app/views/layouts/application.html.haml
db/schema.rb
public/stylesheets/git/style.css
2012-02-14 02:14:03 +02:00
George Vinogradov
99c314fb11
[issue #133 ] Merge branch 'master' into 133-editing_from_web
...
Conflicts:
db/schema.rb
2012-02-13 21:48:40 +04:00
Pavel Chipiga
704c544cbc
Add more register_requests fields, change design. Apply invitation mail sending. Refactor. Refs #174
2012-02-10 18:33:16 +02:00
George Vinogradov
d0fe7f55d5
[issue #174 ] added static pages and some changes
2012-02-10 02:57:43 +04:00
George Vinogradov
ce39cdd04f
[issue #174 ] A half of work to create invitations system
2012-02-09 21:46:23 +04:00
George Vinogradov
2160f3aa66
[issue #133 ] Added translations
2012-02-09 04:28:39 +04:00
Pavel Chipiga
7223b7deb9
Upgrade rails, devise, delayed_jobs and other gems. Fix dependencies. Apply assets pipeline, add to deploy. Refactor and cleanup Gemfile. Fix after upgrade bugs. Redo commentable_id from string to decimal. Refactor and code cleanup. Apply basic new design. Refactor main template. Automate menus. Improve translations. Refs #96
2012-02-09 01:46:25 +02:00
George Vinogradov
74d401d087
[issue #133 ] Writed draft of web editing.
2012-02-08 21:51:30 +04:00
konstantin.grabar
96d3b35bdf
[refs #123 ] Merge master into 123-activity-feed
2012-02-06 19:46:32 +04:00
Alexander Machehin
70346f0015
[refs #151 ] refactoring
2012-02-06 20:12:33 +06:00
George Vinogradov
f2bfcf8699
[issue #151 ] Probably fixed.
2012-02-05 00:12:37 +04:00
Vladimir Sharshov
72a6edd86b
Fix missing localization[Refs #64 , Refs #139 ]
2012-02-03 01:47:35 +04:00
Vladimir Sharshov
26923740ad
Hot fix for en yml
...
Add new schema.rb
2012-02-03 01:30:08 +04:00
Vladimir Sharshov
06fa8f489f
Return original translation
2012-02-03 01:14:41 +04:00
Vladimir Sharshov
4165b188eb
Merge branch 'master' into 64-project_wiki
...
Conflicts:
app/models/project.rb
config/locales/en.yml
2012-02-03 00:55:16 +04:00
Alexander Machehin
20613ba2c3
[refs #64 ] All pages:
2012-02-02 01:36:56 +06:00
Vladimir Sharshov
8562b882da
Merge pull request #136 from warpc/114-comment_notifications
...
Notifications and subscribtions about new comments in commit [Refs #114 ]
2012-02-01 11:12:24 -08:00
George Vinogradov
d0717c8f9e
[issue #64 ] Merge branch 'master' into 64-project_wiki
...
Conflicts:
Gemfile.lock
db/schema.rb
2012-02-01 22:39:04 +04:00
George Vinogradov
b117ec1331
[issue #64 ] Yet another hacks.
2012-02-01 22:33:53 +04:00
Vladimir Sharshov
92a8e591de
Merge pull request #142 from warpc/127-build-lists-filter-refactor
...
[Done #127 ] Reduced the query string for monitoring page
2012-02-01 10:18:11 -08:00
konstantin.grabar
502f06b65f
[refs #127 ] Make route more short
2012-02-01 22:13:42 +04:00
konstantin.grabar
0559f1b678
[refs #127 ] Filter request refactor
2012-02-01 20:00:19 +04:00
Vladimir Sharshov
25bea5ae31
Update IP for iso build client
2012-02-01 14:54:58 +04:00
George Vinogradov
8733c4dc34
[issue #64 ] Some dirty hacks.
...
Diff for file with russian name don't work yet.
2012-02-01 03:20:42 +04:00
George Vinogradov
6f78e5456c
[issue #64 ] Changes for ruby 1.9.3 compatibility.
2012-01-31 20:40:46 +04:00
Alexander Machehin
f15cb90b87
Merge branch 'master' into 114-comment_notifications
...
Conflicts:
config/locales/ru.yml
2012-01-31 21:42:37 +06:00
George Vinogradov
24124766f4
[issue #64 ] Merge branch 'master' into 64-project_wiki
...
Conflicts:
Gemfile.lock
config/locales/en.yml
db/schema.rb
2012-01-31 02:07:11 +04:00
Pavel Chipiga
13780a1b53
Add magic encodings. Refs #95
2012-01-30 22:39:34 +02:00
Pavel Chipiga
33dce21312
Upgrade to ruby 1.9.3 and fix bugs. Fix bug with commit_hash save during project build. Move some russian text to yml. Code cleanup. Fix templates, deploy and import scripts. Fix specs. Translate event_logs. Refs #95
2012-01-30 22:36:58 +02:00
George Vinogradov
2f315f869d
[issue #64 ] Merge branch 'master' into 64-project_wiki
...
Conflicts:
Gemfile.lock
app/models/project.rb
db/schema.rb
2012-01-30 13:27:22 +04:00
Alexander Machehin
5efaca77cf
Merge branch 'master' into 114-comment_notifications
...
Conflicts:
app/models/project.rb
app/views/user_mailer/new_comment_notification.en.haml
app/views/user_mailer/new_comment_notification.ru.haml
app/views/user_mailer/new_comment_reply_notification.ru.haml
config/locales/devise.en.yml
config/locales/en.yml
config/locales/ru.yml
db/schema.rb
2012-01-30 13:06:06 +06:00
Alexander Machehin
e0b7699ffd
Revert "Merge branch '114-comment_notifications' into user-emails-list"
...
This reverts commit 2179cbbf40334cbe5d4fa9ba3a7f297d8f543a0a, reversing
changes made to 9bf06e5e1a595f320dc4527ebd44f14be05fcd64.
Conflicts:
app/models/user.rb
2012-01-30 12:22:54 +06:00
Alexander Machehin
f6b6bbfb54
Revert "[refs #114 ] emails control"
...
This reverts commit 26fb1fcbfb843163231d8b8f0caf582bafccbe57.
Conflicts:
app/models/subscribe.rb
app/models/user.rb
spec/models/comment_for_commit_spec.rb
2012-01-30 12:19:54 +06:00
Alexander Machehin
dc39eefe62
Revert "[refs #114 ] add js"
...
This reverts commit 48a9c4d50b9f11a11cc4f2c5831c4b5b25fdc4d1.
2012-01-30 12:16:09 +06:00
George Vinogradov
706c052a5e
[issue #64 ] User names are clickable.
2012-01-29 22:03:42 +04:00
George Vinogradov
12ceace1f1
[issue #64 ] Fixed some localization typos.
2012-01-28 16:15:09 +04:00
George Vinogradov
acdd1f22b6
[issue #64 ] Fixed bug with revert all wiki.
2012-01-28 16:10:43 +04:00
Pavel Chipiga
205320c200
Fix log path. Refs #112
2012-01-28 05:09:39 +02:00
Pavel Chipiga
43a4aecc66
Change indexes to composite, unique, case insensitive. Redo sync logging. Verbose params for tasks. Refs #112
2012-01-28 04:05:31 +02:00
Pavel Chipiga
fab4aa6eb6
Refactor and fix projects by_name scope. Apply case insensitive projects, repositories and platforms name uniqness validation. Apply case insensitive project search fallback. Redirect import task outnput to log file. Rename all task. Refs #112
2012-01-28 03:04:11 +02:00
Vladimir Sharshov
0c0e131c98
Add pid path for new relic monitoring service
2012-01-28 03:06:08 +04:00
Vladimir Sharshov
09e5a1e4d6
Add NewRelic monitoring to autostart and watching
2012-01-28 02:56:52 +04:00
George Vinogradov
9caf496454
[issue #64 ] Added missing translations.
2012-01-27 20:48:48 +04:00
Vladimir Sharshov
e966e523e9
Merge pull request #132 from warpc/112-sync_projects
...
Auto sync for mandriva repo
* Apply rsync for mandriva repo
* Parse and import changes from official repo
* Fix attachment types
* Redo srpm upload wrapper to use it without paperclip
* Add cron task through whenever
2012-01-27 08:46:58 -08:00
Pavel Chipiga
74f891fc83
Apply rsync for mandriva repo. Parse and import changes from official repo. Fix attachment types. Redo srpm upload wrapper to use it without paperclip. Add cron task through whenever. Refs #112
2012-01-27 17:35:18 +02:00
konstantin.grabar
e01fe571b4
[refs #123 ] Add activity feed en translation fixes
2012-01-27 18:59:28 +04:00
George Vinogradov
549f0a55e8
[issue #64 ] Merge branch 'master' into 64-project_wiki
...
Conflicts:
Gemfile.lock
app/models/project.rb
app/models/user.rb
app/views/projects/_form.html.haml
config/locales/ru.yml
db/schema.rb
2012-01-27 18:27:23 +04:00
Alexander Machehin
06ab99a1d0
[refs #114 ] add js
2012-01-27 18:20:07 +06:00
konstantin.grabar
72fd821bc8
[refs #123 ] Add fixes for activity feed
2012-01-27 16:06:04 +04:00
George Vinogradov
eed3040944
[issue #64 ] Changed validation message and removed unnecessary
...
validation of projects owner.
2012-01-27 10:13:56 +04:00
George Vinogradov
2d1e36fb1a
[issue #64 ] Changed own_projects validation.
2012-01-27 04:16:07 +04:00
Alexander Machehin
e71a9e84cb
[refs #114 ] emails control
2012-01-27 02:11:07 +06:00
konstantin.grabar
0eb0eb9713
[refs #123 ] Activity Feed logic global refactoring.
2012-01-26 21:04:58 +04:00
Vladimir Sharshov
c529e63c96
Merge pull request #122 from warpc/105-internationalization
...
[refs #105 ] Fix devise translations
2012-01-26 08:06:34 -08:00
Alexander Machehin
e04b2eb59b
Merge branch '114-comment_notifications' into user-emails-list
...
Conflicts:
app/models/subscribe.rb
config/locales/en.yml
2012-01-26 14:55:16 +06:00
Alexander Machehin
77420d2a8f
[refs #114 ] user emails
2012-01-26 14:53:40 +06:00
konstantin.grabar
dd1493d677
[refs #123 ] Add activity feed page. Remove some unnessary code. Some logic fixes.
2012-01-25 17:05:39 +04:00
konstantin.grabar
990a46018c
[refs #123 ] Add base logic for activity feed
2012-01-25 12:31:49 +04:00
Vladimir Sharshov
11f5305bec
Merge pull request #126 from warpc/112-sync_projects
...
Add feature #126 : import SRPM package in web
2012-01-24 13:39:46 -08:00
Vladimir Sharshov
9e8c8efc80
Merge pull request #125 from warpc/124-fix-device-locale
...
[refs #124 ] Add missing translation
2012-01-24 12:59:49 -08:00
George Vinogradov
45877e8b5c
[issue #64 ] Bug fix & views refactoring
...
* Fixed bug with history
* Navigation moved to partial.
2012-01-25 00:47:55 +04:00
Pavel Chipiga
bdb31b4e13
Fix locale. Refs #31
2012-01-24 22:42:16 +02:00
Pavel Chipiga
3f4bf65825
Upgrade paperclip. Apply srpm_import script and UI. Fix specs. Refs #31
2012-01-24 22:35:36 +02:00
Alexander Machehin
61be317b21
[refs #114 ] i18n
2012-01-25 01:00:51 +06:00
Alexander Machehin
0f06d4f627
[refs #124 ] Add missing translation
2012-01-25 00:18:16 +06:00
Vladimir Sharshov
2a20b51c19
Fix deploy: "DJ does not restart and create many new instances"
2012-01-24 02:24:12 +04:00
Alexander Machehin
9127b6b689
[refs #114 ] changed logics
2012-01-24 01:42:54 +06:00
Vladimir Sharshov
c3f415e90c
Add new build status for Item
2012-01-23 22:11:53 +04:00
George Vinogradov
230c25eefd
[issue #64 ] Some changes.
...
* WikiController#compare splitted into WikiController#compare
and WikiController#compate_wiki
* Show only last 30 versions in history.
2012-01-23 16:45:38 +04:00
Vladimir Sharshov
7d2d080af5
Fix localization [ Refs #105 ]
2012-01-23 16:11:17 +04:00
Alexander Machehin
06a977ea21
Merge branch 'master' into 114-comment_notifications
2012-01-20 22:03:04 +06:00
George Vinogradov
23573a1a07
[issue #64 ] Added creation wiki to project.
2012-01-20 19:10:30 +04:00
George Vinogradov
011efb0c4b
[issue #64 ] Added git access to Wiki.
2012-01-20 19:01:59 +04:00
konstantin.grabar
e3a716b7db
[refs #105 ] Fix some translations
2012-01-20 15:29:32 +04:00
George Vinogradov
364f2e40c0
[issue #64 ] Added Wiki history, compare, revert.
2012-01-20 03:25:15 +04:00
Vladimir Sharshov
59c7faf5c1
Fix localization file (here was dragons!)
2012-01-20 02:07:42 +04:00
Vladimir Sharshov
25bd2cd13d
Fix for localization files
2012-01-20 00:33:28 +04:00
Vladimir Sharshov
3206258f7b
Change default locale to English
2012-01-20 00:06:43 +04:00
Vladimir Sharshov
a5c2bcdd85
Fix email host address
2012-01-20 00:06:09 +04:00
Pavel Chipiga
b5f0124f91
Add pids symlink generation task. Refs #110
2012-01-19 21:21:15 +02:00
Alexander Machehin
800b02f544
[refs #18 ] Add project subsribe, tests
2012-01-20 00:20:03 +06:00
Vladimir Sharshov
5a6f5b51c0
Upgrade capistrano receipts:
...
* add application env files;
* remove unused ui deploy;
* clear main deploy config.
2012-01-19 20:20:30 +04:00
George Vinogradov
54bc26d960
[issue #64 ] Added translations.
2012-01-19 18:37:36 +04:00
George Vinogradov
0c527af291
[issue #64 ] Added revisions comparsion.
2012-01-19 17:49:32 +04:00
George Vinogradov
538e3da8c8
[issue #64 ] Added search through wiki
2012-01-19 16:10:50 +04:00
George Vinogradov
022a013b79
[issue #64 ] Added Wiki seeding on create.
2012-01-19 16:06:27 +04:00
Alexander Machehin
3994abd6ed
[refs #105 ] fix
2012-01-19 15:53:19 +06:00
Vladimir Sharshov
14fdc35eb9
Add english localization. Refs #105
2012-01-19 13:34:05 +04:00
Alexander Machehin
71447a29e3
[refs #114 ] add settings for commits notifications
2012-01-19 00:20:08 +06:00
George Vinogradov
2af0135fb5
[issue #64 ] Added All Pages representation.
2012-01-18 19:09:25 +04:00
George Vinogradov
8a1486664f
[issue #64 ] Fixed typo
2012-01-18 18:19:52 +04:00
Pasha
4ba268dd67
Merge pull request #109 from warpc/18-commit_comments
...
18 commit comments
2012-01-18 05:49:57 -08:00
George Vinogradov
2522dd3c63
[issue #64 ] Added page history views.
2012-01-18 03:30:54 +04:00
George Vinogradov
51e9b5d1f6
[issue #64 ] Some changes in views and routes.
2012-01-18 02:28:59 +04:00
konstantin.grabar
bbbf17c2b4
[refs #105 ] Merge master with 105-internationalization
2012-01-17 17:58:49 +04:00
konstantin.grabar
726eddc40e
[refs #105 ] Add internationalization support to project
2012-01-17 15:48:40 +04:00
Pavel Chipiga
fab62c548f
Hide container_path if build_list published. Cleanup translations. Refs #100
2012-01-17 13:04:50 +02:00
Alexander Machehin
bf4e4f02ed
Right merge branch 'master' into 18-commit_comments
...
Conflicts:
app/controllers/comments_controller.rb
app/views/comments/edit.html.haml
app/views/issues/show.html.haml
db/schema.rb
2012-01-17 15:52:46 +06:00
George Vinogradov
62922c30a3
[issue #64 ] Added search partial.
2012-01-17 04:05:07 +04:00
George Vinogradov
1e1dab369b
[issue #64 ] Added some views, styles and scripts.
...
* Added base gollum styles
* Added base gollum javascripts (with minor changes)
* Fixed some bugs in WikiController
* Added some views (draft yet)
2012-01-17 01:48:38 +04:00
konstantin.grabar
52696791f2
[refs #54 , #94 ] Merge master into issues
2012-01-16 13:42:44 +04:00
Alexander Machehin
794c55a030
Merge branch 'master' of github.com:warpc/rosa-build into 18-commit_comments
2012-01-13 22:01:30 +06:00
konstantin.grabar
db0a66846b
[refs #94 ] Add new notifier rules. Fix some issues and comments bugs
2012-01-13 19:07:01 +04:00
George Vinogradov
729bd94045
[issue #64 ] Merge branch 'master' into 64-project_wiki
...
Conflicts:
config/routes.rb
db/schema.rb
2012-01-13 18:05:42 +04:00
George Vinogradov
0751a94974
[update #76 ] Merge branch 'master' into 76-project_autocomplete
...
Conflicts:
app/views/layouts/_stylesheets.html.haml
2012-01-12 20:43:32 +04:00
George Vinogradov
73b710ae4e
[ close #76 ] Changed styles. Fixed bug with pagination.
2012-01-12 20:37:50 +04:00
Alexander Machehin
636c90e6e4
[refs #18 ] add some I18n
2012-01-12 20:27:45 +06:00
Alexander Machehin
07dc7a4800
[refs #18 ] add comments to commit
2012-01-12 17:19:22 +06:00
konstantin.grabar
2b8aca5f09
[refs #54 ] Add settings notifier
2012-01-11 17:58:13 +04:00
George Vinogradov
7c50b2c3f5
[issue #76 ] Added jQuery DataTable. But it doesn't work yet
2011-12-31 02:42:58 +04:00
konstantin.grabar
a44530980e
[refs #54 ] Remove some unnessacary comments
2011-12-30 18:44:47 +04:00
konstantin.grabar
e8977a7d95
Merger issues with master
2011-12-30 18:23:16 +04:00
Pavel Chipiga
acb970686c
Apply auto_publish for build_lists. Apply publish build_list error status. Remove circle build info. Display auto_publish info. Fix bugs. Refactor. Apply specs for all build_lists core callbacks. Refs #72
2011-12-29 04:37:34 +02:00
konstantin.grabar
fa8656d1f5
[refs #54 ] Refactor subscires routes and authorize
2011-12-28 17:54:45 +04:00
konstantin.grabar
1c263c6e0a
[refs #54 ] Notification DJ support. Routes fixes.
2011-12-28 14:47:54 +04:00
konstantin.grabar
a783b460bd
Merge issues with master
2011-12-28 13:22:57 +04:00
Pavel Chipiga
5e3addd5d2
Great refactor for cancan abilities. Remove product relations. Fix git abilities. Fix and refactor specs. Refs #85 . Refactor issues controller to avoid serial_id problem. Fix links and routes. Fix minor bugs and translations. Fix specs. Refs #54
2011-12-28 04:59:05 +02:00
konstantin.grabar
d3ba83135e
[refs #54 ] Add some locales and interface fixes for issues
2011-12-27 17:18:25 +04:00
konstantin.grabar
8face9208e
[refs #54 ] Add fixes and locales to subscribes
2011-12-27 16:35:31 +04:00
George Vinogradov
ec95373d28
[#issue 64] Routes to Wiki and some methods in controller.
...
Useless yet.
2011-12-26 21:07:16 +04:00
konstantin.grabar
ce6746f7a9
[refs #54 ] Add subscribes and notifications
2011-12-26 19:48:57 +04:00
konstantin.grabar
5237939f49
Merge issues with master
2011-12-26 13:26:13 +04:00
konstantin.grabar
bf2f3d1bc7
[refs #54 ] Add issue statuses filters
2011-12-23 18:34:32 +04:00
Pavel Chipiga
a82f59f35a
Add route, action and statuses for publish_build. Apply status assign and check. Localize statuses. Convert tabs to spaces. Refs #80
2011-12-22 02:53:55 +02:00
Pavel Chipiga
2c67843c34
Refactor and cleanup build_lists controller and routes. Rename methods. Allow deffis in platform and repository name. Add missing relation and migration to force work user assign in build_lists. Fix and simplify links. Abstract sidebar. Refs #65
2011-12-21 23:42:06 +02:00
Pavel Chipiga
a61d211862
Fix bugs. Change included_repos format. Refs #65
2011-12-21 20:59:19 +02:00
Pavel Chipiga
e588482f32
[ #74 ] Merge branch 'master' into 65-build_repo
...
Conflicts:
app/controllers/build_lists_controller.rb
app/controllers/projects_controller.rb
db/schema.rb
2011-12-21 20:13:57 +02:00
konstantin.grabar
3ab55d34b8
[refs #54 ] Add CanCan rules for issues and comments. Fix serial_id routes and some actions
2011-12-21 18:48:16 +04:00
Pavel Chipiga
d901426b79
Move project build functinality to build_lists controller. Refactor downloads url - create model based methods for url genertion. Cleanup code. Add includeed_repos functionality. Display included_repos on build_list page. Refs #65
2011-12-21 16:01:50 +02:00
George Vinogradov
6c48e058be
[ close #70 ] Removed all & filter methods in BuildListsController
...
* Removed methods
* Changed abilities
* Changed routes
* Added specs
2011-12-21 05:30:34 +04:00
George Vinogradov
39dade9945
[ closed #63 ] Added user column to build_list.
2011-12-20 21:09:29 +04:00
konstantin.grabar
375c98366f
[ref #54 ] Add has_issue settings to projec edit. Fix routes and friendly_id bug. Fix some moments
2011-12-20 20:57:34 +04:00
konstantin.grabar
446cdac8e6
[refs #54 ] Add new locales. Fix routes. Fix issues and comments update
2011-12-20 14:20:00 +04:00
konstantin.grabar
d20d43eb2b
[refs #54 ] Base logic and templates for issues and comments to them
2011-12-19 19:30:14 +04:00
konstantin.grabar
58cfe07124
[refs #56 ] Change project build page title
2011-12-16 11:59:34 +04:00
konstantin.grabar
b3f422e713
[refs #32 ] Add user filter
2011-12-15 20:15:25 +04:00
Pavel Chipiga
f1465f51ca
Merge branch 'master' into 1-bluepill
...
Conflicts:
app/controllers/platforms_controller.rb
app/models/platform.rb
2011-12-14 23:51:31 +02:00
George Vinogradov
1b3e473b94
[ closed #20 ] Changed adding collaborators to project
...
Changed collaborators page of project:
* Added form to input group and/or project nickname.
* In tables show only projects/groups that already added to project
2011-12-14 19:52:47 +04:00
Pavel Chipiga
c0b3350a2f
Re-set correct rails env for DJ one more. Refactor. Refs #1
2011-12-14 16:47:32 +02:00
Pavel Chipiga
54df702223
Re-set correct rails env for DJ again. Refs #1
2011-12-14 15:51:39 +02:00
Pavel Chipiga
af2f2b4819
Re-set correct rails env for DJ. Refs #1
2011-12-14 15:46:41 +02:00
Pasha
2edf0ad172
Merge pull request #44 from warpc/tuning_monitoring_view
...
Tuning monitring view
2011-12-14 05:34:34 -08:00
Pavel Chipiga
ae7cc892f7
Set correct rails env for DJ. Refs #1
2011-12-14 15:24:58 +02:00
Vladimir Sharshov
7614d027a6
Reordered search by id and name;
...
Change localization for project_name_search.
Fix wrong label for field
2011-12-14 17:11:40 +04:00
Pavel Chipiga
31bd8d799f
Fix ENV var syntax. Fix autostart. Refs #1
2011-12-14 15:04:16 +02:00
Pavel Chipiga
326fe3f998
Use absolute PID path. Ignore errors if bluepill is not runing. Refs #1
2011-12-14 14:34:44 +02:00
Vladimir Sharshov
9ab07c1675
Merge pull request #36 from warpc/platform_edit
...
Edit platform;
Added callback updates with new owner.
Added a button for call edit action;
Removed unnecessary to edit platform form field when you upgrade.
2011-12-14 03:15:41 -08:00
Pavel Chipiga
3379419eae
Run bluepill as user. Fix configs. Refs #1
2011-12-14 13:06:56 +02:00
Vladimir Sharshov
1d55e8758e
Merge pull request #26 from warpc/platform_admin_fixes
...
Fix autocomplete. Rsync stubs for development env. Blocked problematic validation for development env
2011-12-14 02:00:01 -08:00
Pavel Chipiga
045b8441f6
Apply basic bluepill configuration, write capistrano recipe for it. Change deploy logic to integrate with bluepill. Refactor unicorn config. Cleanup depoy. Refactor mount_downloads script. Write autostart script. Remove old scripts. Refactor platform mount/umount methods. Fix bugs. Refs #1
2011-12-13 23:48:25 +02:00
konstantin.grabar
4a723369a2
[refs #12 ] Add platform update options
2011-12-13 17:27:27 +04:00
santaux
24766d2383
Merge pull request #14 from warpc/group_members_change
...
Changed adding members to group.
2011-12-13 02:16:37 -08:00
Vladimir Sharshov
842a74d000
#24 . Fix translation missing: ru.layout.build_lists.items.statuses.build_started
2011-12-12 21:03:13 +04:00
George Vinogradov
5815ef46ec
Merge pull request #25 from warpc/24-update_build_status
...
24 update build status
2011-12-12 07:54:33 -08:00
konstantin.grabar
6a364b73a6
[refs #12 ] Fix platform admin relations. Locales correction. Add validationa and rsync stubs.
2011-12-12 18:10:39 +04:00
Vladimir Sharshov
55c41ca306
Fix mistake in dependency_test_failed
2011-12-12 16:49:15 +04:00
Vladimir Sharshov
cf18550cfb
#24 . Add new statuses and remove repetition
2011-12-12 16:34:20 +04:00
George Vinogradov
5c07046dac
[updated #16 ] Fixed localization fauldnames.
2011-12-11 22:50:55 +04:00
George Vinogradov
d2831da4b8
Issue #11 updated. Added check if user already added.
2011-12-10 21:26:57 +04:00
George Vinogradov
168e110169
[ close #11 ] Changed adding members to group.
2011-12-10 03:40:13 +04:00
Vladimir Sharshov
5e3711505c
Merge pull request #5 from warpc/build_lists_filter
...
New build lists filter (search by name and bs_id)
2011-12-08 14:17:03 -08:00
konstantin.grabar
0f855356ac
[refs #6 ] Add sudo mount fixes. Rename ID Admin fields into platform form
2011-12-09 00:41:01 +04:00
Pavel Chipiga
0ca7c5d451
Rename bs_id label and key. Stub XML RPC to raise exception and fix spec. Write specs for build_lists filters. Refs #2
2011-12-08 20:51:25 +02:00
George Vinogradov
8e97f4e23d
fixed #3 . Changed locale for Group.uname and User.uname
2011-12-08 20:13:11 +04:00
Vladimir Sharshov
dc95df1073
Merge pull request #9 from warpc/groups_repositories_fixes
...
Fixed bug with duplicate relations and removed unnecessary routes and views part in users and groups, close #4
2011-12-08 07:10:38 -08:00
George Vinogradov
603e4b3691
fixed #4 . Removed unnecessary routes and views parts.
2011-12-08 18:47:18 +04:00
konstantin.grabar
25f06edb65
Downloads and Rsync mount with sudo refactor
2011-12-08 11:44:02 +04:00
Pavel Chipiga
b89416e125
Add project name and bs_id filters for the build_lists list. Refactor and code cleanup to close #2
2011-12-08 00:46:01 +02:00
Pavel Chipiga
6794ca42fb
Fix date filter normalization. Add build, freeze, unfreeze confirmation. Refs #2261
2011-12-07 02:09:04 +02:00
Pavel Chipiga
6639e8d7dc
Do not use cron for limited stages. Refs #2261
2011-12-07 00:21:31 +02:00
Vladimir Sharshov
59a90e6136
Test sudo options
2011-12-07 01:26:44 +04:00
Pavel Chipiga
3ab92c0281
Fix more configs. Refs #2261
2011-12-06 21:33:35 +02:00
Pavel Chipiga
7e05c5b385
Improve and fix configs. Refs #2261
2011-12-06 20:35:46 +02:00
Pavel Chipiga
18b9f7c51e
Fix deploy options. Refs #2261
2011-12-06 16:52:31 +02:00
Pavel Chipiga
04a17cb691
Redo deploy to work multistage on same host. Add ui and pingwinsoft stages, Refactor deploy. Refactor XML RPC stub. Apply nginx config generation script. Fix scripts. Cleanup code and config. Refs #2261
2011-12-06 16:45:20 +02:00
Pavel Chipiga
2bee3bd25d
Code cleanup. Redo deploy to unicorn. Refs #2261
2011-12-05 21:34:26 +02:00
Pavel Chipiga
37e7f757d9
Benchmark nginx upload module and save docs/configs. Turn off upload module temporary. Replace passenger to unicron, tune. Remove compass dependency to avoid deprecation message. Remove rake deprecation message. Tune import script. Refs #2261
2011-12-05 20:28:55 +02:00
George Vinogradov
2f5ce7cebe
Merge branch 'groups_reincarnation' into staging
...
Conflicts:
app/models/ability.rb
app/models/project.rb
config/environments/production.rb
2011-12-05 17:16:32 +04:00
George Vinogradov
9cc820080b
Groups base functional.
2011-12-05 16:32:18 +04:00
Pavel Chipiga
0af32351a2
Redo paperclip file upload through nginx upload module. Refs #2261
2011-12-03 02:52:19 +02:00
Pavel Chipiga
301cdb2ca2
Mount all downloads script. Tune and test unicorn uploads. Refs #2261
2011-12-02 15:52:34 +02:00
konstantin.grabar
ac61b5efa3
Add tmp symlink to deploy.rb
2011-12-02 17:26:46 +04:00
Pavel Chipiga
d7c9452efa
Update gems. Redo exception catch for BuildServer.get_status. Write specs. Experiments with large file uploads. Refs #2261
2011-12-02 03:30:25 +02:00
konstantin.grabar
96d4886f49
[refs #2249 ] Add new ACL relations
2011-12-01 18:20:24 +04:00
konstantin.grabar
6d8e4f98b9
[refs #2249 ] Some ACL changes
2011-12-01 13:29:04 +04:00
Pavel Chipiga
e45ba6692a
Rename delete_build_list to cancel_build_list. Rescue XML get_status exception. Refs #2261
2011-12-01 00:55:47 +02:00
George Vinogradov
81e290a9b3
Merge branch 'groups_reincarnation' of github.com:warpc/rosa-build into groups_reincarnation
2011-11-30 19:28:56 +04:00
George Vinogradov
f154ccc132
Fixed groups creation.
2011-11-30 19:27:19 +04:00
konstantin.grabar
438bedd226
Add build all btn to platforms
2011-11-30 18:48:50 +04:00
Pavel Chipiga
4f46b82914
Fix bugs after renaming unixname to name. Refs #2261
2011-11-30 15:55:59 +02:00
Pavel Chipiga
6a3c0cec6c
Rollback last changes and fix deploy script. Refs #2261
2011-11-30 15:55:59 +02:00
Pavel Chipiga
3bc2ff894c
Improve and fix project fork functionality. Fix project create and validation. Add user role display. Add user role at user edit form. Refs #2261
2011-11-30 15:55:59 +02:00
George Vinogradov
7023dda7e0
First iteration of groups refactoring.
2011-11-30 16:58:14 +04:00
Pavel Chipiga
0134f4adf9
Fix bugs after renaming unixname to name. Refs #2261
2011-11-30 01:41:12 +02:00
Pavel Chipiga
43eb873b70
Rollback last changes and fix deploy script. Refs #2261
2011-11-30 00:23:09 +02:00
Pavel Chipiga
c4a31e3d29
Improve and fix project fork functionality. Fix project create and validation. Add user role display. Add user role at user edit form. Refs #2261
2011-11-29 23:42:58 +02:00
Pavel Chipiga
796ff75857
Great models refactoring. Refactor some cancan abilities and controllers authorization. Move some common parts to modules. Fix lots bugs. Remove unused files and code. Drop ACL tables. Add more can? helpers. Refs #2249
2011-11-24 23:48:58 +02:00
Pavel Chipiga
141fe7677f
Apply project fork button. Refactor and cleanup code. Refs #2243
2011-11-23 17:52:33 +02:00
konstantin.grabar
fc3c6a05c9
[refs #2249 ] CanCan tests
2011-11-22 23:21:31 +04:00
konstantin.grabar
ba77244b02
[refs #2249 ] Some rules and roles fixes
2011-11-22 23:21:31 +04:00
Pavel Chipiga
4bd9b81f65
Change default_url_options settings. Stub brutal hack. Refs #2261
2011-11-22 20:47:45 +02:00
Pavel Chipiga
165b146787
Improve grack wrapper. Fix settings to work in production. Code cleanup. Refs #2243 , #2261
2011-11-22 20:14:27 +02:00
Pavel Chipiga
1cbd725e14
Fix mailer domains. Fix projects import script. Refs #2261
2011-11-22 15:01:33 +02:00
Pavel Chipiga
078c9f7e2f
Fix scripts. Refs #2261
2011-11-21 23:59:56 +02:00
Pavel Chipiga
366ca320e0
Change and fix role assign logic and abilities. Other minor fixes. Refs #2261
2011-11-21 21:06:34 +02:00
konstantin.grabar
140eaf6265
[refs #2249 ] Remove old roles managment system
2011-11-21 21:43:37 +04:00
Pavel Chipiga
211ae3f9c6
Fix deploy script. Refs #261
2011-11-21 15:33:27 +02:00
konstantin.grabar
5e7ded2e93
[refs #2249 ] Remove custom ACL from project
2011-11-19 16:11:44 +04:00
konstantin.grabar
44191926f7
[refs #2249 ] Some CanCan fixes. Add ru exception message
2011-11-19 15:49:14 +04:00
Pavel Chipiga
d49880f24e
Merge branch 'smart_http' into staging
...
Conflicts:
app/models/relation.rb
app/models/user.rb
2011-11-18 20:35:12 +02:00
konstantin.grabar
7b750a6f93
Merge branch 'cancan' into staging
2011-11-18 22:30:23 +04:00
Pavel Chipiga
4d78ce371f
Merge branch 'master' into staging
...
Conflicts:
app/models/build_list.rb
2011-11-18 20:27:33 +02:00
Pavel Chipiga
a819185ecc
Try to fix deploy. Fix easy_urpmi url. Refs #test_prepare
2011-11-18 14:50:06 +02:00
Pavel Chipiga
3b36943b91
Remove gitolite and it callbacks. Add git repo create, destroy callbacks. Improve grack wrappers: separate read/write requests, ask password for push even for public repo, prepare for cancan, apply hooks, refactor. Fix auto_build_lists order. Refactor auto_build - move to model. Redo git_repo_url. Improve and test project import script. Fix bugs, refactor and cleanup. Refs #2243
2011-11-17 23:57:30 +02:00
konstantin.grabar
4d4f5deed4
[refs #2249 ] Remove bitmask. Add new rules. Add some authorize filters. Add some template can? helpers
2011-11-16 22:45:01 +04:00
Pavel Chipiga
b2be92e4d1
Integrate grack into rails stack. Implement basic http auth for grack. Allow only downcase for uname and unixname. Refactor and code cleanup. Refs #2243
2011-11-15 23:58:27 +02:00
Pavel Chipiga
e7f9d8251a
Rename product field build to build_script. Change links. Refs #2161
2011-11-11 21:12:15 +02:00
Pavel Chipiga
7996740ae7
Improve build_lists time. Apply product build lists basic functionality. Move product build functionality to separate controller. Apply event logging for product build. Fix logging for project build list publishing. Code refactor and cleanup. Refs #2161
2011-11-11 19:13:09 +02:00
konstantin.grabar
8449b5b826
Add BuildList status validation. Change publish logic and btn icon
2011-11-11 14:38:17 +04:00
Pavel Chipiga
fb6b25bc82
Improve multistage deployment - deploy to staging server from staging branch. Refs #2162
2011-11-10 19:02:22 +02:00
Pavel Chipiga
5a2e6441b3
Update roles dump. Refs #2162
2011-11-10 17:18:31 +02:00
Pavel Chipiga
add16d3495
Apply multistage deployment. Refs #2162
2011-11-09 22:15:02 +02:00
Pavel Chipiga
c64f93f6bd
One more fix build_lists#cancel logging. Improve XML RPC stubbing. Refactor. Refs #2161
2011-11-08 00:54:25 +02:00
konstantin.grabar
4b4df620ff
Fix test sudo action
2011-11-03 15:16:17 +04:00
konstantin.grabar
df2f3abe62
[refs #2161 ] Add test sudo action
2011-11-03 14:33:23 +04:00
George Vinogradov
3e2e01deb6
Changed My Projects block
2011-11-03 01:39:50 +04:00
Pavel Chipiga
f5ba1b34f2
Fix repository and personal_repository - add_project add remove_project actions. Fix links. Refactor. Refs #2162
2011-11-02 23:37:19 +02:00
Vladimir Sharshov
f8c0a3a8df
Update description to tar.bz2
2011-11-02 23:38:04 +04:00
Pavel Chipiga
1a0e235167
Add auto_build_lists destroy action. Fix auto_build process. Improve auto_build relations. Refs #2162
2011-11-02 21:18:43 +02:00
George Vinogradov
b048c54004
Added own projects sidebar
2011-11-02 20:22:42 +04:00
konstantin.grabar
4341155771
[refs #2161 ] Change private users and personal repos menus
2011-11-02 16:43:41 +04:00
konstantin.grabar
7b8df283eb
[refs #2161 ] Change regenerate logic for private_users
2011-11-02 14:42:08 +04:00
George Vinogradov
103cb16f27
Added form to set name of platfroms clone
2011-11-02 02:00:44 +04:00
konstantin.grabar
4bda937075
[refs #2161 ] Catalogs fixes
2011-11-02 01:07:32 +04:00
konstantin.grabar
fd5dc9fd01
[refs #2161 ] Small categories fix
2011-11-02 00:56:01 +04:00
konstantin.grabar
2c0422a3bc
[refs #2161 ] Split platforms on three groups
2011-11-02 00:53:48 +04:00
konstantin.grabar
8bec7d6a6b
[refs #2161 ] Change catalogs translate
2011-11-02 00:26:24 +04:00
konstantin.grabar
9c06e35842
[refs #2161 ] Fix downloads message
2011-11-02 00:19:28 +04:00
konstantin.grabar
92011e493b
[refs #2161 ] Add new titles to application
2011-11-02 00:18:52 +04:00
Pavel Chipiga
ee02bc7a4a
Fix category projects counter. Fix git blame links. Stub error when git commit diff is too big. Refs #2162
2011-11-01 20:13:08 +02:00
George Vinogradov
8b23d76a08
Added confirm_clone translation
2011-11-01 20:42:27 +04:00
konstantin.grabar
aca4c4709e
Fix whenever scripts
2011-11-01 18:58:31 +04:00
konstantin.grabar
30411c9868
[refs #2161 ] Comment whenever tasks
2011-11-01 18:39:20 +04:00
konstantin.grabar
e03d711d1b
[refs #2161 ] Global private users and repos fixes
2011-11-01 17:32:50 +04:00
Pavel Chipiga
5c97e89829
Fix gitolito update_key bug. Push project colaborators git. Fix key update. Hide colaborators groups. Improve RPC XML tests. Refactor and code cleanup. Refs #2162
2011-11-01 02:52:24 +02:00
George Vinogradov
dfc507ff59
Fixed some bugs in ACL checks.
2011-11-01 01:55:56 +04:00
konstantin.grabar
84ceb4d802
[refs #2161 ] Update whenever interval
2011-10-31 21:53:37 +04:00
konstantin.grabar
10200a05da
[refs #2161 ] Add whenever to deploy.rb
2011-10-31 21:50:45 +04:00
konstantin.grabar
de959bb527
[refs #2161 ] Add refresh option to statistics
2011-10-31 19:58:04 +04:00
George Vinogradov
7c5b933b90
Fix with roles. Rolled back ActiveRecord::Base modifications
2011-10-31 15:27:58 +04:00
konstantin.grabar
cea94ca0e2
Fix deploy.rb
2011-10-31 14:51:22 +04:00
konstantin.grabar
1480991abd
Change deploy.rb
2011-10-31 14:49:11 +04:00
Vladimir Sharshov
faab978a5e
Fix? for registrations
2011-10-31 14:15:55 +04:00
Pavel Chipiga
afc1d492a8
Add events logging for platform change_visibility action. Improve autobuild events logging. Add events log for private access to hidden repositories. Change owner assign for platform and repository. Improve gitolite doc. Refactor. Refs #2162
2011-10-31 02:13:22 +02:00
George Vinogradov
b9ee6e365b
Added collaborators management.
2011-10-31 02:59:03 +04:00
George Vinogradov
af91843f4d
Changed routes.
2011-10-31 01:52:25 +04:00
George Vinogradov
8924d2e8da
Merge branch 'master' of github.com:warpc/rosa-build
2011-10-31 01:51:50 +04:00
konstantin.grabar
4e9e418c66
[refs #2161 ] Fix some links and save method into personal repos
2011-10-31 00:03:41 +04:00
Vladimir Sharshov
a6be1b4b1c
Update deploy for passenger
2011-10-30 23:32:13 +04:00
Vladimir Sharshov
f54fc40cd9
Merge branch 'master' of github.com:warpc/rosa-build
2011-10-30 20:57:13 +04:00
Pavel Chipiga
0c3a044f81
Fix REXML Exception when using Unicorn or Passenger with XmlRPC. Add XML RPC events logging. Refactor. Improve after_rollback callback. Refs #2162
2011-10-30 18:46:52 +02:00
Vladimir Sharshov
8f742b8b19
Fix missing: ru.activerecord.models.auto_build_list
2011-10-30 18:41:09 +04:00
Vladimir Sharshov
bc23b9d44e
Add support build_canceled status
2011-10-30 17:47:18 +04:00
Vladimir Sharshov
68ae986fde
Merge branch 'master' of github.com:warpc/rosa-build
2011-10-30 17:18:13 +04:00
Vladimir Sharshov
2dc496d096
Fix generate roles
2011-10-30 17:17:52 +04:00
konstantin.grabar
61408e74ef
[refs #2161 ] Small fixes of translates
2011-10-30 16:58:27 +04:00
George Vinogradov
2df54a42bf
changed roles
2011-10-30 14:56:27 +04:00
konstantin.grabar
12727a2149
[refs #2161 ] Add more roles. Fix visibility bug on personal repo page
2011-10-30 14:51:05 +04:00
konstantin.grabar
4b3f138823
[refs #2161 ] Add more rights for personal repos
2011-10-30 14:30:51 +04:00
Vladimir Sharshov
d4ace59672
Add generate_roles task for deploy
2011-10-30 01:21:49 +04:00
konstantin.grabar
30564e8e17
[refs #2161 ] Add auto build lists functional
2011-10-29 23:09:50 +04:00
Vladimir Sharshov
b82320a4cd
Merge branch 'master' of github.com:warpc/rosa-build
2011-10-29 21:51:53 +04:00
Vladimir Sharshov
3e12402245
Update status code for XML-RCP kernel
2011-10-29 21:50:47 +04:00
George Vinogradov
411e40267a
Added stub for add_collaborators action.
2011-10-29 19:56:44 +04:00
George Vinogradov
2acc098b08
Merge branch 'master' of github.com:warpc/rosa-build
2011-10-29 19:55:44 +04:00
Pavel Chipiga
3a482545f5
Fix and improve events log notification for BuildList. Refs #2162
2011-10-29 17:50:51 +03:00
George Vinogradov
2a7a13000f
Added some translations.
2011-10-29 18:28:20 +04:00
Vladimir Sharshov
8f3ffbe827
Merge branch 'master' of github.com:warpc/rosa-build
2011-10-29 18:06:22 +04:00
Vladimir Sharshov
8c7b196764
Update BuildListItems for new requirement
2011-10-29 18:05:40 +04:00
konstantin.grabar
512364be32
[refs #2161 ] Add get_status call
2011-10-29 17:38:17 +04:00
konstantin.grabar
33ebe192c5
[refs #2161 ] Fix bpl and pl translates
2011-10-29 16:29:47 +04:00
Pavel Chipiga
3cb8d5c4c7
Fix group creation bug. Add builds_list to layout menu. Change login error notification. Refs #2162
2011-10-29 13:56:26 +03:00
George Vinogradov
b55a99adfa
Added showing of global_role to user list
2011-10-29 02:36:02 +04:00
Pavel Chipiga
5910c8c29b
Apply event logs for build list create, cancel, publish. Refs #2136
2011-10-29 01:31:47 +03:00
Pavel Chipiga
78f784cf1b
Remove visibility from Repository. Refs #2136
2011-10-29 00:03:30 +03:00
Pavel Chipiga
cdedcee801
Skip ACL for some actions. Log git hook to system events log. Fix build_list version format. Fix sidebar for build list display. Translate for ACL. Doc for project bootstrap. Refs #2136
2011-10-28 22:59:07 +03:00
Vladimir Sharshov
148602a96f
Serve static content by nginx
2011-10-28 21:17:38 +04:00
Vladimir Sharshov
d5183ad652
Bad things(
2011-10-28 20:44:29 +04:00
Vladimir Sharshov
cd0e6a9415
Merge branch 'master' of github.com:warpc/rosa-build
2011-10-28 20:24:44 +04:00
Vladimir Sharshov
640d88d7cd
Serve static content by nginx
2011-10-28 20:24:24 +04:00
Pavel Chipiga
7a00c64bee
Stub dev XML RPC. Imporve docs and increase git timeout. Refs #2136
2011-10-28 19:01:41 +03:00
konstantin.grabar
7b3167cfa7
Add personal repository rights. Add personal checker to controller
2011-10-28 18:28:45 +04:00
Pavel Chipiga
c39e01ba32
Add auto_build hook recivier. Remove XML RPC from project. Gitolite docs. Refs #2136
2011-10-28 16:27:12 +03:00
George Vinogradov
a833964952
Fixed bug with roles seeding.
2011-10-28 03:37:07 +04:00
Vladimir Sharshov
b68f0de5a3
Fix "PGError: ERROR: new encoding (UTF8) is incompatible with the encoding of the template database (SQL_ASCII)"
2011-10-28 02:06:09 +04:00
George Vinogradov
2926cc6309
Merge branch 'master' of github.com:warpc/rosa-build
2011-10-28 00:10:38 +04:00
George Vinogradov
adcd99d255
Minor fix in roles
2011-10-28 00:06:53 +04:00
Pavel Chipiga
8fadbfbd66
Redo with_ga include trying to fix strange production bug. Refs #2136
2011-10-27 22:23:31 +03:00
Pavel Chipiga
1277e81336
Fix with_ga. Refs #2136
2011-10-27 21:25:22 +03:00
George Vinogradov
87cdb88731
Added use_default and use_default_for_owner to roles
2011-10-27 22:09:22 +04:00
George Vinogradov
37c37f5cbd
Merge branch 'master' of github.com:warpc/rosa-build
2011-10-27 18:49:14 +04:00
konstantin.grabar
89312375fd
Merge master and personal_repos
2011-10-27 17:13:53 +04:00
konstantin.grabar
3114eb1ecc
[refs #2106 ] Add personal repos to project. Some changes of private repos controller and logic
2011-10-27 17:04:03 +04:00
Pavel Chipiga
857ae7621a
Merge branch 'gitolito'
2011-10-27 15:50:21 +03:00
Pavel Chipiga
a470f01690
Move easy_urpmi json integration to separate action. Do not require authentication. Change name to unixname, improve URL generation. Refs #1959
2011-10-27 14:02:25 +03:00
George Vinogradov
d932999b8c
Fixed bug in determining visibility of object
2011-10-27 01:14:16 +04:00
Pavel Chipiga
0171a0a42a
Apply basic git repo functionality operation: add, change, destroy user ssh_key. Create, destroy, open/close project git repos. Calc project owner. Improve UI for users, groups and projects: fix links and routes, add actions refactor. Other minor fixes and refactoring. Add ssh_key uniqness check. Add uname uniqness check between User and Group. Check project owner ssh_key existance before project creation. Temporary disable uname and unixname change due to gitolite stranges. Refs #2136
2011-10-26 23:57:51 +03:00
George Vinogradov
1523aea781
Added roles:load task.
2011-10-26 04:35:49 +04:00
George Vinogradov
02a8a62f36
Added dump to yml and load from yml abilities for roles.
2011-10-26 04:35:01 +04:00
Ilya Krasilnikov
f15f2ce98d
fuckin fuck
2011-10-26 03:27:08 +04:00
Ilya Krasilnikov
d9acf9f504
unicorn fix
2011-10-26 03:13:22 +04:00
Ilya Krasilnikov
5c090919a8
unicorn listens on port instead of socket
2011-10-26 03:06:28 +04:00
Ilya Krasilnikov
36c724d0e2
database.yml
2011-10-26 02:54:52 +04:00
Ilya Krasilnikov
ed59d22fad
unicorn
2011-10-26 02:34:57 +04:00
Ilya Krasilnikov
bcdc10220b
unicorn
2011-10-26 02:30:39 +04:00
Ilya Krasilnikov
eb85728516
unicorn fix
2011-10-25 17:23:20 +04:00
Ilya Krasilnikov
1283a4b2c4
xml-prc demo script
2011-10-25 04:14:46 +04:00
Vladimir Sharshov
cff8643082
Update deploy config
2011-10-24 17:37:24 +04:00
konstantin.grabar
9c182f0bda
Merge master and build_lists_queue
2011-10-24 14:40:36 +04:00
konstantin.grabar
7053333296
[refs #1832 ] Change downloads controller routes to statistics
2011-10-24 14:27:00 +04:00
konstantin.grabar
d04de6e2fc
[refs #1832 ] Fixed git repos web interface routes
2011-10-24 14:19:04 +04:00
Ilya Krasilnikov
3915da75d4
Merge branch 'master' of github.com:warpc/rosa-build
2011-10-24 05:55:16 +04:00
Ilya Krasilnikov
ba617742a3
XML-PRC controller v1
2011-10-24 05:55:03 +04:00
George Vinogradov
82d72a851c
ACL for testing.
2011-10-24 01:39:44 +04:00
konstantin.grabar
5a5529ba3e
[refs #1832 ] Build list process fixes
2011-10-23 15:24:46 +04:00
konstantin.grabar
d047e3f2b2
[refs #1832 ] Replace branches to tags in the project
2011-10-23 14:34:42 +04:00
George Vinogradov
54c7c80af8
Merge branch 'master' of github.com:warpc/rosa-build
2011-10-22 19:57:26 +04:00
konstantin.grabar
c24a9fae1b
[refs #1832 ] Build Lists updates. Project updates and fixes.
2011-10-22 19:28:41 +04:00
Pavel Chipiga
310f588621
Resolve conflict with User nickname and uname
2011-10-21 20:17:49 +03:00
George Vinogradov
600a897490
Added route to roles controller.
2011-10-21 19:39:32 +04:00
Pavel Chipiga
644d57b420
Merge branch 'catalog'
...
Conflicts:
Gemfile
Gemfile.lock
app/views/layouts/application.html.haml
app/views/repositories/show.html.haml
config/locales/ru.yml
config/routes.rb
db/schema.rb
2011-10-21 17:55:41 +03:00
George Vinogradov
a92282de1e
Merge branch 'chipiga'
...
Conflicts:
app/controllers/application_controller.rb
app/views/layouts/application.html.haml
config/locales/ru.yml
db/schema.rb
2011-10-20 19:55:03 +04:00
George Vinogradov
1659ad5805
Merge branch 'private_repos'
...
Conflicts:
config/application.yml.sample
config/locales/ru.yml
config/routes.rb
db/schema.rb
2011-10-20 19:49:35 +04:00
George Vinogradov
2dd99d32f9
Merge branch 'downloads'
...
First turn of merging.
Conflicts:
.gitignore
Gemfile
Gemfile.lock
config/locales/ru.yml
config/routes.rb
db/schema.rb
2011-10-20 19:22:11 +04:00
Pavel Chipiga
5291752419
Add categories and apply basic CRUD actions. Add category link and description to project. Apply category assign to project. Apply categorization with platforms. Integrate to common design and layout. Import basic categories structure. Refs #1858
2011-10-19 23:58:31 +03:00
George Vinogradov
ff36b1fdd3
Merge branch 'itima_web_refactoring'
...
Conflicts:
Gemfile
Gemfile.lock
app/models/user.rb
app/views/layouts/application.html.haml
config/locales/ru.yml
config/routes.rb
db/schema.rb
2011-10-19 18:09:58 +04:00
George Vinogradov
ee9af32fa6
Adding projects to repositories.
2011-10-19 17:16:29 +04:00
santaux
5f17928423
[refs #1923 ] Add private repositories to project
2011-10-18 17:47:17 +04:00
George Vinogradov
6d065ea01c
Changed routes and added some translations
2011-10-17 18:24:45 +04:00
Pavel Chipiga
5f705cdd0d
Develop and apply event logging mechanism without source code modification and with localization. Apply events log display with pagination. Apply XML RPC requests stub for local test. Refactor. Refs #1828
2011-10-17 11:04:36 +03:00
George Vinogradov
e672c20d3f
Some new translations
2011-10-17 00:49:55 +04:00
George Vinogradov
d7cddecbe8
Changed User representation.
2011-10-17 00:49:41 +04:00
santaux
8103b14e15
[refs #1861 ] Add downloads statistics
2011-10-14 10:35:25 +04:00
Pavel Chipiga
0efa8c83a2
Fix nickname format check. Apply readonly nickname field. Show flash notice during registration through OpenID. Fix email read from OpenID response. Refs #1954
2011-10-13 13:19:42 +03:00
Pavel Chipiga
77e03df70b
Refactor gemfile and upgrade rails, devise and other gems, fix conflicts, remove deprecations. Implement user classic registration and registration through omniauth OpenId. Allow user enter correct nickname and change other info during registration through OpenId. Make login through nickname or email. Apply profile edit form. Dont ask current password for profile update. Fix layout and devise links. Refs #1954
2011-10-11 23:56:51 +03:00
Vladimir Sharshov
f3d32273d8
Support Airbrake account
2011-09-29 17:24:33 +04:00
Vladimir Sharshov
02a9a46b60
Add publish function for BuildList
2011-09-15 21:56:20 +04:00
Alexey Nayden
b25a174613
Clone confirm translation
2011-06-01 15:08:16 +04:00
Alexey Nayden
232eb9461e
Platform clone ui
2011-05-30 13:04:32 +04:00
Timothy N. Tsvetkov
3a7258ccdb
crontab generator: weekdays and months translations
2011-04-28 19:55:22 +04:00
Timothy N. Tsvetkov
e8b3769669
spacing in the locales file
2011-04-28 19:38:44 +04:00
Timothy N. Tsvetkov
d999e6e438
minor in crontab generator + more translations in crontab generator
2011-04-28 19:36:28 +04:00
Timothy N. Tsvetkov
35483ce02f
Merge branch 'master' of github.com:evilmartians/rosa-build
2011-04-28 18:32:20 +04:00
Timothy N. Tsvetkov
c927abd073
added crontab to products without translations and setting values to generator form for existing crontab line
2011-04-28 18:32:11 +04:00
Alexey Nayden
315ede490e
Projects filter
2011-04-28 15:01:58 +04:00
Alexey Nayden
babed29a53
Product deletion
2011-04-28 14:23:52 +04:00
Alexey Nayden
4f29a63296
dedebug + ui fix
2011-04-22 20:13:47 +04:00
Alexey Nayden
a1bef617f9
route fix
2011-04-22 18:29:19 +04:00
Alexey Nayden
eafd2c4b3c
one more routes fix
2011-04-22 16:18:50 +04:00
Alexey Nayden
043fa5736d
Routes fix
2011-04-22 15:39:26 +04:00
Timothy N. Tsvetkov
fb2808b9e6
crontab generator without translations, because im in fucken ISRAELgit add app/controllers/crontabs_controller.rb app/views/crontabs/show.html.hamlgit add app/controllers/crontabs_controller.rb app/views/crontabs/show.html.haml Shalom LEOLAM
2011-04-18 16:34:06 +04:00
Timothy N. Tsvetkov
515ca84842
FUCK OFF JUMMIT
2011-04-15 17:20:48 +04:00
Alexey Nayden
38cef4d887
Minor product fixes
2011-04-15 13:23:12 +04:00
Timothy N. Tsvetkov
577cb2e126
added platform cloning and system_wide flag
2011-04-14 21:04:32 +04:00
Alexey Nayden
33b59c8be7
Merge branch 'master' of github.com:evilmartians/rosa-build
2011-04-14 11:23:15 +04:00
Alexey Nayden
856b93d3d8
Product management. Step 2
2011-04-14 11:23:08 +04:00
Timothy N. Tsvetkov
5d2a79afeb
rewrite configs on each deploy
2011-04-13 19:41:41 +04:00
Timothy N. Tsvetkov
72f005e999
restart dj in deploy
2011-04-11 21:07:49 +04:00
Timothy N. Tsvetkov
c7b19db4b6
merge
2011-04-11 21:06:32 +04:00
Timothy N. Tsvetkov
9a4b3ef92a
not restarting delayed_job
2011-04-11 21:02:01 +04:00
Alexey Nayden
231771890e
Confilict resolve
2011-04-11 20:57:43 +04:00
Alexey Nayden
dce4e76da1
Product management. Step 1
2011-04-11 20:55:52 +04:00
Timothy N. Tsvetkov
ad61eec876
added dj to deploy (starting only one worker for now)
2011-04-11 20:51:54 +04:00
Timothy N. Tsvetkov
1a6330956b
build list creation
2011-04-11 20:37:09 +04:00
Timothy N. Tsvetkov
e3b12e4a1a
merge
2011-04-11 14:52:37 +04:00
Timothy N. Tsvetkov
82869f57a7
build list items and more statuses
2011-04-11 14:47:57 +04:00
Alexey Nayden
cd6e7ade15
Product Builder xml-rpc and Product model
2011-04-11 12:35:08 +04:00
Timothy N. Tsvetkov
62d0985fcb
more methods fot build lists, added is_circle build flag
2011-04-07 18:56:28 +04:00
Timothy N. Tsvetkov
4ac5931f44
fixes + build lists
2011-04-07 17:20:21 +04:00
Timothy N. Tsvetkov
8692995969
tag and branches selection
2011-04-04 20:00:24 +04:00
Timothy N. Tsvetkov
5135f048a5
some views for git
2011-04-01 04:36:34 +04:00
Timothy N. Tsvetkov
4ed5c11335
added flash notices on destroy
2011-03-31 06:00:21 +04:00
Timothy N. Tsvetkov
a65bf7a4f8
new views for project
2011-03-31 05:56:20 +04:00
Timothy N. Tsvetkov
e40cdbd9d3
translations for the menu
2011-03-31 05:25:33 +04:00
Timothy N. Tsvetkov
96620de6fd
removed compass from deploy for now, because we hove nothing to compile
2011-03-31 05:22:55 +04:00
Timothy N. Tsvetkov
81745019cf
new views for repositories
2011-03-31 05:15:17 +04:00
Timothy N. Tsvetkov
6f9683c686
added scope :recent to repository and show repositories on the platform page
2011-03-31 04:25:18 +04:00
Timothy N. Tsvetkov
e984500a69
custom form errors renderer
2011-03-31 03:52:34 +04:00
Timothy N. Tsvetkov
636a8ed8f2
removed boilerplate from the compass config
2011-03-31 03:42:18 +04:00
Timothy N. Tsvetkov
309b037acf
Paul Irish BUY BUY oMG, Using AWESOME web-app-theme
2011-03-31 03:10:23 +04:00
Timothy N. Tsvetkov
43a93a419a
Translation fix
2011-03-30 22:36:04 +04:00
Timothy N. Tsvetkov
7c12f699aa
Always translate ALL models and their attributes
2011-03-30 22:14:02 +04:00
Timothy N. Tsvetkov
432ecf2175
setted x_sendfile_header to 'X-Accel-Redirect'
2011-03-30 02:28:38 +04:00
Timothy N. Tsvetkov
f122cab4e3
put compiled css to public/stylesheets/compiled/
2011-03-29 23:37:44 +04:00
Timothy N. Tsvetkov
0b14b84dbf
setted default url host for action mailer
2011-03-29 23:11:58 +04:00
Timothy N. Tsvetkov
fc57b607f9
playing with 0 downtime deploy
2011-03-29 21:38:56 +04:00
Timothy N. Tsvetkov
b48208f653
need to kill myself, oops overflow, brain dumped
2011-03-29 21:33:54 +04:00
Timothy N. Tsvetkov
be58d995a8
oops
2011-03-29 21:31:44 +04:00
Timothy N. Tsvetkov
3524d03703
xxx
2011-03-29 21:27:56 +04:00
Timothy N. Tsvetkov
9a2adc62a1
fix
2011-03-29 21:21:26 +04:00
Timothy N. Tsvetkov
9eea2867d6
fixed a bit deploy
2011-03-29 21:06:21 +04:00
Timothy N. Tsvetkov
f73c829a34
test
2011-03-29 20:59:02 +04:00
Timothy N. Tsvetkov
c7fe38c6a8
playing with assets, jammit and compass
2011-03-29 20:35:42 +04:00
Timothy N. Tsvetkov
67edce79e7
added rude restart application task and setted unicorn pid
2011-03-29 18:58:20 +04:00
Timothy N. Tsvetkov
5e58bca177
fixed typo in unicorn conf
2011-03-29 17:36:28 +04:00
Timothy N. Tsvetkov
41c8e09e31
turned on hoptoad notifier in deploy
2011-03-28 20:36:19 +04:00
Timothy N. Tsvetkov
57396c3b24
fixed symlink_config_files in deploy
2011-03-28 20:31:29 +04:00
Timothy N. Tsvetkov
81d8317976
updated database settings for production
2011-03-28 19:50:58 +04:00
Timothy N. Tsvetkov
7a608488cd
setting deploy, not yet finished configs
2011-03-28 19:49:22 +04:00
Timothy N. Tsvetkov
3b51d53225
freeze + spec
2011-03-17 17:47:16 +03:00
Timothy N. Tsvetkov
c18abc3801
translations for flash messages in platforms controller
2011-03-17 15:35:42 +03:00
Timothy N. Tsvetkov
8f5f1aa91d
creating git-repo when creating new project, showing empty repo
2011-03-15 14:24:45 +03:00
Alexey Nayden
7896c4e7d3
Container model
2011-03-12 16:35:00 +03:00
Timothy N. Tsvetkov
5bc5638934
friday fixes lets drink vodka for your money very well
2011-03-11 20:19:47 +03:00
Alexey Nayden
92b7d101e8
Devise l10n
2011-03-11 19:38:39 +03:00
Alexey Nayden
31e6d56475
L10n fix
2011-03-11 19:32:27 +03:00
Alexey Nayden
40b28e4a84
Trying to add repositories to my hierarchy (step 2)
2011-03-11 19:13:24 +03:00
Timothy N. Tsvetkov
82540c37a9
fixed routes for git
2011-03-11 13:26:29 +03:00
Timothy N. Tsvetkov
a2ffc0b37d
Merge branch 'master' of github.com:evilmartians/rosa-build
2011-03-11 13:06:27 +03:00
Timothy N. Tsvetkov
20af306073
git fixes
2011-03-11 13:06:14 +03:00
Alexey Nayden
ba117737b7
Basic navigation
2011-03-11 12:39:34 +03:00
Alexey Nayden
0ff80b3e16
User management
2011-03-11 00:48:15 +03:00
Timothy N. Tsvetkov
a373af936b
sample view for the project
2011-03-10 17:20:09 +03:00
Alexey Nayden
eccb4e0a6c
Project/platform management
2011-03-10 16:38:50 +03:00
Alexey Nayden
7c39293855
Merge branch 'master' of github.com:evilmartians/rosa-build
2011-03-10 16:21:39 +03:00
Alexey Nayden
dfb747fce9
Application.yml
2011-03-10 16:21:30 +03:00