a7cc8c86ab
Redirect to 2FA selection screen
...
Apps like 'rainloop' use \OCP\Util::isLoggedIn() to check whether the
current request is authenticated. Since we redirected to the index
page before, it resulted in an infinite redirection loop. This change
sets the redirection URL to the 2FA selection page, which is the only
allowed page in that authentication state.
Fixes https://github.com/nextcloud/server/issues/3702
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-03 14:31:57 +02:00
455542d306
Merge pull request #4166 from nextcloud/issue-4165-invalid-int-for-transparency-on-calendars
...
Make sure transparency is an integer when saving a calendar
2017-04-03 12:46:00 +02:00
13e7a93860
Merge pull request #4189 from nextcloud/add-issue-template-app
...
Add reference to issue template app
2017-04-03 12:12:00 +02:00
543555ec95
Update issue_template.md
2017-04-03 12:11:34 +02:00
cbe44043be
Merge pull request #4131 from nextcloud/fix-jscombiner
...
Fix check for cache value in JSCombiner
2017-04-03 11:27:39 +02:00
47e342c730
Merge pull request #4175 from nextcloud/fix-socialmenudisplay
...
Do not show social menu when there is no link share
2017-04-03 10:59:44 +02:00
d56f6399eb
[tx-robot] updated from transifex
2017-04-03 00:08:20 +00:00
7909d4e46c
Add reference to issue template app
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-02 22:13:04 +02:00
f31dafe4a8
Merge pull request #4183 from nextcloud/css-shortcuts-view
...
Add CSS for styling of keyboard shortcuts view
2017-04-02 16:45:07 +02:00
0056211672
[tx-robot] updated from transifex
2017-04-02 00:07:48 +00:00
2fa84ecfe0
Merge pull request #4139 from nextcloud/phpseclib
...
[3rdparty] Bump phpseclib to 2.0.4
2017-04-01 14:00:25 +02:00
468f502c8d
Merge pull request #4174 from nextcloud/mergejs-newline
...
mergejs should print a newline between imports
2017-04-01 08:38:47 +02:00
9098042c95
[tx-robot] updated from transifex
2017-04-01 00:08:09 +00:00
2950bcbc70
Do not show social menu when there is no link share
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-31 17:29:41 +02:00
04fc00fcdf
mergejs should print a newline between imports
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-31 17:06:38 +02:00
57020a0c36
Merge pull request #3438 from nextcloud/external-storage-user-folder
...
Allow using '/' as external storage mountpoint
2017-03-31 15:07:39 +02:00
85da9378c0
Merge pull request #4140 from nextcloud/no_encryption_no_wrapper
...
Don't add the Encryption Storage Wrapper if there are no encryption modules
2017-03-31 14:49:38 +02:00
6a6300b1f2
[tx-robot] updated from transifex
2017-03-31 00:08:35 +00:00
548871a9f3
Merge pull request #3832 from nextcloud/fix_1303
...
Do not clear CSRF token on logout (fix for #1303 )
2017-03-30 18:25:50 +02:00
43143e170e
Make sure transparency is an integer when saving a calendar
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-30 17:58:33 +02:00
7d4c4224d1
fix setup of external storage integration tests
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 17:16:59 +02:00
a51e4dd259
Merge pull request #4150 from nextcloud/capped-memcache-push
...
support pushing to CappedMemoryCache
2017-03-30 15:16:33 +02:00
0fb7c631ce
Merge pull request #4128 from nextcloud/updateclipboard
...
Update clipboard.js
2017-03-30 14:37:03 +02:00
70f93bf53a
Merge pull request #4143 from nextcloud/ldap-downstream-64
...
Correctly apply quota
2017-03-30 14:10:21 +02:00
bca7257920
Merge pull request #3089 from nextcloud/cache-move-single-query
...
Move all children of a folder in a single query
2017-03-30 14:08:31 +02:00
7788afaccf
Add CSS for styling of keyboard shortcuts view
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-03-30 13:07:26 +02:00
0aeb595784
user ids are strings
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 12:24:46 +02:00
dc4b983639
support pushing to CappedMemoryCache
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 11:21:32 +02:00
d4a7cfec7c
rename fun to func
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 11:15:06 +02:00
fee818f493
Add tests for query builder (i)like
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 11:15:03 +02:00
3355fd549f
dont double escape
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 11:14:59 +02:00
07449a4885
update autoloader
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 11:14:56 +02:00
4125bdeb93
fix licence headers
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 11:14:52 +02:00
4b7bc2af0e
Move all children of a folder in a single query
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 11:14:48 +02:00
4279b13270
Add function builder to the query builder
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 11:09:26 +02:00
a65652fc1e
add support for escaping like parameters when using the query builder
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 11:09:22 +02:00
83f3990e06
Add MD5() to sqlite
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 11:09:19 +02:00
1ee7e1c0b1
Merge pull request #4132 from nextcloud/fix-safari-gzip
...
Fix gzip files for Safari
2017-03-30 10:47:28 +02:00
4debe9b080
[3rdparty] Bump phpseclib to 2.0.4
...
See: https://github.com/phpseclib/phpseclib/blob/master/CHANGELOG.md
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-30 09:43:59 +02:00
85fcd42065
Merge pull request #4100 from nextcloud/header-indicator
...
show triangle below user menu too when an entry inside there is active
2017-03-29 21:43:18 -06:00
f984cf0987
[tx-robot] updated from transifex
2017-03-30 00:07:41 +00:00
e8f2ee769b
Merge pull request #4142 from nextcloud/numeric_avatar
...
Allow avatars for full numeric users
2017-03-29 17:17:19 -06:00
d17678b5b2
Merge pull request #4141 from nextcloud/ldap-downstream-9
...
Convert the group limit to match the same behaviour as the user search
2017-03-29 15:47:28 -06:00
0da04fd284
Fix tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-29 22:54:08 +02:00
0315e2ea36
Merge pull request #4145 from nextcloud/ldap-downstream-54
...
Add tooltips to LDAP wizard special attributtes
2017-03-29 19:31:35 +02:00
6d8e447895
Merge pull request #4108 from nextcloud/color-variable-rename
...
rename confusing getMailHeaderColor to getColorPrimary, ref #3491
2017-03-29 19:13:36 +02:00
636575e3de
Merge pull request #3329 from andreas-p/ldap_no-memberof-with-memberuid
...
Ldap no memberof with memberuid
2017-03-29 19:12:51 +02:00
111c9f7563
Don't add the Encryption Storage Wrapper if there are no encryption modules
...
fixes #4125
If there is no encryption module enabled it makes no sense to setup the
encryption wrapper (because we can't do anything anyway).
This saves reading the header of files.
Especialy on external storage/objectstore this should improve
performance
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-29 18:57:56 +02:00
c1030a34a5
Merge pull request #4062 from nextcloud/downstream-26872
...
Adding dav resource for avatars
2017-03-29 10:30:22 -06:00
354a24e0aa
also rename defaultMailHeaderColor to defaultColorPrimary
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-03-29 18:23:23 +02:00
Christoph Wurst
Roeland Jago Douma
Jos Poortvliet
Christoph Wurst
Nextcloud bot
Lukas Reschke
Roeland Jago Douma
Björn Schießle
Joas Schilling
Robin Appelman
Jan-Christoph Borchardt
Morris Jobke