summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-01-213-0/+3
|
* cached queries need to be reset on schema change because they become invalidThomas Mueller2013-01-201-0/+3
| | | | fixes: https://github.com/owncloud/apps/issues/468
* [tx-robot] updated from transifexJenkins for ownCloud2013-01-202-1/+3
|
* Also replace the backslash with a minusLukas Reschke2013-01-191-1/+2
| | | | For Windows systems
* Merge pull request #1214 from Raydiation/masterBernhard Posselt2013-01-191-0/+17
|\ | | | | Load Classpaths of apps before appinfo/routes.php
| * spaces to tabsBernhard Posselt2013-01-171-12/+12
| |
| * load classpaths of apps before routesBernhard Posselt2013-01-171-0/+17
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-01-192-0/+2
| |
* | Merge pull request #986 from owncloud/fixing-784-masterThomas Müller2013-01-182-2/+29
|\ \ | | | | | | the maximum upload size is now part of the response of the upload and de...
| * | fixing indentThomas Mueller2013-01-182-26/+26
| | |
| * | Merge branch 'master' into fixing-784-masterThomas Mueller2013-01-116-277/+611
| |\ \ | | | | | | | | | | | | | | | | Conflicts: apps/files/js/files.js
| * \ \ Merge branch 'master' into fixing-784-masterThomas Mueller2013-01-0630-732/+1063
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/ajax/upload.php apps/files/js/files.js lib/helper.php
| * | | | the maximum upload size is now part of the response of the upload and delete ↵Thomas Müller2012-12-202-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | operation. the maximum upload size is updated within the browser once an upload or delete operation has been finished
* | | | | Typo fix (comment) /lib/base.phpdavidgumberg2013-01-181-1/+1
| | | | |
* | | | | Fix wrong word in commentBart Visscher2013-01-181-1/+1
| | | | |
* | | | | fix error message, add "appid" to the output to know which app caused the ↵Björn Schießle2013-01-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | error if OC_App::getStorage() fails. Port of approved patch for stable45: https://github.com/owncloud/core/pull/1222
* | | | | Merge pull request #1205 from owncloud/ocs_apiThomas Müller2013-01-181-0/+2
|\ \ \ \ \ | | | | | | | | | | | | Return 401 headers when trying to access a restricted api call
| * | | | | Correct spelling of 'Authorization'tomneedham2013-01-171-1/+1
| | | | | |
| * | | | | Fix incorrect indentationTom Needham2013-01-161-2/+2
| | | | | |
| * | | | | Return 401 headers when authentication is required for the api callTom Needham2013-01-161-0/+2
| | | | | |
* | | | | | Merge pull request #1181 from owncloud/return-503-in-maintenanceThomas Müller2013-01-181-0/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | in case of maintenance the error page returns http status 503.
| * | | | | | in case of maintenance the error page returns http status 503.Thomas Mueller2013-01-141-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is necessary to enable the desktop sync client to react properly. Currently the SabreDAV plugin OC_Connector_Sabre_MaintenancePlugin is not executed because this error page is returned before the SabreDAV code is executed
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-1810-0/+10
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge pull request #1148 from seancomeau/topic/setupFrank Karlitschek2013-01-161-5/+35
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix issue #108
| * | | | | | Rename TestException to DatabaseSetupExceptionSean Comeau2013-01-141-5/+5
| | | | | | |
| * | | | | | Use a custom exception instead of adding a delimiter to the error messageSean Comeau2013-01-141-8/+31
| | | | | | |
| * | | | | | Throw an exception when creating a MySQL user fails and display exception ↵Sean Comeau2013-01-101-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | error text to user
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-171-0/+1
| | | | | | |
* | | | | | | Whitespace cleanupBart Visscher2013-01-1626-80/+78
| | | | | | |
* | | | | | | Spaces to tabsBart Visscher2013-01-166-696/+696
| | | | | | |
* | | | | | | Merge pull request #1185 from owncloud/fixing-1162-masterJan-Christoph Borchardt2013-01-162-5/+19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | handling proper display of files/folders with negative size
| * | | | | | | handling proper display of files/folders with negative sizeThomas Mueller2013-01-142-5/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refs #1162
* | | | | | | | Merge pull request #1195 from owncloud/cache_preparedThomas Müller2013-01-151-2/+14
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Cache prepared statements in OC_DB
| * | | | | | | | Clear cached prepared statements when switching between mdb2 and pdoRobin Appelman2013-01-161-2/+4
| | | | | | | | |
| * | | | | | | | Cache prepared statements in OC_DBRobin Appelman2013-01-151-0/+10
| | | | | | | | |
* | | | | | | | | Merge pull request #1178 from owncloud/return_true_because_of_poniesThomas Müller2013-01-152-8/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove uneeded return
| * | | | | | | | | Remove uneeded returnsLukas Reschke2013-01-142-5/+1
| | | | | | | | | |
| * | | | | | | | | Remove uneeded returnLukas Reschke2013-01-141-3/+0
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | Thx @Raydiation
* | | | | | | | | Merge branch 'master' into fixing-unused-and-undefined-in-masterThomas Mueller2013-01-1417-393/+661
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Move { to same lineLukas Reschke2013-01-141-2/+1
| | | | | | | | |
| * | | | | | | | Expand if to multiple linesLukas Reschke2013-01-141-2/+6
| | |/ / / / / / | |/| | | | | | | | | | | | | | Oneliners are ugly.
| * | | | | | | Merge pull request #1177 from owncloud/OC_User--isAdminUser()Bart Visscher2013-01-148-72/+29
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Check if user is admin - bool
| | * | | | | | | Enhanced auth is totally unmaintained and brokenLukas Reschke2013-01-142-47/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let's remove it, it's also not secure anymore with the introduction of our API etc... (And doesn't work with ldap etc…)
| | * | | | | | | Check if user is admin - boolLukas Reschke2013-01-148-25/+29
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 :)
| * | | | | | | Merge pull request #1172 from owncloud/isSubDirectoryBart Visscher2013-01-141-24/+4
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | Simplify the isSubDirectory() function
| | * | | | | | Check for string position instead of string existenceLukas Reschke2013-01-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | otherwise /foo/bar would be detected as a subfolder of /bar THX @icewind1991
| | * | | | | | Commentblocks should begin with two *Lukas Reschke2013-01-131-1/+1
| | | | | | | |
| | * | | | | | Add @brief to descriptionLukas Reschke2013-01-131-1/+1
| | | | | | | |
| | * | | | | | Simplify the isSubDirectory() functionLukas Reschke2013-01-131-22/+2
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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!
| * | | | | | Merge pull request #1112 from Raydiation/masterBart Visscher2013-01-141-17/+5
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | This fixes a problem that prevented app routes from being loaded after ocs_api merge