Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #9861 from owncloud/console-dontloadappsonupdate | Vincent Petry | 2014-07-24 | 1 | -6/+12 |
|\ | | | | | Do not load apps in console.php when an upgrade is due | ||||
| * | Do not load apps when an upgrade is due | Vincent Petry | 2014-07-24 | 1 | -6/+12 |
| | | | | | | | | | | This makes it still possible to update from the command line, but disables custom commands from apps | ||||
* | | Merge pull request #9841 from owncloud/fix-password-reset-master | Thomas Müller | 2014-07-24 | 3 | -5/+28 |
|\ \ | | | | | | | Fix password reset in console command and lost password controller | ||||
| * | | - adding default value for $recoveryPassword | Thomas Müller | 2014-07-24 | 3 | -5/+28 |
| | | | | | | | | | | | | - set password correctly in lost password | ||||
* | | | Merge pull request #9837 from owncloud/ignore-non-oc-tables-master | Thomas Müller | 2014-07-24 | 2 | -0/+43 |
|\ \ \ | | | | | | | | | Adding test which breaks because bit and/or enum datatypes are used | ||||
| * | | | register type mappings for unknown/unsupported mysql types | Thomas Müller | 2014-07-24 | 1 | -0/+4 |
| | | | | |||||
| * | | | Adding test which breaks because bit and/or enum datatypes are used | Thomas Müller | 2014-07-24 | 1 | -0/+39 |
| |/ / | |||||
* | | | Merge pull request #9703 from owncloud/files-preview-animate | Morris Jobke | 2014-07-24 | 2 | -3/+4 |
|\ \ \ | |/ / |/| | | [OC 7] Fix preview animation on uploading | ||||
| * | | Fix preview animation on uploading | Vincent Petry | 2014-07-17 | 2 | -3/+4 |
| | | | | | | | | | | | | | | | When adding/uploading files, the preview is now animated. When loading a list of files directly the preview is displayed directly. | ||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-24 | 20 | -69/+94 |
| | | | |||||
* | | | Merge pull request #9815 from owncloud/update-preventupdatethroughcron | Thomas Müller | 2014-07-23 | 1 | -0/+5 |
|\ \ \ | | | | | | | | | Prevent cron.php to trigger apps updating | ||||
| * | | | Prevent cron.php to trigger apps updating | Vincent Petry | 2014-07-23 | 1 | -0/+5 |
| | |/ | |/| | |||||
* | | | Merge pull request #9809 from ↵ | Thomas Müller | 2014-07-23 | 1 | -1/+3 |
|\ \ \ | | | | | | | | | | | | | | | | | owncloud/check-transaction-before-commit-migration-master only commit in case a transaction is active | ||||
| * | | | only commit in case a transaction is active | Thomas Müller | 2014-07-23 | 1 | -1/+3 |
|/ / / | |||||
* | | | Merge pull request #9788 from owncloud/design-app-styles | Vincent Petry | 2014-07-23 | 1 | -9/+2 |
|\ \ \ | | | | | | | | | Simplify app navigation look | ||||
| * | | | fix settings entry width | Jan-Christoph Borchardt | 2014-07-23 | 1 | -1/+1 |
| | | | | |||||
| * | | | remove superfluous border from settings entry | Jan-Christoph Borchardt | 2014-07-23 | 1 | -1/+0 |
| | | | | |||||
| * | | | simplify app navigation look, remove superfluous border as it is ↵ | Jan-Christoph Borchardt | 2014-07-23 | 1 | -7/+1 |
| |/ / | | | | | | | | | | distinguished enough via background color | ||||
* | | | Merge pull request #9789 from owncloud/external-share-root | icewind1991 | 2014-07-23 | 1 | -2/+7 |
|\ \ \ | |/ / |/| | | Fix remote share when remote server is installed at the root | ||||
| * | | Fix remote share when remote server is installed at the root | Robin Appelman | 2014-07-23 | 1 | -2/+7 |
|/ / | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-23 | 12 | -27/+27 |
| | | |||||
* | | Revert change | Sander | 2014-07-22 | 1 | -2/+2 |
| | | |||||
* | | Allow getAppFolder to get another apps path | Sander | 2014-07-22 | 1 | -3/+2 |
| | | | | | | cc @Raydiation | ||||
* | | Merge pull request #9772 from owncloud/fix-chunked-upload-master-2 | Thomas Müller | 2014-07-22 | 1 | -0/+31 |
|\ \ | | | | | | | adding special handling of checkPrecondition() for chunked upload | ||||
| * | | adding special handling of checkPrecondition() for chunked upload | Thomas Müller | 2014-07-22 | 1 | -0/+31 |
| | | | |||||
* | | | Merge pull request #9738 from owncloud/remove-uneeded-strip | Thomas Müller | 2014-07-22 | 1 | -22/+22 |
|\ \ \ | |/ / |/| | | Remove uneeded strip_tags | ||||
| * | | Remove uneeded `strip_tags` | Lukas Reschke | 2014-07-19 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | This `strip_tags` seems to be completely unneeded and will cause problems with passwords containing stripped characters. (e.g. `<` or `>`) Needs https://github.com/owncloud/core/pull/9735 to be merged first. | ||||
| * | | Extract Auth Header logic into new function handleAuthHeaders(). | Andreas Fischer | 2014-07-19 | 1 | -20/+22 |
| | | | |||||
| * | | Deduplicate user/password extraction from alternative HTTP headers. | Andreas Fischer | 2014-07-19 | 1 | -16/+14 |
| | | | |||||
* | | | Merge pull request #9683 from owncloud/fix_#8819_sorting | Vincent Petry | 2014-07-22 | 3 | -29/+58 |
|\ \ \ | | | | | | | | | Fix #8819 sorting | ||||
| * | | | Sorting triangles pointing up for ascending, down for descending | Remco Brenninkmeijer | 2014-07-21 | 1 | -2/+2 |
| | | | | |||||
| * | | | Before I get spanked ;) | Remco Brenninkmeijer | 2014-07-17 | 1 | -1/+1 |
| | | | | |||||
| * | | | Adjusted tests for new default sorting | Remco Brenninkmeijer | 2014-07-17 | 1 | -19/+32 |
| | | | | |||||
| * | | | While busy cleaning, also removed extra enters | Remco Brenninkmeijer | 2014-07-17 | 2 | -3/+0 |
| | | | | |||||
| * | | | Corrected (Netbeans?) inserted spaces | Remco Brenninkmeijer | 2014-07-17 | 2 | -17/+17 |
| | | | | |||||
| * | | | Fixed comments from PVince81 | Remco Brenninkmeijer | 2014-07-16 | 1 | -6/+5 |
| | | | | |||||
| * | | | Cleanup of unnecesary addition | Remco Brenninkmeijer | 2014-07-16 | 1 | -1/+1 |
| | | | | |||||
| * | | | Show sorting icons when hovering over | Remco Brenninkmeijer | 2014-07-16 | 2 | -12/+27 |
| | | | | |||||
| * | | | Changed default sorting except for names. | Remco Brenninkmeijer | 2014-07-08 | 1 | -1/+6 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-22 | 20 | -42/+48 |
| | | | | |||||
* | | | | Merge pull request #9750 from owncloud/issue/9745 | Vincent Petry | 2014-07-21 | 1 | -7/+9 |
|\ \ \ \ | | | | | | | | | | | Correctly use groups parameter only when its not empty | ||||
| * | | | | Correctly use groups parameter only when its not empty | Joas Schilling | 2014-07-21 | 1 | -7/+9 |
| | | | | | | | | | | | | | | | | | | | | Fix #9745 | ||||
* | | | | | Merge pull request #9757 from owncloud/issue/9756 | Joas Schilling | 2014-07-21 | 1 | -2/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | Add language parameter to public API for getL10N() | ||||
| * | | | | | Add language parameter to public API for getL10N() | Joas Schilling | 2014-07-21 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fix #9756 | ||||
* | | | | | | use the minimum of configured session_livetime and session.gc_maxlifetime ↵ | Matthias Rieber | 2014-07-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | for session hearbeat interval calculation | ||||
* | | | | | | Merge pull request #9755 from owncloud/fix-webdav-attribute-permissions-master | Morris Jobke | 2014-07-21 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | perm -> permissions | ||||
| * | | | | | perm -> permissions | Thomas Müller | 2014-07-21 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #9751 from owncloud/issue/9748 | Vincent Petry | 2014-07-21 | 2 | -5/+6 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Fix username for subadmins and only send subadmin groups | ||||
| * | | | | | Do not force isAdmin as true and so the list is filtered correctly | Joas Schilling | 2014-07-21 | 1 | -3/+1 |
| | | | | | | |||||
| * | | | | | Fix username for subadmins and only send subadmin groups | Joas Schilling | 2014-07-21 | 1 | -2/+5 |
| |/ / / / | | | | | | | | | | | | | | | | Fix #9748 |