Unknwon
a38e4a0b02
routers/install.go: able to keep previous custom settings for 2nd time install
...
- .gopmfile: update all commits
2015-02-13 16:48:23 -05:00
Unknwon
6d0f3a07d4
code fix #941 caution: undertest
2015-02-13 00:58:46 -05:00
Peter Smit
6c1ee384f1
Merge remote-tracking branch 'mine/access_refactor' into access_refactor
...
Conflicts:
cmd/serve.go
models/access.go
models/migrations/migrations.go
models/org.go
models/repo.go
models/user.go
modules/middleware/org.go
modules/middleware/repo.go
routers/api/v1/repo.go
routers/org/teams.go
routers/repo/http.go
routers/user/home.go
2015-02-12 14:25:07 +02:00
Peter Smit
0a4cda0dd4
Refactoring of the Access Table
...
This commit does a lot of the work of refactoring the access table in a table with id's instead of strings.
The result does compile, but has not been tested. It may eat your kittens.
2015-02-12 14:14:45 +02:00
Unknwon
c5c467a9cd
Merge branch 'dev' of github.com:gogits/gogs into access
2015-02-11 19:25:59 -05:00
无闻
e805fdb29c
Merge pull request #925 from phsmit/newcollaboration
...
Collaboration
2015-02-11 12:43:13 -05:00
Unknwon
485ea6f14f
models: make code change for session issue with SQLite3 #739
2015-02-10 23:44:16 -05:00
Unknwon
6a23252edc
able to allow insecure certification of webhook for #891
2015-02-10 21:06:59 -05:00
Peter Smit
0d158e569b
Change constants to UPPERCASE_WITH_UNDERSCORE style
2015-02-09 13:36:33 +02:00
无闻
6ed96b7a20
Merge pull request #911 from TonyTsangHK/dev
...
Link to previous commited source file (diff.view_file button) instead of returning 404 for deleted files.
2015-02-09 00:31:16 -05:00
Unknwon
f15fa9167a
cmd: code fix for #905
...
- routers/admin: add rewrite update hook operation
- conf/locale: update locale file due to ini behavior changes
- cmd/cert_stub.go: remove useless code
- cmd/fix.go: no longer need fix command(at least now)
2015-02-08 21:26:14 -05:00
无闻
cd0ee35b3f
Merge pull request #905 from phsmit/conf_on_cli
...
Add option to provide configuration file on command line
2015-02-08 20:22:02 -05:00
Lauris BH
00653e52ee
Get username, name, surname and e-mail from LDAP server
2015-02-08 01:49:51 +02:00
Unknwon
ba77a3b0b4
routers/repo/http.go: allow HTTP push/pull by token for #845
2015-02-07 15:47:23 -05:00
无闻
19525abfc4
Merge pull request #845 from compressed/token_http
...
allow http push by token - #842
2015-02-07 15:27:59 -05:00
Unknwon
216683004e
code fix for #908 , and work for #884
2015-02-06 21:16:23 -05:00
无闻
87b90372a7
Merge pull request #908 from nicolai86/feature/hide-signup-button-884
...
Make Signup button display configurable - #884
2015-02-06 21:03:31 -05:00
Unknwon
5a99e9a37b
models/action.go: add action reopen for #462
...
- models/issue.go: format comment type names
2015-02-06 20:47:21 -05:00
Unknwon
afccd0a3ee
models/action.go: mirror fix on #892
...
- modules/base/markdown.go: fix issue link issue
- routers/repo/view.go: remove useless code
2015-02-06 20:34:49 -05:00
Peter Smit
4e79adf6b5
Refactoring of the Access Table
...
This commit does a lot of the work of refactoring the access table in a table with id's instead of strings.
The result does compile, but has not been tested. It may eat your kittens.
2015-02-06 13:18:11 +02:00
Tony Tsang
fc6d80d619
Link to previous commited source file (diff.view_file button) instead of returning 404 for deleted files.
2015-02-06 17:02:32 +08:00
Raphael Randschau
3c65265871
Hide the registration button depending on the setting
2015-02-05 18:15:00 +01:00
Peter Smit
1ab09e4f1b
Add option to provide configuration file on command line
2015-02-05 12:17:35 +02:00
Peter Smit
03af37554e
Merge branch 'dev' into newcollaboration
2015-02-05 11:08:10 +02:00
无闻
cd6376f093
Merge pull request #818 from fzerorubigd/master
...
add a function to rewrite all public keys on admin request
2015-02-01 16:56:34 -05:00
Unknwon
89ea3e1acc
routers: save partial config when install
2015-02-01 14:39:58 -05:00
Unknwon
b293b6eaa6
cmd: CMD option for port number of gogs web
to prevent first time run conflict
...
- routers: use new binding convention to simplify code
- templates: able to set HTTP port number in install page
2015-02-01 12:41:03 -05:00
Unknwon
32152d2363
routers/repo: set raw page content type to 'text/plain' #828
2015-01-31 15:27:57 -05:00
Unknwon
37fcc8daf2
modules/base: add RenderCommitMessage with XSS-safe and special links
...
- update russian locale
2015-01-30 18:05:20 -05:00
Peter Smit
76f8904718
Introducing Collaboration Struct
2015-01-23 09:54:16 +02:00
无闻
161774d4fb
Merge pull request #825 from phsmit/ssh2_keys
...
Implement #798 Flexible ssh-key input
2015-01-22 19:39:35 +08:00
无闻
edbfbfa66e
Merge pull request #822 from phsmit/fix_807
...
Fix #807 parse the userinfo with the golang tools
2015-01-22 19:31:51 +08:00
Christopher Brickley
d0827e5d5e
allow http push by token - #842
2015-01-08 09:30:22 -05:00
Peter Smit
6251626de4
Implement #798 Flexible ssh-key input
...
It is now possible to input ssh keys in a number of formats: openssh, SSH2 or just the base64 encoded key.
2015-01-02 15:38:11 +02:00
Unknwon
c73e9057ae
Optmize git-fsck options and fix #820
2015-01-02 20:14:43 +08:00
Peter Smit
d016eaaa09
Fix #807 parse the userinfo with the golang tools
...
Note, this is now only fixed with Go version >= 1.4.2, see this bug in Go: 07d86b1f2d
2015-01-02 12:14:11 +02:00
Unknwon
677b1ec627
fix #808
2015-01-02 12:56:08 +08:00
fzerorubigd
6643647687
add afunction to rewrite all public keys on admin request
...
refs #763
2015-01-01 02:15:52 +03:30
Unknwon
bd555551ce
fix #801
2014-12-31 18:37:29 +08:00
Thomas Laroche
e948c7c262
Fix #795
2014-12-29 11:55:46 +01:00
Unknwon
81a44e4cd0
fix API changes
2014-12-28 20:40:35 +08:00
Unknwon
79537467da
mirror fix and update
2014-12-20 22:51:16 -05:00
无闻
a18decf4cc
Merge pull request #755 from phsmit/multiple_emails
...
Multiple emails
2014-12-20 22:47:05 -05:00
Peter
20b5c23a19
Small fixes to multiple_emails feature
2014-12-20 09:26:51 +02:00
Unknwon
0a697517ac
work on #754
2014-12-18 03:37:31 -05:00
Unknwon
c4820f119d
work on #754
2014-12-18 03:26:09 -05:00
Unknwon
57b3be4016
work on #756
2014-12-17 23:04:05 -05:00
Peter
b033f2f535
Finish method for having multiple emails/user.
...
All basics are implemented. Missing are the right (localized) strings
and the page markup could have a look at by a frontend guy.
2014-12-17 17:42:54 +02:00
Peter
ec71d538fc
Method for activating email addresses through verification email
2014-12-17 17:41:49 +02:00
Unknwon
d01f2f3c22
fix #751
2014-12-16 20:47:10 -05:00
Unknwon
1a5aa5e0c0
fix #741
2014-12-16 02:28:57 -05:00
Unknwon
b553ea45ee
modes/repo: incorrect SSH clone URL for #742
2014-12-13 16:46:00 -05:00
Unknwon
ac4a10456e
api: able to create repo and fix #726
...
- POST /user/repos
- POST /org/:org/repos
2014-12-12 20:30:32 -05:00
Unknwon
2f3a7e53cb
fix #735
2014-12-12 01:29:36 -05:00
codeskyblue
db6c0ebf76
fix git clone error when repo has upper case name
2014-12-11 15:57:32 +08:00
Unknwon
bc8721fb6c
Finish new UI for release page
2014-12-10 16:37:54 -05:00
Unknwon
9a1fe801e5
fix #711
2014-12-09 02:18:25 -05:00
Joseph Crail
39c068400e
Fix spelling errors in comments.
2014-12-06 20:22:48 -05:00
dennis-smurf
528c075ad6
Added issue link rendering in commit messages
2014-12-05 11:02:52 +01:00
Deiwin Sarjas
48bb0fadc2
update user api search results to include the full name
...
Is fully backwards compatible
Fixes #677
2014-12-02 11:44:03 +02:00
Unknwon
5338808600
fix #676
2014-11-30 18:29:16 -05:00
Unknwon
d75013a0e8
fix #580
2014-11-30 02:26:29 -05:00
Unknwon
b6437b5a4c
safe check
2014-11-28 21:54:49 -05:00
Unknwon
db4951bc61
mirror fix on oauth2
2014-11-28 21:38:35 -05:00
Unknwon
d6132aaa88
fix oauth2
2014-11-28 21:20:13 -05:00
Unknwon
a43164877c
fix #664
2014-11-25 23:05:43 -05:00
Unknwon
0cce61de3a
Merge branch 'dev' of github.com:gogits/gogs into dev
2014-11-24 09:54:22 -05:00
Unknwon
5b96e3fcc7
fix #660
2014-11-24 09:54:08 -05:00
fuxiaohei
79dae254cf
add milestone page design
2014-11-24 22:33:04 +08:00
Unknwon
1b66600bd0
Fix #652
2014-11-23 02:33:47 -05:00
Unknwon
dc53270da9
Fix 653
2014-11-22 10:22:53 -05:00
Unknwon
ef275ebf62
more on change avatar
2014-11-21 12:51:36 -05:00
Unknwon
22ab4fa1b0
fix #139
2014-11-21 11:08:24 -05:00
Unknwon
55dfe2c978
custom avatar upload
2014-11-21 10:58:08 -05:00
Unknwon
2d8c414f8c
Fix #635
2014-11-18 19:05:33 -05:00
Unknwon
37d8d3afe9
more APIs on #12
2014-11-18 11:07:16 -05:00
Unknwon
32dcaefafa
fox #620
2014-11-17 14:53:41 -05:00
fuxiaohei
d1a60e3643
add pull-request and labels page design
2014-11-17 23:07:34 +08:00
Unknwon
a0f9197b45
GetFile api
2014-11-16 21:32:26 -05:00
Unknwon
340a4595dd
support duoshuo mirror of gravatar
2014-11-16 20:27:04 -05:00
Unknwon
52d66ba6c8
#12 , use go-gogs-client
2014-11-14 17:11:30 -05:00
Unknwon
9dc3c93a6a
#12 , add/edit hook
2014-11-13 12:57:00 -05:00
Unknwon
9e22840483
fix #622
2014-11-13 05:27:01 -05:00
Unknwon
8eb5120fbd
#12 , API: list user repos, list repo hooks
2014-11-13 02:32:18 -05:00
Unknwon
8c9338a537
add personal access token panel #12
2014-11-12 06:48:50 -05:00
Unknwon
21b9d5fa1f
Fix #618
2014-11-11 16:56:57 -05:00
Unknwon
e0de6cb5ad
work on #616 and update locales
2014-11-10 05:30:07 -05:00
Unknwon
abc57b6e43
work on #609
2014-11-07 14:46:13 -05:00
Unknwon
23eec25274
Fix #605 , fix #255 , fix #101
2014-11-06 22:06:41 -05:00
Unknwon
4e7eb5be9d
Work on #5 fork and fix #608
2014-11-05 23:30:04 -05:00
isotas38
2c28ed8c05
Fix #595
2014-11-02 14:18:37 +09:00
semlanik
377530ec21
Fix Issue 589
2014-10-30 22:13:52 +03:00
Unknwon
83283bca4c
Safe work
2014-10-25 07:50:19 -04:00
Christopher Brickley
3794111460
update slack hook to use new format
2014-10-24 08:56:12 -04:00
Tony Tsang
d87a9cb362
Avoid setting missing label/milestone/assignee ids
...
Label, milestone, assignee ids are not includes in post request, possible
js or form building bug.
2014-10-22 14:52:49 +08:00
Tony Tsang
93b9a2acc0
Fix misuse of issue index for issue id.
...
- UpdateAssignee
- UpdateIssueMilestone
2014-10-21 16:27:01 +08:00
Unknwon
a342d58d7e
Able to fork repo to individuals
2014-10-19 01:35:24 -04:00
无闻
d7d167ac63
Merge pull request #560 from evolvedlight/master
...
First cut of fork repo
2014-10-18 23:59:36 -04:00
Unknwon
146c8efee3
Fix API broken
2014-10-18 23:42:43 -04:00
Unknwon
3abc41ccca
Fix API broken
2014-10-18 23:26:55 -04:00
Unknwon
1aa12c7452
Fix #572
2014-10-15 16:28:38 -04:00
Eryx
fb8beaf19a
Fix pagination() to get the right total number of pages
2014-10-14 09:54:45 +08:00
evolvedlight
8d2a6fc484
Merge remote-tracking branch 'upstream/dev'
...
Conflicts:
models/repo.go
2014-10-13 20:30:31 +01:00
Unknwon
452ccff81c
Mirror fix on add ssh key
2014-10-11 21:04:42 -04:00
Unknwon
963354c5d7
Add raw, history file button, and other mirror fixes
2014-10-11 18:02:48 -04:00
Unknwon
b2632dec09
Page: Compare 2 commits
2014-10-10 21:40:51 -04:00
Unknwon
41dbb4c148
Hide org member in collar page
2014-10-10 06:15:27 -04:00
Unknwon
85c9f7c5f3
Issue: Show error prompt when add repository to team and it does not exist #533
2014-10-10 05:06:12 -04:00
Unknwon
d78abd3561
Mirror fix on admin/orgs paging
2014-10-10 03:28:21 -04:00
evolvedlight
211dc74816
Got the fork count working
2014-10-10 00:21:36 +01:00
Unknwon
1aa76bd279
Fix #532 , add system notice
2014-10-08 18:29:18 -04:00
Unknwon
1e1f9e7166
Update with macaron
2014-10-06 19:12:52 -04:00
Unknwon
64c68220d2
Fix #264
2014-10-06 17:50:00 -04:00
evolvedlight
c9e5e38fcf
Initial cut of git fork
2014-10-04 18:19:14 +01:00
Unknwon
2a031c1365
Fix #515
2014-09-30 04:39:53 -04:00
Unknwon
a046a31d2b
UI: Confirmation box
2014-09-29 18:52:28 -04:00
fuxiaohei
7d48f811f1
add issue router for new issue page ui preview
2014-09-27 19:03:07 +08:00
Unknwon
b8368f98ff
Add directory level commit message
2014-09-26 08:55:13 -04:00
lunnyxiao
d1911658e1
remove debug info
2014-09-26 12:17:46 +08:00
Unknwon
ad52b2d791
Mirror fix on transfer repo
2014-09-25 22:36:07 -04:00
Unknwon
977779cdcf
Mirror template bug fix
2014-09-25 20:55:14 -04:00
Unknwon
25268577a5
Fix download archive issue
2014-09-24 17:43:33 -04:00
Unknwon
5bbeeb0f1b
Page: Commits and fix #249
2014-09-23 15:30:04 -04:00
Unknwon
3f707b3f32
Add basic submodule support
2014-09-22 17:01:19 -04:00
lunnyxiao
7df60af60e
submodule support and closed #478
2014-09-22 14:23:36 +08:00
lunnyxiao
79ec08141a
Merge branch 'dev' of github.com:gogits/gogs into dev
2014-09-22 10:45:20 +08:00
lunnyxiao
150eef93b2
add submodule basic support & buf fixed #478
2014-09-22 10:43:16 +08:00
Martin van Beurden
976f1486e0
Set cookiepath to AppSubUrl
2014-09-21 14:25:22 +02:00
Unknwon
7ba9257a7f
Add suburl support
2014-09-19 20:11:34 -04:00
Martin van Beurden
0055cbd365
Allow Gogs to run from a suburl behind a reverse proxy. e.g. http://mydomain.com/gogs/
...
Conflicts:
modules/setting/setting.go
Conflicts:
templates/repo/release/list.tmpl
templates/user/dashboard/dashboard.tmpl
Conflicts:
routers/repo/setting.go
2014-09-18 20:50:48 +02:00
Unknwon
a596388ebf
Add success message after transfer repository #481
2014-09-17 14:52:46 -04:00
lunnyxiao
061a879cea
Merge branch 'dev' of github.com:gogits/gogs into dev
...
Conflicts:
conf/app.ini
2014-09-17 12:04:18 +08:00
lunnyxiao
ed84adb679
toutf8 improved & add max git diff lines
2014-09-17 12:03:03 +08:00
tobyzxj
ad041167f7
fix user's actions on domain/org/name-of-organization/dashboard
2014-09-16 16:20:32 +08:00
Unknwon
632b1b694d
Fix #465
2014-09-15 09:56:12 -04:00
Unknwon
efb68a0a96
Fix UI issue
2014-09-14 19:22:52 -04:00
Mathieu Gagnon
3549fb0ea8
Remove APP_LOGO setting
2014-09-13 03:52:51 -04:00
Unknwon
a2cac952a4
Prepare 0.5 release
2014-09-12 21:36:26 -04:00
Unknwon
cfed11f092
Bug: Transfer repository doesn't update the count
2014-09-12 18:29:58 -04:00
Unknwon
25d6ae69d1
Remove hg dep
2014-09-07 19:58:01 -04:00
无闻
e79e4b1580
Merge pull request #442 from compressed/org_hook
...
Organization-level Webhooks
2014-09-07 19:30:51 -04:00
无闻
40bc130b19
Merge pull request #447 from m0sth8/fix-milestone-render-markdown
...
Render milestone content as markdown
2014-09-07 19:19:10 -04:00
Unknwon
0ddb1eb769
Finish new install page, almost ready for 0.5 release
2014-09-07 19:02:58 -04:00
Unknwon
ab7206d6b7
Fix #348
2014-09-05 17:28:09 -04:00
Christopher Brickley
f7be61c819
getOrgRepoCtx returns values directly & err
2014-09-05 07:19:34 -04:00
Christopher Brickley
85c35a6b8b
add organization-level webhooks
2014-09-05 07:19:34 -04:00
Christopher Brickley
7269b06fd5
HookType is case-sensitive
...
Update webhook wasn’t showing up because of the wrong case
2014-09-05 07:19:34 -04:00
Vyacheslav Bakhmutov
6498fce04b
Render milestone content as markdown
2014-09-05 09:10:58 +07:00
Vyacheslav Bakhmutov
2a7a03e5b3
take params for milestone and assignee from query instead of path args
2014-09-03 00:04:22 +07:00
Christopher Brickley
00a864e693
add commit compare functionality
2014-09-01 14:56:19 -04:00
Christopher Brickley
2bce24068d
add Slack API webhook support
2014-08-31 12:01:59 -04:00
Unknwon
9bc63bda7d
Finish all new admin pages.
2014-08-30 20:49:51 +08:00
Unknwon
d2aff9a46a
Continue working on new admin pages
2014-08-29 20:50:43 +08:00
Unknwon
904bf1a50b
Add migrate repo API
2014-08-29 17:31:53 +08:00
Unknwon
8829174574
Finish new admin users pages
2014-08-29 15:32:52 +08:00
lunnyxiao
a6ec6def8d
Merge branch 'dev' of github.com:gogits/gogs into dev
2014-08-29 11:25:03 +08:00
lunnyxiao
c40e815763
add migrate api
2014-08-29 11:24:37 +08:00
Unknwon
1aec1a2dda
Finish new admin dashboard
2014-08-28 22:29:00 +08:00
Unknwon
81287ba022
Mirror issue fix
2014-08-27 22:40:45 +08:00
Unknwon
9baf2b38d0
Bug fix on organization
2014-08-27 16:39:36 +08:00
Unknwon
50de06056b
Merge branch 'dev' of github.com:gogits/gogs into dev
2014-08-26 18:11:27 +08:00
Unknwon
74b31566cf
Finsih add/remove repo in organization
2014-08-26 18:11:15 +08:00
Marios Andreopoulos
510d5a5d74
import strings
2014-08-25 21:07:08 +03:00
Marios Andreopoulos
cd0ddcfa01
fix typo
2014-08-25 20:35:23 +03:00
Marios Andreopoulos
3d79f59671
fix wrong variable name
2014-08-25 20:20:44 +03:00
Marios Andreopoulos
b40922f4d4
remove extra comma
2014-08-25 20:07:47 +03:00
Marios Andreopoulos
12639c577f
Remove newline characters from ssh key before processing it.
...
Fixes issue #370 : https://github.com/gogits/gogs/issues/370
2014-08-25 18:54:50 +03:00
Unknwon
21a1b8e5a3
Finish new edit team page, add member to team
2014-08-24 21:09:05 +08:00
Unknwon
b765229a6d
Fix code style
2014-08-23 20:30:29 +08:00
Unknwon
e0a2d23baf
Merge branch 'dev' of github.com:gogits/gogs into dev
2014-08-23 20:24:31 +08:00
Unknwon
fa60502a70
Working on organization pages
2014-08-23 20:24:02 +08:00
lunnyxiao
97fb62f51e
auto detect text file encode and convert to utf8
2014-08-20 16:34:48 +08:00
Unknwon
a60edbe88c
Add/remove member need add/remove access to repositories as well
2014-08-16 16:58:32 +08:00
Unknwon
bba707de36
Finish team list, create new team, join/leave team page
2014-08-16 16:21:17 +08:00
Unknwon
36b4c57ff1
Finish new organization members and invitation page
2014-08-15 18:29:41 +08:00
Unknwon
5acc948562
Page: /org/:orgname/settings
2014-08-14 14:12:21 +08:00
Unknwon
5fbf8531e6
Finish new home page of organization
2014-08-10 20:11:18 -07:00
Unknwon
7af7584d25
Finish new reset password, etc.
2014-08-09 21:02:00 -07:00
Unknwon
5605af973b
Feature: Social sign in
2014-08-09 18:01:29 -07:00
Unknwon
78defd238c
Page: Manage social accounts
2014-08-09 17:25:02 -07:00
Unknwon
9a1d5d2489
Finish new web hook pages
2014-08-09 15:40:10 -07:00
Unknwon
9820b8e134
Finish new hooks list page
2014-08-09 10:29:51 -07:00
Unknwon
e8c9bb2c66
Finish new collaboration page
2014-08-07 06:40:05 -04:00
Unknwon
a8e05fdf1b
Use toolbox
2014-08-06 17:21:24 -04:00
Unknwon
6fc2107529
Add missing less files
2014-08-05 21:18:29 -04:00
Unknwon
755eec745f
Finish new repo settings page
2014-08-02 13:47:33 -04:00
Unknwon
dabf5b057c
Finish new migrate page
2014-08-01 00:06:19 -04:00
Unknwon
7bbf644dd5
Convert captcha, cache, csrf as middlewares
2014-07-31 17:25:34 -04:00
Unknwon
9813161411
Reser repo owner to organization when error occurs in repo create page, dashboard news feed page, create organization page
2014-07-26 23:53:16 -04:00
Unknwon
5e81383413
Git installation check, show image in single file view, show short SHA1 instead of 40-length string, complete log module
2014-07-26 18:37:18 -04:00
Justin Nuß
7de3dd01de
Use :index instead of :issue in UpdateIssueMilestone
2014-07-26 11:10:49 +02:00
Unknwon
5c4bc3c848
Huge updates!!!!! Be careful to merge!!!!
2014-07-26 02:28:04 -04:00
Unknwon
8dd07c0ddd
New UI merge in progress
2014-07-26 00:24:27 -04:00
Justin Nuß
12fb42de5a
Fix IE bug and show errors.
2014-07-25 11:13:42 +02:00
Justin Nuß
4e2477a1a5
Fix #318 . Switch to JS(ON) implementation for issue/comment creation.
2014-07-25 10:47:37 +02:00
Justin Nuß
dedb156d4a
Fix #321 . Allow empty comments as long as there are attachments.
2014-07-25 08:01:34 +02:00
Justin
ad7beb78d0
Fix #312 . Quote file names of attachments.
2014-07-24 23:13:35 +02:00
Justin Nuß
620c0ef297
Merge branch 'dev' of https://github.com/gogits/Gogs into trello/244
2014-07-24 19:15:35 +02:00
Justin Nuß
cbcd08aa17
Mention organisation users when organisation gets mentioned
2014-07-24 19:15:31 +02:00
Justin Nuß
4d702eb345
Allow disabling uploads
2014-07-24 15:51:40 +02:00