Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #18815 from owncloud/ext-update | Robin McCorkell | 2015-09-03 | 1 | -0/+7 |
|\ | |||||
| * | Set default mount options for external storages | Robin McCorkell | 2015-09-03 | 1 | -0/+7 |
* | | Merge pull request #18799 from owncloud/appconfig-with-one-request | Morris Jobke | 2015-09-03 | 2 | -314/+356 |
|\ \ | |||||
| * | | Make sure the array exists | Joas Schilling | 2015-09-03 | 1 | -0/+8 |
| * | | Only query the appconfig once | Joas Schilling | 2015-09-03 | 2 | -315/+349 |
* | | | Merge pull request #18810 from owncloud/shared-mount-delay-setup | Vincent Petry | 2015-09-03 | 3 | -7/+8 |
|\ \ \ | |||||
| * | | | setup owner when getting users for share | Robin Appelman | 2015-09-03 | 1 | -0/+2 |
| * | | | Delay setting up the filesystem for a share owner untill the share is used | Robin Appelman | 2015-09-03 | 2 | -7/+6 |
* | | | | Merge pull request #18812 from owncloud/move_updater_above_version | Robin McCorkell | 2015-09-03 | 1 | -4/+4 |
|\ \ \ \ | |||||
| * | | | | move updater panel above version number | Georg Ehrke | 2015-09-03 | 1 | -4/+4 |
* | | | | | Merge pull request #18811 from owncloud/better-submodule-warning | Robin McCorkell | 2015-09-03 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Proper details about git submodule update | Morris Jobke | 2015-09-03 | 1 | -1/+1 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #18781 from owncloud/move-background-job-registration-to-i... | Morris Jobke | 2015-09-03 | 8 | -9/+31 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Move registration of background job to install/update | Joas Schilling | 2015-09-02 | 4 | -5/+24 |
| * | | | Move registration of LDAP background jobs to the install and update | Joas Schilling | 2015-09-02 | 4 | -4/+7 |
* | | | | Merge pull request #18809 from owncloud/fix-tags-fileinfomodel | Robin Appelman | 2015-09-03 | 2 | -1/+22 |
|\ \ \ \ | |||||
| * | | | | Tags in FileInfo map must be an array | Vincent Petry | 2015-09-03 | 2 | -1/+22 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #18803 from owncloud/toggle-svg | Robin Appelman | 2015-09-03 | 3 | -4/+4 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | use SVG for toggle image instead of PNG, fix installation and personal settin... | Jan-Christoph Borchardt | 2015-09-03 | 3 | -4/+4 |
* | | | | Merge pull request #18798 from owncloud/collapse-html-code | Jan-Christoph Borchardt | 2015-09-03 | 2 | -5/+10 |
|\ \ \ \ | |||||
| * | | | | Collapse HTML code for federated code | Lukas Reschke | 2015-09-03 | 2 | -5/+10 |
* | | | | | Merge pull request #18777 from owncloud/locking-default | Morris Jobke | 2015-09-03 | 2 | -8/+6 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | update config sample | Robin Appelman | 2015-09-02 | 1 | -4/+2 |
| * | | | | enable transational locking by default | Robin Appelman | 2015-09-02 | 1 | -4/+4 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #18780 from owncloud/isimage-fallback | Morris Jobke | 2015-09-03 | 2 | -15/+64 |
|\ \ \ \ | |||||
| * | | | | Fix sidebar thumbnail loading JS unit tests | Vincent Petry | 2015-09-03 | 2 | -15/+64 |
| * | | | | fallback for isimage | Robin Appelman | 2015-09-02 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge pull request #18787 from owncloud/encode-tags-in-json | Lukas Reschke | 2015-09-03 | 3 | -8/+22 |
|\ \ \ \ | |||||
| * | | | | Encode HTML tags in JSON | Lukas Reschke | 2015-09-03 | 3 | -8/+22 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-09-03 | 6 | -16/+192 |
| |_|/ / |/| | | | |||||
* | | | | Merge pull request #18764 from owncloud/login-template-accessibility | Morris Jobke | 2015-09-03 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | add title attribute for the login button | Christoph Wurst | 2015-09-02 | 1 | -1/+1 |
* | | | | | Merge pull request #18682 from owncloud/quota-select-style | Jan-Christoph Borchardt | 2015-09-03 | 3 | -2/+14 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | use proper triangle for multiselect dropdowns as well | Jan-Christoph Borchardt | 2015-09-03 | 3 | -2/+4 |
| * | | | | Makes settings select like multiselect | Raghu Nayyar | 2015-09-03 | 1 | -0/+10 |
* | | | | | Merge pull request #18783 from owncloud/revert-18773-fix-useless-deletes | Joas Schilling | 2015-09-02 | 1 | -4/+0 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Revert "Soft fail when deleting and no entry found" | Joas Schilling | 2015-09-02 | 1 | -4/+0 |
|/ / / / | |||||
* | | | | Merge pull request #18773 from owncloud/fix-useless-deletes | Robin McCorkell | 2015-09-02 | 1 | -0/+4 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Soft fail when deleting and no entry found | Robin McCorkell | 2015-09-02 | 1 | -0/+4 |
|/ / / | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-09-02 | 6 | -0/+218 |
* | | | Merge pull request #18632 from owncloud/sidebad-image-preview | Jan-Christoph Borchardt | 2015-09-02 | 6 | -13/+154 |
|\ \ \ | |||||
| * | | | larger preview for images in the sidebar | Robin Appelman | 2015-09-02 | 4 | -7/+81 |
| * | | | allow handling thumbnail errors | Robin Appelman | 2015-09-02 | 1 | -1/+4 |
| * | | | Allow creating previewss that cover the specified dimensions | Robin Appelman | 2015-09-02 | 2 | -6/+70 |
| | |/ | |/| | |||||
* | | | Merge pull request #18752 from owncloud/proper-setup-check | Morris Jobke | 2015-09-02 | 2 | -1/+29 |
|\ \ \ | |/ / |/| | | |||||
| * | | use config.php value instead of version string | Morris Jobke | 2015-09-02 | 2 | -1/+29 |
* | | | Merge pull request #18744 from owncloud/fix-ocs-router | Morris Jobke | 2015-09-02 | 1 | -2/+3 |
|\ \ \ | |/ / |/| | | |||||
| * | | Delay adding OCS prefix to route collection until all is loaded | Robin McCorkell | 2015-09-01 | 1 | -2/+3 |
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-09-01 | 34 | -2/+248 |
* | | | Merge pull request #18707 from owncloud/autotest-xdebug | Robin McCorkell | 2015-09-01 | 2 | -0/+12 |
|\ \ \ |