ed4633a552
Merge pull request #3408 from nextcloud/nullstorage-free-space
...
return unknown free space from nullstorage
2017-02-09 13:17:54 +01:00
51f0555b5c
Merge pull request #3396 from nextcloud/dont-log-password-on-failed-confirmation
...
Don't log the password on confirmPassword when LDAP throws an exception
2017-02-09 12:19:53 +01:00
ac841ee002
Merge pull request #3362 from nextcloud/fix/nc-token-cookie-name
...
oc_token should be nc_token
2017-02-09 10:07:59 +01:00
ad5d04ccbe
return unknown free space from nullstorage
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-02-08 16:38:00 +01:00
ae66cf8d37
add tests
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-02-08 15:17:03 +01:00
fa49c4a13b
Add a single public api for resolving a cloud id to a user and remote and back
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-02-08 15:17:02 +01:00
d0e6235b03
Don't log the password on confirmPassword when LDAP throws an exception
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-07 12:16:11 +01:00
9b6f99ab08
Update license header
...
Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
2017-02-07 01:25:39 +01:00
5157f16d28
Merge pull request #3352 from nextcloud/public-page-guest-css-loader
...
Fix public page css fallback loading
2017-02-06 18:15:56 -06:00
fa1d607bfa
Merge remote-tracking branch 'nextcloud/master'
...
Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
2017-02-07 00:15:30 +01:00
3d8a300b77
Lower log levels of resource locator
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-02-03 13:09:33 +01:00
5e728d0eda
oc_token should be nc_token
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-02-02 21:56:44 +01:00
6feff0ceba
Add check if UserManager is of type PublicEmitter before calling preLogin hook
...
Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
2017-02-01 21:53:50 +01:00
e30d28f7eb
Change where preLogin hook gets called
...
Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
2017-02-01 21:53:42 +01:00
6ab0a3215d
Remove preLoginValidation hook
...
Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
2017-02-01 21:53:29 +01:00
e14d50eb1f
Fix indentation
...
Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
2017-02-01 21:50:47 +01:00
4ebcd5ac0b
Add preLoginValidation hook
...
Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
2017-02-01 21:50:25 +01:00
2c9d7eeb76
Fix public page css fallback loading
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-02-01 18:03:51 +01:00
db5af891c3
Merge pull request #3321 from nextcloud/revert-unintentional-change-of-log-timestamp-format
...
Revert unintentional log timestamp format change
2017-01-31 08:44:06 -06:00
5bad417e57
Merge pull request #2044 from nextcloud/login-credential-store
...
Login credential store
2017-01-30 19:30:04 -06:00
687e38c409
Merge pull request #2970 from nextcloud/notify-self-test
...
Add self-test for files_external:notify
2017-01-30 17:15:57 -06:00
f70f427a63
Merge pull request #3298 from nextcloud/downstream-26928
...
remove obsolete hack (#26928 )
2017-01-30 18:01:06 +01:00
0a837ac64e
Revert unintentional log timestamp format change
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-30 15:06:23 +01:00
64e9a1aec0
Merge pull request #3176 from nextcloud/default-value-datadir
...
Add proper default value for datadir
2017-01-30 13:01:24 +01:00
6fd7d4efd0
remove obsolete hack ( #26928 )
...
* remove obsolete hack
> // file_get_contents() has a memory leak: https://bugs.php.net/bug.php?id=61961
was closed 4 years ago. we could also use the Common implementation
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-27 12:20:48 -06:00
8b95bd29ee
Merge pull request #2822 from nextcloud/add-navigation-via-info.xml
...
Add navigation via info.xml (#26785 )
2017-01-27 11:25:26 -06:00
05884bcd7c
Merge pull request #3178 from nextcloud/default-value-logdateformat
...
fix default value for logdateformat
2017-01-27 12:08:57 +01:00
269747985e
Add a more powerful notify mechanism
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-27 10:44:33 +01:00
b5990b740d
Merge pull request #3046 from nextcloud/issue-2190-imagepath-is-root-sensitive
...
Make sure different webroots use different cached paths
2017-01-27 10:14:22 +01:00
27f8a832e4
Force to specify the name
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-27 09:44:11 +01:00
98dc58356f
Merge pull request #3284 from nextcloud/remove-avatar-fixup
...
remote now unneeded AvatarPermissions repair step
2017-01-26 20:14:24 -06:00
e21170bd1a
Merge pull request #3246 from nextcloud/fix-sqlite-dependency
...
Remove useless dependency on SQLite (non-PDO)
2017-01-26 15:41:11 -06:00
c76fe2b4f5
remote now unneeded AvatarPermissions repair step
...
Avatars are now stored in appdata
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-26 19:24:55 +01:00
29f5ab1758
Merge pull request #3238 from nextcloud/dav-test
...
Make DAV external storage test more reliable
2017-01-26 18:43:36 +01:00
e7523b07bd
Merge pull request #3197 from nextcloud/enable-scss-for-all-apps
...
Enable every app to generate their scss file
2017-01-25 22:53:23 -06:00
4536ead454
Remove useless dependency on SQLite (non-PDO)
...
* we only require the PDO driver
* fixes #481
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-25 22:23:05 -06:00
2520a4831b
Make sure we use the correct storage id when scanning a jailed storage
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-25 17:03:45 +01:00
f469b3e958
Merge pull request #3223 from nextcloud/fix-public-page-style
...
Fix public page style
2017-01-25 11:45:36 +01:00
95ab46e3d2
Merge pull request #3030 from nextcloud/filesapi-renamefailcase
...
Fix files node API failed rename/copy
2017-01-24 21:23:59 -06:00
e09bba5e36
Merge pull request #3151 from nextcloud/navigation-icons
...
add icons to navigation of personal & admin settings
2017-01-24 10:56:31 -06:00
dcad6032b1
Appdata var fix
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-24 17:46:20 +01:00
a440c3e94c
Remove unused webroot
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-24 17:27:35 +01:00
38ec2a35f2
Make DAV external storage test more reliable
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-24 16:56:24 +01:00
f55260bc83
Merge pull request #3214 from nextcloud/cache-storage-info
...
cache the storage info for 5 min
2017-01-24 13:49:45 +01:00
cbc18b7c8b
hash the path used for the cache key to prevent key length problems
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-24 11:18:05 +01:00
d4d116503c
Merge pull request #3212 from mwalbeck/mimetype-hidden-files
...
Mimetype detection for hidden files
2017-01-23 21:45:16 +01:00
9b0c6c0eff
Merge pull request #3157 from nextcloud/fcloseafterkill
...
[uc] Prevent PHP request to get killed when using fclose callback (#26775 )
2017-01-23 13:51:43 -06:00
46ef0f832d
Fix public page style
...
* checks if the user is on the login page or not instead of check if the user is logged in
* fixes #3207
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-23 12:42:59 -06:00
3d99ec6832
Reduced code for filename trim
...
Signed-off-by: Magnus Walbeck <mw@mwalbeck.org>
2017-01-23 17:14:39 +01:00
e38a978623
cache the storage info for 5 min
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-23 14:52:50 +01:00
eadc1ac637
Mimetype detection for hidden files
...
Signed-off-by: Magnus Walbeck <mw@mwalbeck.org>
2017-01-23 13:28:35 +01:00
0aaf209c66
Prevent PHP request to get killed when using fclose callback ( #26775 )
...
* Prevent PHP request to get killed when using fclose callback
* Add ignore_user_abort everywhere where the time limit is set to 0
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-23 12:33:20 +01:00
5d486478d3
Merge pull request #3141 from nextcloud/subadmin-check-on-removing-user-from-group
...
Subadmin check on removing user from group
2017-01-23 12:10:06 +01:00
18d7701d09
Prevent migration from ownCloud 11 to Nextcloud 12
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-23 12:04:46 +01:00
4ceb2bf84c
Enable every app to generate their scss file
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-22 19:33:45 +01:00
bde1150d04
Merge pull request #3004 from nextcloud/fix-installation-css
...
Fixed installation page
2017-01-22 18:28:33 +01:00
2316083256
fix default value for logdateformat - fixes #3107
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-19 20:08:15 -06:00
12e3b357d4
Fix default of mail_smtpmode - fixes #3102
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-19 19:59:53 -06:00
a4ad8af6e3
Add proper default value for datadir
...
* better safe than sorry
* fixes #3091
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-19 19:49:41 -06:00
c3985aba70
Add the icon for the default sections
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-19 10:42:21 +01:00
cdf01feba7
add action to existing brute force protection
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-18 15:25:16 +01:00
32e0ec3e58
handle optional annotation parameters
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-18 15:25:16 +01:00
29a0a23918
Fix the regex for annotations with values
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-18 15:25:16 +01:00
df296249d6
introduce brute force protection for api calls
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-18 15:25:15 +01:00
55db07a20b
Fix CamelCasing
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-18 11:45:26 +01:00
4009d3db03
Merge pull request #3116 from nextcloud/spreed-turnserver-secret-is-sensitive
...
Make sure the spreed TURN server secret stays a secret
2017-01-17 14:49:43 +01:00
ce973929e8
Merge pull request #3075 from nils/debug-no-versionhash
...
Do not add version hash in debug mode
2017-01-17 11:44:50 +01:00
30b9262a5a
Make sure the spreed TURN server secret stays a secret
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-17 11:29:10 +01:00
aea1b72f54
Merge pull request #1594 from nextcloud/markdown-support-for-app-descriptions
...
Markdown support for app descriptions
2017-01-17 11:11:16 +01:00
012708e1ba
Merge pull request #3023 from nextcloud/issue-2915-filter-out-sensitive-appconfigs
...
Filter out sensitive appconfig values
2017-01-17 11:01:42 +01:00
ba3506c431
[Enhancement] Do not add version hash in debug mode
...
Signed-off-by: Nils <git@to.nilsschnabel.de>
2017-01-15 13:29:32 +01:00
fcfb4205bc
Fix tests
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-13 18:33:43 +01:00
587eca3ccd
Remove the magic parsing of the description
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-13 18:33:42 +01:00
91beb178a7
Merge pull request #3051 from nextcloud/issue-2831-change-row-format-before-collation
...
Change the row-format before changing the collation
2017-01-13 14:43:06 +01:00
622101f2dd
Merge pull request #2918 from nextcloud/encryption-recovery-improvements
...
create new encryption keys on password reset and backup the old one
2017-01-13 11:28:43 +01:00
77b5d7bc86
Change the row-format before changing the collation
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-12 16:54:29 +01:00
77577b952b
Make sure different webroots use different cached paths
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-12 15:58:18 +01:00
e667b28298
Fix files node API failed rename/copy
...
Whenever a rename or copy operation failed on the view, we must throw
an exception instead of just ignoring.
Signed-off-by: Vincent Petry <pvince81@owncloud.com>
2017-01-12 13:52:59 +01:00
5dc6899d1a
Fix tests
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-12 10:49:22 +01:00
140555b786
always allow remembered login
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-11 19:20:11 +01:00
21d3fe5883
do not hard-require the token provider
...
The provider might need DB access and therefore depenedency
resolution fails on the setup page where we cannot inject
the db implementation.
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-11 19:20:11 +01:00
6f74ecd94a
use login hook credentials as fallback
...
If no session token is available, we can use the credentials provided
by the login hook.
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-11 19:20:11 +01:00
3316a9d294
fix @since annotations (9.1->12)
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-11 19:20:11 +01:00
46adb3eced
replace session implementation if it changes at runtime
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-11 19:20:11 +01:00
a6dca9e7a0
add login credential store
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-11 19:20:09 +01:00
eb5ea0e260
Refactor files node API for more code reuse
...
Signed-off-by: Vincent Petry <pvince81@owncloud.com>
2017-01-11 14:53:42 +01:00
005ce8aaf6
Merge pull request #3007 from Loki3000/master
...
Remove non required db requests
2017-01-11 12:37:54 +01:00
ce7836378c
Filter out sensitive appconfig values
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-11 11:42:36 +01:00
447e388ce9
Merge pull request #2744 from nextcloud/oc_26324
...
[downstream] Fix DAV stat cache to properly cache 404
2017-01-11 08:16:40 +01:00
f515c6db4a
Merge pull request #2745 from nextcloud/oc_26590
...
[downstream] Skip local shares in bkg scan and occ files:scan (#26590 )
2017-01-11 08:16:12 +01:00
a90cbb0f09
Merge pull request #2951 from nextcloud/handle-nextcloud-log-type-gracefully
...
Handle log_type "nextcloud" more gracefully
2017-01-11 08:14:24 +01:00
e4b3ba6590
Create unified css file and merge all needed data into this file
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-10 17:50:29 +01:00
fcda3a20f4
create new encryption keys on password reset and backup the old one
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-10 17:04:32 +01:00
00b17c3af5
Only check for local shared storages
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-01-10 16:14:21 +01:00
706655ef20
Skip local shares in bkg scan and occ files:scan ( #26590 )
...
Local shares should only be scanned when doing it for the owner to
avoid repeatedly rescanning the same shared storage over and over again
for every recipient.
2017-01-10 16:11:45 +01:00
7e06f051c9
remove non required sql requests
...
```
SELECT `appid`, `configkey`, `configvalue` FROM `preferences` WHERE `userid` = '';
```
2017-01-10 17:16:56 +03:00
8ab16f87ac
spaces added
2017-01-10 16:44:14 +03:00
6a74f7db11
spaces added
2017-01-10 16:43:43 +03:00
5c77923360
allowed '0' uid
2017-01-10 16:39:10 +03:00
b7e6c5ecdf
allowed '0' uid
2017-01-10 16:37:18 +03:00
Joas Schilling
Lukas Reschke
Robin Appelman
Sandro Lutz
Morris Jobke
Christoph Wurst
John Molakvoæ (skjnldsv)
blizzz
Jörn Friedrich Dreyer
Björn Schießle
Magnus Walbeck
Vincent Petry
Christoph Wurst
Nils
Roeland Jago Douma
Roeland Jago Douma
Loki3000