c02527e414
Merge pull request #3927 from nextcloud/minor-fixes
...
Namespace and array syntax fixes
2017-03-19 15:49:38 -06:00
d99ce3971b
Namespace and array syntax fixes
...
* minor fixes in preparation of a bigger DB and config PR
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-19 14:52:54 -06:00
ef789f8480
Merge pull request #3906 from nextcloud/shares-circles-2
...
Support Circles
2017-03-19 20:45:55 +01:00
9e1e7dac47
[tx-robot] updated from transifex
2017-03-18 01:07:50 +00:00
3adee0f18b
Merge pull request #3898 from nextcloud/issue-3627-always-suggest-cli-url
...
Always suggest the overwrite.cli.url
2017-03-18 00:01:17 +01:00
69694012ab
shares-circles
...
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
2017-03-17 18:48:33 -01:00
26eda9dd58
Merge pull request #3892 from nextcloud/downstream-27101
...
Redirect unlink to rmdir
2017-03-17 13:56:36 +01:00
75b81c3e01
Always suggest the overwrite.cli.url
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-17 13:40:58 +01:00
a5c8016c8b
Merge pull request #3883 from nextcloud/downstream-26968
...
Ignore exception when deleting keys of deleted user
2017-03-17 11:33:50 +01:00
c65848effe
Merge pull request #3878 from nextcloud/downstream-26303
...
Fixed failing test which was ignoring a required (not null) column
2017-03-17 11:10:21 +01:00
e548d27d3a
Merge pull request #3885 from nextcloud/downstream-26529
...
Skip FailedStorage in background scan
2017-03-17 10:06:58 +01:00
51846c95d9
Merge pull request #3856 from nextcloud/escape-likes-in-database-user-backend
...
Escape like parameters in database user backend
2017-03-17 08:53:10 +01:00
9915aa6d9c
Merge pull request #3870 from nextcloud/add-base-uri-to-csp-policy
...
Add base-uri to CSP policy
2017-03-17 08:39:02 +01:00
2ccf544ad7
Fixed failing test which was ignoring a required (not null) column ( #26303 )
...
* Fixed failing test which was ignoring a required (not null) column
* restored test to original, catching DriverException which also catches ConstraintViolationException
* catch ConstraintViolationException again
* removed unnecessary field from this test
* clobfield should be nullable
* clobfield now is nullable
* removed autoincrement since whenever this strategy is enabled, oracle would not throw constraint violation exceptions (needed for setValues), which mysql still does
* this field does not auto increment anymore
* mark integerfield as primary, since it is not getting marked as such through auto increment anymore,
integerfield default always has been 0 instead of null
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-17 00:09:07 -06:00
aebb8c3639
Ignore exception when deleting keys of deleted user
...
Whenever a user was deleted for encryption where the keys are stored in
the home, we can ignore user existence exceptions because it means the
keys are already gone.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-17 00:07:23 -06:00
cbebfaaf2b
Skip FailedStorage in background scan
...
The background job that scans storages must skip failed storages to
avoid potential exceptions, especially when the failed storage comes
from a shared storage where the source is not accessible.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-17 00:06:48 -06:00
7256940524
Redirect unlink to rmdir ( #27101 )
...
Many API callers will call unlink even for directories and it can mess
up with some wrappers like the encryption wrapper
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-16 23:45:03 -06:00
ead9a10cc5
Merge pull request #3619 from nextcloud/fix-scss-for-apps
...
Fix SCSS usage in apps
2017-03-16 22:51:31 -06:00
5683365a2c
[tx-robot] updated from transifex
2017-03-17 01:07:41 +00:00
39afcbd49f
Merge pull request #3679 from nextcloud/socialsharing
...
Add social sharing
2017-03-16 23:08:47 +01:00
d134dea508
Don't call function in constructor
...
The constructor is iniitiated already very early in base.php, thus requiring this here will break the setup and some more. For now we probably have to live with a static function call here thus.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-16 21:59:47 +01:00
cd4ebe2777
Merge pull request #3008 from nextcloud/appmenu-experiment
...
Show apps in header
2017-03-16 13:03:41 -06:00
adfd1e63f6
Add base-uri to CSP policy
...
As per https://twitter.com/we1x/status/842032709543333890 a nice security hardening
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-16 15:16:20 +01:00
57c1be8633
Merge pull request #3802 from Ko-/master
...
Check that set_time_limit is not disabled before calling it
2017-03-16 12:27:26 +01:00
7eae6690ad
Make app management icon act like a normal app icon
...
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-16 11:55:09 +01:00
61dc78e6dc
Fix menu issues
...
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-16 11:55:09 +01:00
a630e4629f
Generate seperate menu list for header bar
...
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-16 11:55:09 +01:00
e3e4cb3e67
Move active app to the first slot
...
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-16 11:55:09 +01:00
085891a15d
Escape like parameters in database user backend
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-15 22:46:40 +01:00
f2d3704e97
Merge pull request #3843 from nextcloud/encryption-fix-mail-share
...
take share by mail into consideration if we calculate the access list
2017-03-15 15:23:17 +01:00
4da6b7e796
[tx-robot] updated from transifex
2017-03-15 01:07:49 +00:00
67faf7edc4
Merge pull request #3838 from Xuanwo/basename-fix
...
[OC/Files/Cache]: Fix wrong usage of basename
2017-03-14 21:00:24 +01:00
25553172f4
Merge pull request #3836 from nextcloud/do-not-double-check-app-update
...
Do not check for app update twice
2017-03-14 19:26:01 +01:00
8f92808caf
take share by mail into consideration if we calculate the access list
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-03-14 17:40:42 +01:00
6565533d3b
Merge pull request #3600 from coletivoEITA/master
...
added method needsPartFile() in Storage
2017-03-14 15:14:59 +01:00
3c2312fb09
Merge pull request #3783 from andrius-kulbis/master
...
Fix deleted objectstore shares
2017-03-14 15:14:39 +01:00
13e50cbcd7
added method needsPartFile() in Storage
...
Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
2017-03-14 10:06:50 -03:00
210f4106c4
[OC/Files/Cache]: Fix wrong usage of basename
...
Fix https://github.com/nextcloud/server/issues/3837
Signed-off-by: Xuanwo <xuanwo@yunify.com>
2017-03-14 13:27:17 +08:00
252858ec5e
Do not double cherck app update
...
In base.php the apps are already checked for an update. No need to
repeat this during loading of the app.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-13 18:07:41 -06:00
6d0c756ff9
dont allow empty wildcard search
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-13 16:06:19 +01:00
4395cf4fa7
Merge pull request #3780 from GitHubUser4234/audit_log_agent
...
Audit log the User-Agent
2017-03-13 12:38:04 +01:00
f7cef9f702
Merge pull request #3772 from nextcloud/favorite-search
...
Allow searching for favorites
2017-03-13 00:55:12 -06:00
0024b67aaf
Check that set_time_limit is not disabled before calling it
...
Signed-off-by: Ko- <k.stoffelen@cs.ru.nl>
2017-03-11 17:04:21 +01:00
801b600ec3
Merge pull request #3739 from fti7/master
...
Serve robots.txt if the RewriteBase is configured
2017-03-11 09:56:38 +01:00
456cd81a20
[tx-robot] updated from transifex
2017-03-11 01:07:48 +00:00
f86b5c2ebb
Properly calculate webdir using the serverroot
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-10 20:00:34 +01:00
f7ebf1d47d
SCSS files don't exist on the default fs so just add them to the
...
resource list
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-10 19:13:44 +01:00
42ee401376
Merge pull request #3778 from nextcloud/verify_jpg_files
...
Test if a file is a valid jpg file
2017-03-10 18:17:51 +01:00
f74911b638
Merge pull request #3787 from nextcloud/ocs-cookie
...
dont require strict same site cookies for ocs requests
2017-03-10 18:14:38 +01:00
3ca9d53194
Fix SCSS usage in apps
...
* fix the web root detection of the ResourceLocator for apps
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-10 14:44:01 +01:00
Morris Jobke
Roeland Jago Douma
Nextcloud bot
Lukas Reschke
Maxence Lange
Joas Schilling
blizzz
Philipp Schaffrath
Vincent Petry
Julius Haertl
Bjoern Schiessle
Vinicius Cubas Brand
Xuanwo
Robin Appelman
Ko-
Roeland Jago Douma