Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-21 | 3 | -0/+3 |
| | |||||
* | cached queries need to be reset on schema change because they become invalid | Thomas Mueller | 2013-01-20 | 1 | -0/+3 |
| | | | | fixes: https://github.com/owncloud/apps/issues/468 | ||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-20 | 2 | -1/+3 |
| | |||||
* | Also replace the backslash with a minus | Lukas Reschke | 2013-01-19 | 1 | -1/+2 |
| | | | | For Windows systems | ||||
* | Merge pull request #1214 from Raydiation/master | Bernhard Posselt | 2013-01-19 | 1 | -0/+17 |
|\ | | | | | Load Classpaths of apps before appinfo/routes.php | ||||
| * | spaces to tabs | Bernhard Posselt | 2013-01-17 | 1 | -12/+12 |
| | | |||||
| * | load classpaths of apps before routes | Bernhard Posselt | 2013-01-17 | 1 | -0/+17 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-19 | 2 | -0/+2 |
| | | |||||
* | | Merge pull request #986 from owncloud/fixing-784-master | Thomas Müller | 2013-01-18 | 2 | -2/+29 |
|\ \ | | | | | | | the maximum upload size is now part of the response of the upload and de... | ||||
| * | | fixing indent | Thomas Mueller | 2013-01-18 | 2 | -26/+26 |
| | | | |||||
| * | | Merge branch 'master' into fixing-784-master | Thomas Mueller | 2013-01-11 | 6 | -277/+611 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/files.js | ||||
| * \ \ | Merge branch 'master' into fixing-784-master | Thomas Mueller | 2013-01-06 | 30 | -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üller | 2012-12-20 | 2 | -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.php | davidgumberg | 2013-01-18 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Fix wrong word in comment | Bart Visscher | 2013-01-18 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | fix error message, add "appid" to the output to know which app caused the ↵ | Björn Schießle | 2013-01-18 | 1 | -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_api | Thomas Müller | 2013-01-18 | 1 | -0/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | Return 401 headers when trying to access a restricted api call | ||||
| * | | | | | Correct spelling of 'Authorization' | tomneedham | 2013-01-17 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Fix incorrect indentation | Tom Needham | 2013-01-16 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Return 401 headers when authentication is required for the api call | Tom Needham | 2013-01-16 | 1 | -0/+2 |
| | | | | | | |||||
* | | | | | | Merge pull request #1181 from owncloud/return-503-in-maintenance | Thomas Müller | 2013-01-18 | 1 | -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 Mueller | 2013-01-14 | 1 | -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 transifex | Jenkins for ownCloud | 2013-01-18 | 10 | -0/+10 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | Merge pull request #1148 from seancomeau/topic/setup | Frank Karlitschek | 2013-01-16 | 1 | -5/+35 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix issue #108 | ||||
| * | | | | | | Rename TestException to DatabaseSetupException | Sean Comeau | 2013-01-14 | 1 | -5/+5 |
| | | | | | | | |||||
| * | | | | | | Use a custom exception instead of adding a delimiter to the error message | Sean Comeau | 2013-01-14 | 1 | -8/+31 |
| | | | | | | | |||||
| * | | | | | | Throw an exception when creating a MySQL user fails and display exception ↵ | Sean Comeau | 2013-01-10 | 1 | -3/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | error text to user | ||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-17 | 1 | -0/+1 |
| | | | | | | | |||||
* | | | | | | | Whitespace cleanup | Bart Visscher | 2013-01-16 | 26 | -80/+78 |
| | | | | | | | |||||
* | | | | | | | Spaces to tabs | Bart Visscher | 2013-01-16 | 6 | -696/+696 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #1185 from owncloud/fixing-1162-master | Jan-Christoph Borchardt | 2013-01-16 | 2 | -5/+19 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | handling proper display of files/folders with negative size | ||||
| * | | | | | | | handling proper display of files/folders with negative size | Thomas Mueller | 2013-01-14 | 2 | -5/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refs #1162 | ||||
* | | | | | | | | Merge pull request #1195 from owncloud/cache_prepared | Thomas Müller | 2013-01-15 | 1 | -2/+14 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Cache prepared statements in OC_DB | ||||
| * | | | | | | | | Clear cached prepared statements when switching between mdb2 and pdo | Robin Appelman | 2013-01-16 | 1 | -2/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | Cache prepared statements in OC_DB | Robin Appelman | 2013-01-15 | 1 | -0/+10 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #1178 from owncloud/return_true_because_of_ponies | Thomas Müller | 2013-01-15 | 2 | -8/+1 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Remove uneeded return | ||||
| * | | | | | | | | | Remove uneeded returns | Lukas Reschke | 2013-01-14 | 2 | -5/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Remove uneeded return | Lukas Reschke | 2013-01-14 | 1 | -3/+0 |
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | Thx @Raydiation | ||||
* | | | | | | | | | Merge branch 'master' into fixing-unused-and-undefined-in-master | Thomas Mueller | 2013-01-14 | 17 | -393/+661 |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Move { to same line | Lukas Reschke | 2013-01-14 | 1 | -2/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Expand if to multiple lines | Lukas Reschke | 2013-01-14 | 1 | -2/+6 |
| | |/ / / / / / | |/| | | | | | | | | | | | | | | Oneliners are ugly. | ||||
| * | | | | | | | Merge pull request #1177 from owncloud/OC_User--isAdminUser() | Bart Visscher | 2013-01-14 | 8 | -72/+29 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Check if user is admin - bool | ||||
| | * | | | | | | | Enhanced auth is totally unmaintained and broken | Lukas Reschke | 2013-01-14 | 2 | -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 - bool | Lukas Reschke | 2013-01-14 | 8 | -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/isSubDirectory | Bart Visscher | 2013-01-14 | 1 | -24/+4 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | Simplify the isSubDirectory() function | ||||
| | * | | | | | | Check for string position instead of string existence | Lukas Reschke | 2013-01-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | otherwise /foo/bar would be detected as a subfolder of /bar THX @icewind1991 | ||||
| | * | | | | | | Commentblocks should begin with two * | Lukas Reschke | 2013-01-13 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Add @brief to description | Lukas Reschke | 2013-01-13 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Simplify the isSubDirectory() function | Lukas Reschke | 2013-01-13 | 1 | -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/master | Bart Visscher | 2013-01-14 | 1 | -17/+5 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | This fixes a problem that prevented app routes from being loaded after ocs_api merge |