dfaaebd765
Merge pull request #3417 from nextcloud/push-notification
...
Push notification
2017-02-10 16:00:47 -06:00
abf0606054
Merge pull request #3430 from nextcloud/fix-ios-client-detection
...
Fix detection of the new iOS app
2017-02-10 14:24:45 -06:00
b4ade76665
Merge pull request #3424 from nextcloud/fix-upgrade-path
...
Fix return value of getAllowedPreviousVersions()
2017-02-10 11:48:30 +01:00
33fb86f68b
Fix detection of the new iOS app
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-10 10:10:21 +01:00
d548329543
Set vendor during install
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-09 23:37:00 -06:00
b8c749b903
Fix return value of getAllowedPreviousVersions()
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-09 23:24:24 -06:00
efdc51c155
Make sure to use the right appdata directory
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-09 15:03:00 +01:00
7c47f822a1
Save the used token id in the session so it can be used later on
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-09 15:02:59 +01:00
bf88060a98
Merge pull request #3297 from nextcloud/cloud-id-resolve
...
Add a single public api for resolving a cloud id to a user and remote and back
2017-02-09 14:54:32 +01:00
0d8d658b7e
fix copyright headers
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-02-09 13:32:36 +01:00
f6cd5200a2
clean cloud ids
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-02-09 13:31:06 +01:00
4a5a3681d9
Merge pull request #3184 from nextcloud/issue-3165
...
Prevent migration from ownCloud 11 to Nextcloud 12
2017-02-09 13:29:08 +01:00
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
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
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
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
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
Morris Jobke
Björn Schießle
Joas Schilling
Robin Appelman
Lukas Reschke
Christoph Wurst
John Molakvoæ (skjnldsv)
blizzz
Jörn Friedrich Dreyer