Morris Jobke
609e10238f
Merge pull request #12945 from owncloud/hhvm-image
...
HHVM: Do not call filesize(null), this function expects a string.
2014-12-18 22:20:56 +01:00
Andreas Fischer
3ebb69944b
Do not call filesize(null), this function expects a string.
...
filesize(null) yields an int on HHVM and thus exif_imagetype(null) is called.
2014-12-18 20:57:19 +01:00
Morris Jobke
85301c8b85
Merge pull request #12940 from drarko/master
...
Fix extra quotes in custom tags in header
2014-12-18 18:44:44 +01:00
drarko
faaa1a89cb
Fix extra quotes in custom tags in header
...
Fix #12939
2014-12-18 12:40:08 -03:00
Robin Appelman
1ef01de402
Merge pull request #12907 from owncloud/delete-invalid-external-share
...
Fix deleting invalid s2s shares
2014-12-18 16:38:13 +01:00
Jenkins for ownCloud
5c6e08213e
[tx-robot] updated from transifex
2014-12-18 01:56:40 -05:00
Robin McCorkell
619dcae7af
Merge pull request #12901 from owncloud/move-ldap-check-to-manager
...
Move the Null-Byte LDAP check to the user manager
2014-12-18 00:28:00 +00:00
Robin McCorkell
d83fdd7f9d
Merge pull request #12913 from owncloud/hhvm-memcached-clear
...
HHVM: Add workaround for missing Memcached::deleteMulti()
2014-12-18 00:27:07 +00:00
Morris Jobke
232d4385f4
Merge pull request #12917 from owncloud/fix-ocs-12915-api
...
Move basic auth login out of `isLoggedIn`
2014-12-18 00:57:22 +01:00
Lukas Reschke
058324b80e
Check basic auth header only for not-logged-in users
2014-12-17 21:42:07 +01:00
Morris Jobke
3d006207d1
Merge pull request #12892 from owncloud/is-addmin
...
Add isAdmin and isInGroup methods for the group manager
2014-12-17 21:40:26 +01:00
Lukas Reschke
a02b00445e
Store result of authentication
2014-12-17 20:22:51 +01:00
Lukas Reschke
b91a435ed4
Move basic auth login out of `isLoggedIn`
...
Potentially fixes https://github.com/owncloud/core/issues/12915 and opens the door for potential other bugs...
Please test very carefully, this includes:
- Testing from OCS via cURL (as in #12915 )
- Testing from OCS via browser (Open the "Von Dir geteilt" shares overview)
- WebDAV
- CalDAV
- CardDAV
2014-12-17 20:12:14 +01:00
Andreas Fischer
fcf3c5197f
HHVM: Add workaround for missing Memcached::deleteMulti()
2014-12-17 18:10:11 +01:00
Bernhard Posselt
6779bf113d
add isAdmin and isInGroup methods for the group manager
2014-12-17 17:41:57 +01:00
Bernhard Posselt
236632702c
add a isLoggedIn method to the usersession and deprecate the isLoggedIn method on the api
2014-12-17 17:40:52 +01:00
Andreas Fischer
8c509c3437
HHVM: Call libxml_use_internal_errors() instead of surpressing errors.
...
In contrast to the previous solution, this also works on HHVM.
2014-12-17 17:00:10 +01:00
Robin Appelman
9ddd5033d4
Movable mountpoints are always deletable
2014-12-17 16:09:28 +01:00
Lukas Reschke
f6820406b6
Move the Null-Byte LDAP check to the user manager
...
The existing method is deprecated and just a wrapper around the manager method. Since in the future other code paths might call this function instead we need to perform that check here.
Related to http://owncloud.org/security/advisory/?id=oc-sa-2014-020
2014-12-17 12:47:00 +01:00
Thomas Müller
77c4c2856a
Merge pull request #12889 from owncloud/deprecation-time
...
Deprecate old and replaced appframework apis
2014-12-17 11:28:01 +01:00
Jenkins for ownCloud
6d80524e67
[tx-robot] updated from transifex
2014-12-17 01:56:41 -05:00
Bernhard Posselt
d59c4e832f
first round of deprecation
2014-12-16 19:50:31 +01:00
Joas Schilling
26100a6dfb
Move timezone logic out of server.php
2014-12-16 16:16:22 +01:00
Jenkins for ownCloud
5b9c453071
[tx-robot] updated from transifex
2014-12-16 01:55:32 -05:00
Lukas Reschke
be3d4fd303
Merge pull request #12360 from owncloud/files-tags
...
Add favorites to files app
2014-12-15 19:55:18 +01:00
Lukas Reschke
76357af2d5
Merge pull request #11946 from owncloud/load-vendor-from-core-json
...
Implement method that reads vendor libs from core.json
2014-12-15 16:18:38 +01:00
Jörn Friedrich Dreyer
6602d3ac77
Merge pull request #12555 from owncloud/app_specific_search
...
introduce inApps[] filter for search via ajax query
2014-12-15 16:14:40 +01:00
Morris Jobke
9f30d3529a
Implement method that reads vendor libs from core.json
...
* includes them at the beginning of initTemplate()
2014-12-15 14:30:03 +01:00
Morris Jobke
d367d1b06a
Merge pull request #12839 from oparoz/ControllerMethodReflector
...
\OCP\AppFramework\Utility\IControllerMethodReflector
2014-12-15 14:20:26 +01:00
Bernhard Posselt
be45366013
Merge pull request #12625 from owncloud/app-dependencies-libs-and-commands
...
adding dependencies for command line tools and php libraries
2014-12-15 12:34:46 +01:00
Thomas Müller
e58b9d3eb7
fixing owncloud version
2014-12-15 12:23:56 +01:00
Vincent Petry
c6be491a89
Return file info from Node API
2014-12-15 12:10:54 +01:00
Morris Jobke
b831914aa6
Merge pull request #11991 from owncloud/bower-jquery-ui
...
bower jquery-ui - exported changes to a separate css file
2014-12-15 11:39:31 +01:00
Jenkins for ownCloud
036456fe16
[tx-robot] updated from transifex
2014-12-15 01:54:30 -05:00
Olivier Paroz
469fd3b3a3
Olivier Paroz \OCP\AppFramework\Utility\IControllerMethodReflector
2014-12-14 23:54:31 +01:00
Philipp Knechtges
768aea57d3
make regex in controllermethodreflector.php compatible with PCRE 6.x
...
The syntax ?<...> seems to be only supported from PCRE 7.0 on. For
backwards-compability ?P<...> is used.
2014-12-14 10:52:21 +01:00
Jenkins for ownCloud
6ae0217326
[tx-robot] updated from transifex
2014-12-14 01:54:56 -05:00
Morris Jobke
5b3971f002
Merge pull request #12639 from owncloud/bad_mtime_format
...
Fix formatting of bad dates from external storages
2014-12-13 10:07:10 +01:00
Morris Jobke
edcd2f2706
bower jquery-ui - exported changes to a separate css file
2014-12-13 09:47:34 +01:00
Morris Jobke
efb495b09f
Merge pull request #12726 from owncloud/add-filter-for-backend-to-rest-index
...
Add filter for backend to rest index
2014-12-13 08:50:15 +01:00
Jenkins for ownCloud
416e21d902
[tx-robot] updated from transifex
2014-12-13 01:55:24 -05:00
Robin McCorkell
fdbb68a3c3
Return ? if mtime is 0 or -1
...
Tooltip contains 'Unable to determine date'. Fixes #6395
2014-12-12 23:54:18 +00:00
Vincent Petry
4b57892c4e
Merge pull request #12778 from owncloud/searchbytags2
...
Added searchByTags to view, storage and cache
2014-12-12 14:27:19 +01:00
Joas Schilling
4f92e4a233
Merge pull request #12808 from owncloud/add-special-parameterlist-to-manager
...
Add special parameterlist to manager
2014-12-12 13:03:26 +01:00
Thomas Müller
dcb88e395b
rework api of DependencyAnalyzer
2014-12-12 12:34:53 +01:00
Vincent Petry
b1bef5cc15
Merge pull request #12587 from owncloud/dav-logerrors
...
Log exceptions in DAV storage
2014-12-12 11:58:04 +01:00
Joas Schilling
7542883bf8
Merge pull request #12807 from owncloud/fix-timespan-language
...
Correctly inject the language into the subcall
2014-12-12 11:57:22 +01:00
Vincent Petry
3878c3782f
Added searchByTag in cache jail wrapper
2014-12-12 11:48:42 +01:00
Vincent Petry
15ecb28d50
Make $userId mandatory for searchByTags
...
$userId is now a mandatory parameter for searchByTags.
Also fixed some places in the code where the argument was missing (Node
API and View)
2014-12-12 11:18:35 +01:00
Joas Schilling
811f9251d6
Correctly inject the language into the subcall
2014-12-12 11:00:07 +01:00