Vokhmin Alexey V
ad08a31e5f
#860 : merge master into branch
2013-01-29 23:23:52 +04:00
Alexander Machehin
4bb3f26877
[refs #819 ] migration
2013-01-29 23:57:29 +06:00
Alexander Machehin
1f6b9dacc5
[refs #819 ] add two additional counters to mass builds
2013-01-29 21:20:28 +06:00
Vokhmin Alexey V
fed1c76ca2
#860 : update logic for creating build list container
2013-01-28 18:44:06 +04:00
Alexander Machehin
eeb58ccd8e
Merge pull request #799 from warpc/794-move-all-keys-into-abf-bd
...
#794 : move all keys into abf bd
2013-01-22 00:17:42 -08:00
Vokhmin Alexey V
9310a8db54
add default value for new_core
2013-01-19 17:08:56 +04:00
Vokhmin Alexey V
097ffacf61
#794 : merge master into branch
2013-01-16 19:07:39 +04:00
Vokhmin Alexey V
6b75eca457
#780 : update schema.rb
2013-01-10 15:21:12 +04:00
Vokhmin Alexey V
f0b9d23bc2
Merge branch 'master' into 794-move-all-keys-into-abf-bd
2012-12-25 18:24:01 +04:00
Alexander Machehin
7d58b89366
add a new core option to mass_builds
2012-12-25 18:15:20 +06:00
Vokhmin Alexey V
bce1b63d20
#794 : merge master into the branch
2012-12-24 19:02:55 +04:00
Vokhmin Alexey V
69038e227c
#784 : update schema.rb
2012-12-24 17:20:26 +04:00
Vokhmin Alexey V
c8259c6e0c
#794 update schema.rb
2012-12-24 15:30:25 +04:00
Vokhmin Alexey V
a09699fc03
#794 : merge master into branch
2012-12-20 19:33:14 +04:00
Vokhmin Alexey V
334b078855
#794 : update KeyPair model, write migration
2012-12-19 22:18:00 +04:00
Alexander Machehin
30b923b14e
[refs #777 ] fix models specs
2012-12-17 21:41:51 +06:00
Vokhmin Alexey V
6f623dbab5
#785 : udd user to ProductBuildList, and etc changes
2012-12-14 19:14:33 +04:00
Alexander Machehin
a452df79b8
[refs #762 ] refactoring
2012-12-11 19:48:16 +06:00
Alexander Machehin
dc1525b85e
[refs #762 ] add mass build from list
2012-12-06 23:59:17 +06:00
Alexander Machehin
b132a56937
Merge branch 'master' into 674-diff_between_commits
...
Conflicts:
db/schema.rb fresh
2012-12-04 00:02:45 +06:00
Alexander Machehin
ec6279d803
[refs #674 ] add diff to build lists
2012-12-03 23:43:24 +06:00
Vokhmin Alexey V
fcdbfd4538
add new column to build_lists table, some refactoring
2012-11-30 14:41:39 +04:00
Vokhmin Alexey V
3d6269da9b
add results column to build_lists table
2012-11-27 18:22:17 +04:00
Vokhmin Alexey V
f522fd3cd0
add selecting Arch on create product build
2012-11-13 18:01:06 +04:00
Vokhmin Alexey V
21d8a42072
merge master into the branch
2012-11-12 20:52:33 +04:00
Vokhmin Alexey V
259eeaecfc
add Stop action and time_living for building ISO
2012-11-12 17:22:19 +04:00
Vokhmin Alexey V
b39ccea0d5
add show logs in real time
2012-11-09 17:08:56 +04:00
Vokhmin Alexey V
3d293b908d
added IsoWorkerObserver
2012-11-09 01:39:42 +04:00
Vokhmin Alexey V
9f4bc175e0
updated schema.rb
2012-11-07 16:14:46 +04:00
Vokhmin Alexey V
b1722cae75
added some params for build ISO
2012-11-06 20:19:52 +04:00
Vokhmin Alexey V
ecec330b4d
added migration, updated models, UI
2012-11-06 18:13:16 +04:00
Alexander Machehin
c6a0dfee97
[refs #90 ] fixed orphan pulls
2012-10-28 00:04:28 +06:00
Alexander Machehin
2360a25a42
[refs #579 ] fixed many errors
2012-10-05 17:02:25 +06:00
Alexander Machehin
1bc76a7f18
[refs #579 ] fresh schema
2012-10-05 15:34:55 +06:00
Vokhmin Alexey V
04b2647ef0
#668 : added uploading avatars for groups
2012-10-03 20:38:42 +04:00
Alexander Machehin
94029c3cda
[refs #90 ] base -> to, head -> from
2012-10-03 17:58:34 +06:00
Vokhmin Alexey V
6bc3c4b9a8
#90 : updated redhillonrails_core gem
2012-10-01 22:09:59 +04:00
Alexander Machehin
dfbf8a8d58
Merge branch 'master' into 90-pull
...
Fucking conflicts:
app/controllers/projects/issues_controller.rb
app/models/ability.rb
app/views/projects/issues/show.html.haml
config/routes.rb
db/schema.rb
lib/tasks/import.rake
spec/models/comment_for_commit_spec.rb
vendor/assets/javascripts/bootstrap-tab.js
vendor/assets/stylesheets/bootstrap.css
2012-09-25 17:55:30 +06:00
Vokhmin Alexey V
01576702a0
#575 : added migration, updated Settings page
2012-09-14 20:12:48 +04:00
Vokhmin Alexey V
5f941844f2
#637 : added migration, updated approve_notification
2012-09-10 15:08:53 +04:00
Pavel Chipiga
7570f1cab7
Set publish_without_qa to false for all platform repos when released. Fix mgration. Refs #631
2012-09-07 18:41:42 +03:00
Pavel Chipiga
768e40ee2a
Merge branch 'master' into 631-publish-to-the-repository-without-qa
...
Conflicts:
app/models/ability.rb
2012-09-07 16:38:21 +03:00
Vladimir Sharshov
2c1df5cd14
Merge branch 'master' into 263-refactoring
...
Conflicts:
config/deploy.rb
db/schema.rb
2012-09-06 21:14:14 +04:00
Vokhmin Alexey V
71d14e43d6
#631 : fixed misprint
2012-09-06 19:39:26 +04:00
Vokhmin Alexey V
4d1166e6b3
#631 : updated UI and JS validation for build_lists, rewrote migration
2012-09-06 19:34:33 +04:00
Vokhmin Alexey V
30b5188b50
#631 : updated db/schema.rb
2012-09-06 17:47:51 +04:00
Vladimir Sharshov
698e55e3e8
[refs #263 ] Test refactoring
2012-09-06 14:53:03 +04:00
George Vinogradov
68b86ba09a
[issue #620 ] Fixed migration && BuildList#actualize_packages.
2012-08-30 22:32:28 +04:00
George Vinogradov
f688985814
[issue #620 ] Changed maintainer assignment.
...
* Added `project:maintainer:set_to_owner` task to set projects maintainer
to its owner
* Removed callbacks and methods to find maintainer 'on-the-fly'
2012-08-28 01:12:53 +04:00
George Vinogradov
2fbb72e537
[issue #620 ] Changes in Maintainer db:
...
* Added maintainer selection on project page (see TODO in sources);
* Added `actual` field to BuildList::Package;
* Added rake task to set BuildList::Package.actual field.
Run it after migration (see TODO in sources);
* Packages after publising of BuildList becomes actual;
* Added MaintainerPresenter to avoid long method chains.
2012-08-24 19:21:24 +04:00
Pavel Shved
3af72beb41
Add index to make "assignee" callback faster
2012-08-22 00:02:24 +04:00
Pavel Chipiga
0ff8f92b62
Upgrade gems. Fix and refactor some specs. Fix deprecation warnings. Add capistrano task to dump remote db. Refs #263
2012-08-15 16:52:32 +03:00
Vladimir Sharshov
c310d3cfec
[refs #604 ] Fix schema
2012-08-07 01:11:46 +04:00
Vladimir Sharshov
f35d4cd873
Merge branch 'master' into #604-Remove_old_buildlist_created_more_than_3_month_ago
...
Conflicts:
app/models/project.rb
db/schema.rb
2012-08-07 00:53:43 +04:00
Vladimir Sharshov
69fb368911
merger stash
2012-08-07 00:48:29 +04:00
Alexander Machehin
6a04f4ad7a
Merge again branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-08-06 11:19:06 +06:00
George Vinogradov
6eff6bffa5
[issue #590 ] Merge branch 'master' into 590-build_list_page_change
...
Conflicts:
db/schema.rb
2012-08-03 18:37:44 +04:00
Alexander Machehin
b299a51610
Merge branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-08-01 13:06:41 +06:00
Pavel Chipiga
b6c5221f41
Rollback schema.rb. Refs #263
2012-08-01 00:38:21 +03:00
Pavel Chipiga
8e91159b5b
Improve and refacror huge blob display. Fix wiki create and display. Fix build_lists test. Refs #263
2012-07-31 20:32:49 +03:00
konstantin.grabar
ebc5cd2603
[refs #441 ] Fix schema
2012-07-31 17:35:05 +04:00
konstantin.grabar
f7f848e878
[refs #441 ] Merge master into 441-key_pairs
2012-07-31 17:16:07 +04:00
konstantin.grabar
0305976a27
[refs #441 ] Fix schema
2012-07-31 12:56:55 +04:00
Vladimir Sharshov
43309d86e6
Merge branch 'master' into 441-key_pairs, fix schema, add migration
...
Conflicts:
db/schema.rb
2012-07-31 02:02:15 +04:00
konstantin.grabar
844e81a73d
[refs #441 ] Change public key type
2012-07-30 19:25:51 +04:00
George Vinogradov
cc66e2ee4a
[issue #590 ] Save repository to save to in BuildList.
2012-07-27 20:01:26 +04:00
konstantin.grabar
33e6cdc285
[refs #570 ] Remove mass build counters logs and transactions
2012-07-27 19:17:07 +04:00
Alexander Machehin
944c6fc0e2
Merge branch 'master' into 90-pull
...
Conflicts:
app/assets/stylesheets/design/custom.scss
app/controllers/projects/git/commits_controller.rb
app/helpers/git_helper.rb
app/models/project.rb
app/views/projects/git/commits/_commit_diff.html.haml
db/schema.rb
lib/ext/core/string.rb
2012-07-27 18:37:25 +06:00
konstantin.grabar
f9b217379d
[refs #570 ] Add mass build counters logs
2012-07-26 15:45:23 +04:00
Pavel Chipiga
e09a9467e2
Fix flash notifies display bug. Add admin section link. Move controller to admin namspace. Refactor and fix notifies controller. Refs #576
2012-07-25 21:05:25 +03:00
konstantin.grabar
15a86c2ecd
[refs #576 ] Add flash notifies
2012-07-23 18:25:37 +04:00
konstantin.grabar
b4059c67fc
[refs #441 ] Add key pairs for platform
2012-07-13 15:18:12 +04:00
Alexander Machehin
10b828c644
Merge branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
vendor/assets/javascripts/vendor.js
2012-07-10 18:35:49 +06:00
George Vinogradov
a909a92ae8
[issue #428 ] Merge branch 'master' into 428-advisory
...
Conflicts:
db/schema.rb
2012-07-04 18:10:03 +04:00
konstantin.grabar
2353a65972
[refs #442 ] Repair schema
2012-07-04 16:53:44 +04:00
George Vinogradov
e00e88340b
[issue #428 ] Merge branch 'master' into 428-advisory
...
Conflicts:
app/assets/stylesheets/design/custom.scss
db/schema.rb
2012-07-04 03:31:51 +04:00
Alexander Machehin
89abd20c95
Merge branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-07-03 21:22:10 +06:00
konstantin.grabar
6afe8c0375
[refs #442 ] Merge master into 442-mass_build
2012-07-03 18:41:02 +04:00
Pavel Chipiga
b46a7aba39
Fix branch with dots. Refs #263
2012-07-03 15:05:27 +03:00
konstantin.grabar
dbbe4cef1f
[refs #442 ] Slice counters migration on two parts
2012-07-03 14:24:14 +04:00
konstantin.grabar
561ebb8728
[refs #442 ] Add stop_build field
2012-06-29 19:17:25 +04:00
konstantin.grabar
6507ad280f
[refs #442 ] Merge master into 442-mass_build
2012-06-29 16:40:54 +04:00
Vladimir Sharshov
7561abca08
[refs #462 ] refactoring: remove notified_at
2012-06-28 21:40:32 +04:00
konstantin.grabar
ce163f89a9
[refs #442 ] Add rep_name field. Add cancel builds ability
2012-06-28 19:23:33 +04:00
konstantin.grabar
b6d769ad66
[refs #442 ] Change mass builds table
2012-06-27 18:07:05 +04:00
Alexander Machehin
1ffb1b3940
Merge branch 'master' into 90-pull
...
Conflicts:
Gemfile
app/assets/stylesheets/design/custom.scss
app/models/project.rb
db/schema.rb
2012-06-27 16:20:38 +06:00
konstantin.grabar
f3bd3bbd7f
[refs #442 ] Add mass build counters ant their update. Add failed builds report generate
2012-06-22 19:10:44 +04:00
George Vinogradov
60f1f68ce1
[issue #428 ] Fixed schema.rb . Removed debug code.
2012-06-20 00:04:33 +04:00
George Vinogradov
735afaea15
[issue #428 ] Merge branch 'master' into 428-advisory
...
Conflicts:
db/schema.rb
2012-06-19 02:57:39 +04:00
George Vinogradov
ecd4498484
[issue #428 ] Changes in advisories.
...
* Added Many2Many relation between advisories and projects.
* Added autocompletion to build list's advisory
* Bootstrap's JS moved to vendor/
2012-06-19 02:49:17 +04:00
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
konstantin.grabar
8eaec85aff
[refs #442 ] Fix auto_publish validate and default set
2012-05-29 17:44:30 +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
konstantin.grabar
45ff187875
[refs #442 ] Remove button. Add tab. Fix locales. Fix schema
2012-05-23 20:44: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
konstantin.grabar
b85cb31b88
[refs #442 ] Remove def is_rpm. Change auto_publish default value. Change MassBuild set_name. Fix schema
2012-05-21 17:59:04 +04:00
Alexander Machehin
6b6887250b
Merge branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-05-21 17:31:49 +06:00
konstantin.grabar
cd3564bb81
[refs #442 ] Add mass build model and new build_all fixes
2012-05-18 19:12:51 +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
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
Vladimir Sharshov
1550d7a59e
Merge pull request #459 from warpc/438-remove_rsync_mount_from_app
...
[refs #438 ] Remove rsync mount and umount from platforms
2012-05-16 06:24:31 -07:00
konstantin.grabar
208310e83b
[refs #438 ] Add rake task to symlink migrate. Change rsync stubs
2012-05-16 17:01:25 +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
1f088c0cfc
[refs #461 ] Rename is_rpm to is_package
2012-05-15 14:00:57 +04: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
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
26a643eed1
[issue #428 ] Merge branch 'master' into 428-advisory
...
Conflicts:
app/controllers/projects/build_lists_controller.rb
db/schema.rb
2012-05-05 21:33:39 +04:00
Alexander Machehin
69303561f4
[refs #434 ] add build priority to users
2012-05-05 17:05:24 +06:00
George Vinogradov
8350fc8fb1
[issue 428] Added advisory.
2012-05-04 21:12:51 +04: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
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
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
Vladimir Sharshov
77414b3092
Universal mass rebuildfor platform onwer without hardcoded main repository or architecture
2012-04-26 13:18:11 +04: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
628fed40ea
[refs #90 ] issue status -> state
2012-04-23 23:34:11 +06:00
Alexander Machehin
fda1a847f5
[refs #90 ] some tests and questions
2012-04-23 23:34:10 +06: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
konstantin.grabar
2fc4e2db61
[refs #396 ] Fix token migration. Fix atom link tag title
2012-04-19 14:50:43 +04:00
konstantin.grabar
3d1cb4bfee
Merge master into 396-rss_atom_feed
2012-04-18 16:53:53 +04:00
konstantin.grabar
8ef020427d
[refs #396 ] Add token auth for atom feed
2012-04-18 16:46:09 +04:00
Vladimir Sharshov
dcdea4b8d3
[Refs #404 ] Remove downloads statistics functional (db and tests)
2012-04-17 17:56:44 +04:00
Vladimir Sharshov
44ca501962
[Refs #194 ] Fix tests
...
[Refs #263 ] Update kernel API call
2012-04-16 21:51:51 +04:00
Vladimir Sharshov
100a166699
[Refs #223 ] Refactoring for pull request
2012-04-13 17:24:43 +04:00
konstantin.grabar
742603ab7e
[refs #223 ] Add build list duration
2012-04-12 14:29:04 +04:00
Pavel Chipiga
a9ecc683f2
Fix search bug. Write anonymous read specs for issues and search controllers. Refs #263
2012-04-05 20:11:02 +03:00
Pavel Chipiga
20e5936d0c
Fix and refactor build lists, comments and other specs. Refactor comments controller, models and views. Code cleanup. Refs #263
2012-04-05 00:43:06 +03:00
Vladimir Sharshov
d382732e68
[Refs #263 ] Refactoring product. Add tests.
2012-04-03 16:21:39 +04:00
Vladimir Sharshov
fef3affc07
[Refs #263 ] Refactoring platforms, add platform tests and software license, showing warning for errors in update project action
2012-04-01 19:19:54 +04:00
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
3cedef5f07
Merge branch 'master' into 344-fix_products_monitoring
...
Conflicts:
db/schema.rb
2012-03-30 20:30:06 +04:00
Pavel Chipiga
531ba0a35f
Add rspec to dev env, change repo source. Take back rails_datatables to plugins with all files. Refs #263
2012-03-30 00:24:57 +03: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
0c2d0f4612
[Refs #263 ] Delete Categories
2012-03-29 23:01:25 +04:00
Vladimir Sharshov
66c285c796
[Refs #263 ] Delete AutoBuildList
2012-03-29 22:22:48 +04:00
konstantin.grabar
c6d30b7ff3
[refs #344 ] Add link to product into product build lists list
2012-03-28 17:51:04 +04: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
konstantin.grabar
8b31c6373f
Merge branch 'master' into 128-account-activation
2012-03-27 13:46:21 +04:00
konstantin.grabar
ae0ca1ce99
[refs #128 ] Fix devise mails. Fix confirm ability
2012-03-26 18:33:02 +04:00
konstantin.grabar
a3d334f0c2
[refs #128 ] Merge 3.2-master into 128-account-activation
2012-03-26 13:55:45 +04:00
Pavel Chipiga
4553affa56
Add missing magic_encodings. Fix blame commit select, hide blank blame. Fix git repo hooks - redo branch parse to support non-ascii branches. Refs #190 , #134
2012-03-22 19:11:12 +02:00
konstantin.grabar
21c33b384b
[refs #325 ] Add new design to error pages
2012-03-22 11:16:56 +04:00
Pavel Chipiga
2db7726d55
Merge branch '3.2-master' into 190-encodings
...
Conflicts:
db/schema.rb
2012-03-22 00:13:18 +02:00
George Vinogradov
b902d8effe
[issue #195 ] Fixed avatar in commits & comments
2012-03-22 01:51:39 +04: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
Pavel Chipiga
8b252d8c14
Add and tune devise lockable strategy. Refs #270
2012-03-21 15:37:16 +02:00
Vladimir Sharshov
d3c3726a84
[Refs #66 ] Add priority in build list
2012-03-20 14:56:51 +04:00
George Vinogradov
3c60347a23
[issue #279 ] Fixes.
...
* Almost finished permissions fixes
* Removed is_template from product
* Some fixes in crontab_generator partial
2012-03-15 03:34:09 +04:00