f9c42a196f
Cache: no longer using this file
2013-01-16 21:36:04 +01:00
29ec007979
Cache: dont migrate permissions, cache them on demain instead
2013-01-16 19:11:33 +01:00
5445b94416
merge master into filesystem
2013-01-16 19:04:50 +01:00
5bfe4adbaa
Whitespace cleanup
2013-01-16 18:09:16 +01:00
a8f963d9cf
Spaces to tabs
2013-01-16 18:09:16 +01:00
cb0fd30458
Merge pull request #1185 from owncloud/fixing-1162-master
...
handling proper display of files/folders with negative size
2013-01-16 05:18:53 -08:00
1f7bf57ece
Merge pull request #1195 from owncloud/cache_prepared
...
Cache prepared statements in OC_DB
2013-01-15 22:23:34 -08:00
f18fc1c510
Clear cached prepared statements when switching between mdb2 and pdo
2013-01-16 01:12:13 +01:00
4668f8c86e
Merge pull request #1178 from owncloud/return_true_because_of_ponies
...
Remove uneeded return
2013-01-15 14:01:48 -08:00
a08490364d
Cache prepared statements in OC_DB
2013-01-15 20:21:06 +01:00
7debfac0dc
Cache: more efficient upgrading
2013-01-15 19:11:12 +01:00
94068e5d08
Cache: show upgrade progress
2013-01-15 18:13:50 +01:00
9bf367e7f8
merge master into filesystem
2013-01-15 14:57:23 +01:00
388bb6a5e1
Merge branch 'master' into fixing-unused-and-undefined-in-master
2013-01-14 23:41:34 +01:00
44e5c052b3
handling proper display of files/folders with negative size
...
refs #1162
2013-01-14 23:39:31 +01:00
ab287d2ba4
Move { to same line
2013-01-14 22:04:31 +01:00
c845e75693
Expand if to multiple lines
...
Oneliners are ugly.
2013-01-14 22:01:52 +01:00
53ca0db434
Merge pull request #1177 from owncloud/OC_User--isAdminUser()
...
Check if user is admin - bool
2013-01-14 12:53:18 -08:00
eab6d7eb23
Enhanced auth is totally unmaintained and broken
...
Let's remove it, it's also not secure anymore with the introduction of
our API etc...
(And doesn't work with ldap etc…)
2013-01-14 21:39:49 +01:00
8b2307ce4b
Merge pull request #1172 from owncloud/isSubDirectory
...
Simplify the isSubDirectory() function
2013-01-14 12:36:38 -08:00
cc00c54f6a
Remove uneeded returns
2013-01-14 20:18:08 +01:00
e8b45caa51
Remove uneeded return
...
Thx @Raydiation
2013-01-14 19:57:28 +01:00
31b1a73e1f
Check if user is admin - bool
...
There was no "isAdminUser()" function which returned bool. This is
irritiating as there were a loooooooot of places in the code which
checked this itself with `OC_Group::inGroup($uid, 'admin)` - why not
use a function for this?
(Especially if you consider that we might change the group name in the
future, which would lead to problems then)
Additionally, @Raydiation needed such a method for his AppFramework :)
2013-01-14 19:45:17 +01:00
99adfbdb86
Check for string position instead of string existence
...
otherwise /foo/bar would be detected as a subfolder of /bar
THX @icewind1991
2013-01-14 16:51:35 +01:00
fa78fbe0c3
Merge pull request #1112 from Raydiation/master
...
This fixes a problem that prevented app routes from being loaded after ocs_api merge
2013-01-14 07:35:14 -08:00
c29310aaef
[tx-robot] updated from transifex
2013-01-14 00:18:21 +01:00
b7db967dc5
Commentblocks should begin with two *
2013-01-13 14:54:18 +01:00
c27833b143
Add @brief to description
2013-01-13 14:50:31 +01:00
e151210a62
Simplify the isSubDirectory() function
...
isSubDirectory() checks if a specified $sub is a subdirectory of the
$parent, this is needed to prevent file inclusions.
Actually, the current code is more kind of a "hack" which I always
struggle over if browsing through source. So this should be a much
better implementation.
The implementation is really straightforward:
- [realpath()](http://php.net/manual/function.realpath.php ) expands all
symbolic links and resolves references to '/./', '/../' and extra '/'
characters in the input path and return the canonicalized absolute
pathname.
- [strpos()](php.net/manual/function.strpos.php) returns FALSE if the
substring wasn't found.
Since this is an absolutely critical piece of code, I'd like to ensure
that this is absolutely safe!
2013-01-13 14:33:19 +01:00
094a852bff
Wrap the etag in double quotes
2013-01-11 21:09:58 -05:00
b30648cb7d
Don't waste time making another call since we know it doesn't exist
2013-01-11 21:09:01 -05:00
a00b9e0a03
Bump version
2013-01-11 21:01:28 -05:00
6f049d0889
Merge branch 'filesystem' into filesystem-etags
2013-01-11 21:00:02 -05:00
9e2f3a5324
Remove old create etag function
2013-01-11 20:59:53 -05:00
8a63bcc1e8
Don't use more entropy for etags
2013-01-11 20:56:36 -05:00
4835525c46
Switch scan to scanFile for root of mount points
2013-01-10 22:28:50 -05:00
60489764f3
Merge pull request #1133 from owncloud/add_linebreaks_in_sharing
...
add more linebreaks, replace SQL LIMIT with param
2013-01-10 15:14:14 -08:00
d03dce1283
[tx-robot] updated from transifex
2013-01-11 00:06:14 +01:00
aa15fcf22f
Scan mount points in root before adding a entry
2013-01-10 12:09:55 -05:00
23dd7f1bea
Merge pull request #1127 from owncloud/fixing-641-for-webdav-master
...
webdav returns "503 Service Unavailable" in case the ownCloud server is ...
2013-01-10 02:27:00 -08:00
106541361c
Change length of mimetypes to 255, the maximum length according to RFC 4288
2013-01-09 22:57:42 -05:00
912050afa0
[tx-robot] updated from transifex
2013-01-10 00:05:53 +01:00
42e3eaf45a
add more linebreaks, replace SQL LIMIT with param
2013-01-09 13:57:51 +01:00
ccdaec6296
webdav returns "503 Service Unavailable" in case the ownCloud server is currently in maintenance mode.
2013-01-09 00:37:50 +01:00
43415386a8
Upstream merged my patch to add additional ssl root certificates to the webdav client.
...
This means that OC_Connector_Sabre_Client is no longer needed
2013-01-08 17:44:28 +01:00
e8b195bf10
Almost fix Shared scanner...
2013-01-07 20:52:51 -05:00
75dbe88664
added cleanup recommendations by including ocs in the cachedKey method and moving the ocs routes stuff at the end of the loadRoutes method
2013-01-07 21:57:13 +01:00
5174eda232
Fix permissions for mount point
2013-01-07 15:21:38 -05:00
6801f82d09
Merge branch 'filesystem' into filesystem-etags
...
Conflicts:
lib/files/cache/cache.php
2013-01-07 10:28:37 -05:00
5ccbfd9079
readded ocs routes
2013-01-07 15:48:45 +01:00
Robin Appelman
Bart Visscher
Jan-Christoph Borchardt
Thomas Müller
Lukas Reschke
Michael Gapczynski
Jörn Friedrich Dreyer
Björn Schießle
Bernhard Posselt