summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #8019 from owncloud/thumbnail_fixesThomas Müller2014-04-142-144/+230
|\ | | | | Thumbnail fixes
| * adding unit test for cache mechanismThomas Müller2014-04-042-89/+145
| |
| * fixing typos/spellingsThomas Müller2014-04-042-20/+27
| |
| * fix float comparison for negative resultsJörn Friedrich Dreyer2014-04-031-2/+2
| |
| * extract more methodsJörn Friedrich Dreyer2014-04-021-46/+63
| |
| * extract method isCachedBiggerJörn Friedrich Dreyer2014-04-021-14/+33
| |
| * remove unnecessary codeJörn Friedrich Dreyer2014-04-021-16/+2
| |
| * compare floats with epsilonJörn Friedrich Dreyer2014-04-021-1/+2
| |
* | Merge pull request #8156 from owncloud/fix-middleware-containerThomas Müller2014-04-141-2/+2
|\ \ | | | | | | fix the middleware registration process in the container
| * | use references for middleware to fix problems on 5.3Bernhard Posselt2014-04-111-2/+3
| | |
| * | fix the middleware registration process in the containerBernhard Posselt2014-04-101-3/+2
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-1430-213/+232
| | |
* | | The latest developer manual linkVolkan Gezer2014-04-131-1/+1
| | |
* | | Merge pull request #8188 from owncloud/print-does-also-take-arThomas Müller2014-04-131-4/+5
|\ \ \ | | | | | | | | p() and print_unescaped() also take arrays as parameter
| * | | p() and print_unescaped() also take arrays as parameterLukas Reschke2014-04-131-4/+5
| | | | | | | | | | | | This fixes some scrutinizer issues.
* | | | The latest developer manual linkVolkan Gezer2014-04-131-1/+1
| | | |
* | | | Merge pull request #8182 from owncloud/check-user-mountiRobin McCorkell2014-04-131-0/+6
|\ \ \ \ | |/ / / |/| | | Check whether the user has permissions to add personal storage backends
| * | | Check whether the user has permissions to add personal storage backendsLukas Reschke2014-04-131-0/+6
| | | |
* | | | Merge pull request #8165 from owncloud/karma-removewarningsLukas Reschke2014-04-131-0/+8
|\ \ \ \ | |/ / / |/| | | Remove annoying karma 404 warnings for images
| * | | Remove annoying karma 404 warnings for imagesVincent Petry2014-04-111-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Karma now serves images from core to avoid polluting the logs with a lot of 404 warnings. This also makes it easier to read the test errors during development.
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-1359-182/+238
| | | |
* | | | fix translation linkVolkan Gezer2014-04-131-1/+1
| | | |
* | | | upda mailinglist addressVolkan Gezer2014-04-131-1/+1
| | | |
* | | | fix contribute linkVolkan Gezer2014-04-121-1/+1
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-12257-3226/+4581
| | | |
* | | | Merge pull request #8168 from owncloud/only-encode-dangerous-charLukas Reschke2014-04-111-1/+1
|\ \ \ \ | | | | | | | | | | Only encode dangerous dangerous characters
| * | | | Only encode dangerous dangerous charactersLukas Reschke2014-04-111-1/+1
|/ / / / | | | | | | | | | | | | | | | | There is no need to encode all characters into HTML entities, only potential dangerous characters as &, ", ', < and > should get encoded. This may fix issues like https://github.com/owncloud/calendar/pull/394
* | | | Merge pull request #7807 from sarciszewski/patch-1Lukas Reschke2014-04-111-2/+2
|\ \ \ \ | | | | | | | | | | Update crypt.php
| * | | | Update crypt.phpScott Arciszewski2014-03-241-2/+2
| | | | | | | | | | | | | | | Use a 256-bit random value
| * | | | Update crypt.phpScott Arciszewski2014-03-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A 1024 kilobyte key would be obnoxiously slow to operate on. I'm assuming you meant 1024-bit? Also, 183 bytes = 1464 bits. Here's a safe alternative: 2048 bits, with comment-code sanity
* | | | | Merge pull request #8069 from ↵Björn Schießle2014-04-113-7/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | owncloud/fix-localization-issues-with-file-encrypt-app Fix some localization issues with file encryption/decryption strings
| * | | | | Fix some localization issues with file encryption/decription stringsVolkan Gezer2014-04-053-7/+8
| | | | | |
* | | | | | Typo fix.Volkan Gezer2014-04-111-1/+1
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-1142-250/+281
| | | | | |
* | | | | | Merge pull request #5857 from owncloud/type-ahead-share-by-mail-masterThomas Müller2014-04-112-0/+48
|\ \ \ \ \ \ | | | | | | | | | | | | | | introduce auto completion on share email - integrated with the contactsm...
| * | | | | | Fix copy/paste error :PThomas Tanghus2014-03-251-1/+1
| | | | | | |
| * | | | | | 'ID' => 'id' and check existence of EMAILThomas Tanghus2014-03-251-1/+5
| | | | | | |
| * | | | | | introduce auto completion on share email - integrated with the ↵Thomas Müller2013-11-142-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | contactsmanager api
* | | | | | | Merge pull request #8076 from owncloud/enable-dav-browserLukas Reschke2014-04-101-0/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | Re-enable the sabredav browser plugin to fix sync client setup
| * | | | | | Re-enable the sabredav browser pluginRobin Appelman2014-04-061-0/+1
| | | | | | |
* | | | | | | Merge pull request #8139 from owncloud/fix-middleware-registrationBernhard Posselt2014-04-102-5/+5
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | register middleware as string to not force request to be instantiated to...
| * | | | | | register middleware as string to not force request to be instantiated too ↵Bernhard Posselt2014-04-092-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | early and thus not having url parameters
* | | | | | | Merge pull request #8107 from owncloud/dav-negativetimestampfixThomas Müller2014-04-101-3/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fixed Sabre Node implementation to correctly return timestamps as int
| * | | | | | | Fixed Sabre Node implementation to correctly return timestamps as intVincent Petry2014-04-091-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Negative timestamps were returned as string and were confusing other Sabre API like Sabre_DAV_Property_GetLastModified. This fix makes sure the timestamp is returned as int when defined.
* | | | | | | | Merge pull request #8112 from owncloud/karma-enableautowatchThomas Müller2014-04-101-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Enable autowatch for karma
| * | | | | | | | Enable autowatch for karmaVincent Petry2014-04-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This way unit tests can be run in multiple browsers with the command line and tests will re-run automatically when files are changed.
* | | | | | | | | Merge pull request #8137 from owncloud/routeing-requirementsThomas Müller2014-04-102-5/+31
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | add requirements to routing
| * | | | | | | | | add requirements to routingBernhard Posselt2014-04-092-5/+31
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #8138 from owncloud/allow-app-in-routes.phpThomas Müller2014-04-101-1/+9
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | To isolate the variable scope used inside the $file it is required in it...
| * | | | | | | | | To isolate the variable scope used inside the $file it is required in it's ↵Thomas Müller2014-04-091-1/+9
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | own method