a8094abac7
load classpaths of apps before routes
2013-01-17 21:42:46 +01:00
d85e440aa1
Merge pull request #1148 from seancomeau/topic/setup
...
Fix issue #108
2013-01-16 22:38:57 -08:00
433fa19268
[tx-robot] updated from transifex
2013-01-17 00:27:40 +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
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
0132a0b2cf
Rename TestException to DatabaseSetupException
2013-01-14 12:36:50 -08:00
8b2307ce4b
Merge pull request #1172 from owncloud/isSubDirectory
...
Simplify the isSubDirectory() function
2013-01-14 12:36:38 -08:00
42cd99626e
Use a custom exception instead of adding a delimiter to the error message
2013-01-14 11:57:40 -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
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
ba9c967435
Throw an exception when creating a MySQL user fails and display exception error text to user
2013-01-10 14:43:08 -08: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
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
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
5ccbfd9079
readded ocs routes
2013-01-07 15:48:45 +01:00
f80bc4ed53
fixed error that displayed a white page and a warning that routes could not be loaded from apps that was caused by the ocs_api merge
2013-01-07 15:34:42 +01:00
a21da9f9fd
fixing returns
2013-01-06 23:59:02 +01:00
1093cdd823
fixing returns
2013-01-06 23:57:27 +01:00
19edb29cc3
add missing return
2013-01-06 23:54:18 +01:00
cdd28fcc46
fixing undefined variable $where
2013-01-06 23:48:04 +01:00
408b2cba58
fixing undefined variable $result - should be $query I assume
2013-01-06 23:45:12 +01:00
01cecc9522
initialize $result
2013-01-06 23:43:02 +01:00
19e604c104
fixing call of OC_Log::write() - missing parameter
2013-01-06 23:30:17 +01:00
a143e77ee4
removing unused parameter $parameters
...
fixing undefined variable $useDir
2013-01-06 23:29:43 +01:00
035d0aa9d5
Merge branch 'master' into update-progress
2013-01-05 12:24:21 -05:00
f6426cee04
Tweak failure message and throw exceptions from updateDbFromStructure()
2013-01-05 12:13:36 -05:00
89823ef4f9
Modify and include additional update messages from updating apps
2013-01-05 11:28:01 -05:00
Bernhard Posselt
Frank Karlitschek
Jenkins for ownCloud
Bart Visscher
Jan-Christoph Borchardt
Robin Appelman
Lukas Reschke
Sean Comeau
Jörn Friedrich Dreyer
Björn Schießle
Michael Gapczynski