Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge pull request #19299 from owncloud/fixgetRawPathInfo | Thomas Müller | 2015-09-30 | 1 | -1/+1 | |
|\ \ \ \ \ | | | | | | | | | | | | | Fix get raw path info, always return a string | |||||
| * | | | | | return '' instead of false | Jörn Friedrich Dreyer | 2015-09-23 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #19478 from owncloud/cache-found-l10n-per-app | Robin Appelman | 2015-09-30 | 1 | -3/+4 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | cache found l10n per app and not globally | |||||
| * | | | | | | cache found l10n per app and not globally | Morris Jobke | 2015-09-30 | 1 | -3/+4 | |
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fixes: if the first call to this is with an app that has no translations all future call will get a list with only english in there - even if their l10n holds more translations | |||||
* | | | | | | Merge pull request #19468 from owncloud/fix-36-vs-32-previews | Thomas Müller | 2015-09-30 | 2 | -3/+3 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Change small thumbnails to 32 px | |||||
| * | | | | | Change small thumbnails to 32 px | Morris Jobke | 2015-09-30 | 2 | -3/+3 | |
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | * fixes #16913 * fixes issues in IE8 where the thumbnail is too big | |||||
* | | | | | Merge pull request #19460 from ↵ | Thomas Müller | 2015-09-30 | 2 | -3/+8 | |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/fix-postScanFile-and-make-it-available-to-utils-scanner Fix postScanFile event and make it available to utils scanner | |||||
| * | | | | | Make postScanFile and postScanFolder available to OC\Files\Utils\Scanner | Olivier Paroz | 2015-09-30 | 1 | -1/+6 | |
| | | | | | | ||||||
| * | | | | | Always send a postScanFile event when done scanning a file | Olivier Paroz | 2015-09-30 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | postScanFile is important when scanning external storage as it indicates when the file is ready to be used | |||||
* | | | | | | Clean temp files used for thumbnail generation | Robin Appelman | 2015-09-30 | 1 | -1/+5 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #19373 from owncloud/sidebar-preview-cover | Thomas Müller | 2015-09-30 | 1 | -9/+7 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Cover both width and height for the sidebar preview | |||||
| * | | | | | Fix preview caching | Robin Appelman | 2015-09-29 | 1 | -25/+19 | |
| | | | | | | ||||||
| * | | | | | Cover both width and height for the sidebar preview | Robin Appelman | 2015-09-29 | 1 | -23/+27 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #19355 from owncloud/cache_result_of_checkUpgrade | Thomas Müller | 2015-09-29 | 2 | -7/+10 | |
|\ \ \ \ \ | | | | | | | | | | | | | [jenkins] Cache result of check upgrade | |||||
| * | | | | | cache result of \OCP\Util::needUpgrade() | Individual IT Services | 2015-09-29 | 2 | -7/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reduce calls of \OCP\Util::needUpgrade() where \OCP\Util::needUpgrade() is called we can call as well self::checkUpgrade and use the cached result In line 877 the call way unnecessary anyway because of the first part of the if statement move caching to \OCP\Util::needUpgrade renaming variable fixing testNeedUpgradeCore() cache result of checkUpgrade() in self::$needUpgrade reduce calls of \OCP\Util::needUpgrade() where \OCP\Util::needUpgrade() is called we can call as well self::checkUpgrade and use the cached result In line 877 the call way unnecessary anyway because of the first part of the if statement move caching to \OCP\Util::needUpgrade renaming variable fixing testNeedUpgradeCore() fix typo in variable name deleting tabs | |||||
* | | | | | | Merge pull request #19441 from owncloud/debug-log-mode-during-upgrade | Thomas Müller | 2015-09-29 | 1 | -0/+16 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | [upgrade] switch to debug logging on upgrade | |||||
| * | | | | | [upgrade] switch to debug logging on upgrade | Morris Jobke | 2015-09-29 | 1 | -0/+16 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * resets afterwards * adds output about the previous log level | |||||
* | | | | | | Add blob: scheme to default CSP policy | Lukas Reschke | 2015-09-29 | 2 | -1/+2 | |
|/ / / / / | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/19438 | |||||
* | | | | | Merge pull request #19424 from owncloud/use-jsqueeze | Thomas Müller | 2015-09-29 | 2 | -60/+3 | |
|\ \ \ \ \ | | | | | | | | | | | | | Use jsqueeze | |||||
| * | | | | | User upstream class SeparatorFilter | Thomas Müller | 2015-09-28 | 2 | -58/+1 | |
| | | | | | | ||||||
| * | | | | | Suer JSqueezeFilter instead of JSMinFilter | Thomas Müller | 2015-09-28 | 1 | -2/+2 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #19367 from owncloud/lock-transaction-no-log | Thomas Müller | 2015-09-29 | 1 | -4/+0 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | remove warning when trying to get a lock while in transaction | |||||
| * | | | | | | remove warning when trying to get a lock while in transaction | Robin Appelman | 2015-09-25 | 1 | -4/+0 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #19426 from owncloud/fix-legacy-CSP-for-images | Thomas Müller | 2015-09-29 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | Whitelist "data:" in legacy CSP headers | |||||
| * | | | | | | Fix CSP for images for legacy apps | Olivier Paroz | 2015-09-28 | 1 | -1/+1 | |
| | |/ / / / | |/| | | | | | | | | | | | | | | | | Fixes #19425 | |||||
* | | | | | | Session closed exception wording | Phil Davis | 2015-09-29 | 3 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | and a small comment typo | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-09-29 | 2 | -0/+2 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #18548 from owncloud/repair-mimetype-limitversion | Thomas Müller | 2015-09-28 | 2 | -24/+44 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Repair mime types only when upgrading from OC 8.0 | |||||
| * | | | | Repair mime types only when upgrading from OC 8.0 | Vincent Petry | 2015-09-23 | 2 | -24/+44 | |
| | | | | | ||||||
* | | | | | Adding ownCloud/TarStreamer | Thomas Müller | 2015-09-28 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Uniform behavour for tar and zip | Victor Dubiniuk | 2015-09-28 | 1 | -1/+6 | |
| | | | | | ||||||
* | | | | | More corrections | Victor Dubiniuk | 2015-09-28 | 2 | -11/+7 | |
| | | | | | ||||||
* | | | | | Add namespace. Fix broken zip | Victor Dubiniuk | 2015-09-28 | 2 | -5/+8 | |
| | | | | | ||||||
* | | | | | Add PHpdoc | Victor Dubiniuk | 2015-09-28 | 1 | -6/+40 | |
| | | | | | ||||||
* | | | | | Introduce streamer | Victor Dubiniuk | 2015-09-28 | 2 | -63/+120 | |
| | | | | | ||||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-09-28 | 140 | -30/+204 | |
| | | | | | ||||||
* | | | | | Merge pull request #19346 from owncloud/drop-passwords-from-exception-log | Thomas Müller | 2015-09-25 | 3 | -9/+33 | |
|\ \ \ \ \ | | | | | | | | | | | | | Remove passwords from logged exception stack traces | |||||
| * | | | | | Remove passwords from logged exception stack traces | Morris Jobke | 2015-09-24 | 3 | -9/+33 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fixed #16318 * create logException in ILogger * add unit tests | |||||
* | | | | | | Merge pull request #19297 from owncloud/fix_19119 | Thomas Müller | 2015-09-25 | 1 | -1/+0 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Do not blindy copy expiration date on reshare | |||||
| * | | | | | | Do not blindy copy expiration date on reshare | Roeland Jago Douma | 2015-09-25 | 1 | -1/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a file/folder is reshared we should not blindly copy the expiration date of the parent share. User/Group shares do not have expiration dates currently, and thus this is always set to null. Fixes #19119 * Added testcase | |||||
* | | | | | | | Merge pull request #19030 from owncloud/oparoz-smarter-logger | Thomas Müller | 2015-09-25 | 1 | -1/+14 | |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | [jenkins] Dump Arrays, Objects and Exceptions to the log | |||||
| * | | | | | | Use a 3rd party normalizer for the logger | Olivier Paroz | 2015-09-24 | 1 | -1/+14 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | Merge pull request #19360 from owncloud/move-filter-method-into-config-object | Thomas Müller | 2015-09-25 | 3 | -0/+80 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Move the filtering of sensitive data to the config class | |||||
| * | | | | | | Deduplicate constant | Joas Schilling | 2015-09-25 | 1 | -3/+4 | |
| | | | | | | | ||||||
| * | | | | | | Move the filtering of sensitive data to the config class | Joas Schilling | 2015-09-25 | 3 | -0/+79 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | Merge pull request #19293 from owncloud/individual-it-move_initTemplate | Thomas Müller | 2015-09-25 | 4 | -91/+146 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | [jenkins] do not load unnecessary code in case of webdav | |||||
| * | | | | | | Todo for myself to eliminate double code | Individual IT Services | 2015-09-25 | 1 | -0/+5 | |
| | | | | | | | | | | | | | | | | | | | | | This will be in a new PR | |||||
| * | | | | | | add $prepend option to addStyle() & addVendorStyle() | Individual IT Services | 2015-09-25 | 2 | -18/+28 | |
| | | | | | | | ||||||
| * | | | | | | Clean code | Thomas Müller | 2015-09-24 | 1 | -56/+66 | |
| | | | | | | | ||||||
| * | | | | | | getService() is not needed -> remove | Thomas Müller | 2015-09-23 | 1 | -20/+0 | |
| | | | | | | |