Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add doc to config.sample for enforce LDAP home folder naming rule | Morris Jobke | 2015-09-25 | 1 | -0/+15 |
* | Merge pull request #15098 from owncloud/fix_preview_versions_revert_issue | Thomas Müller | 2015-09-24 | 4 | -1/+49 |
|\ | |||||
| * | delete cached preview when rolling back file's version | Georg Ehrke | 2015-09-20 | 4 | -1/+49 |
* | | Merge pull request #19349 from owncloud/revert-18692-patch-2 | Lukas Reschke | 2015-09-24 | 1 | -1/+0 |
|\ \ | |||||
| * | | Revert "Update apps.css (Scroll more smoothly for Webkit browser)" | Jan-Christoph Borchardt | 2015-09-24 | 1 | -1/+0 |
|/ / | |||||
* | | Merge pull request #19306 from owncloud/app-code-check-version | Thomas Müller | 2015-09-24 | 13 | -2/+340 |
|\ \ | |||||
| * | | public, remote and default_enable are not deprecated | Morris Jobke | 2015-09-24 | 1 | -3/+3 |
| * | | encode arrays as string | Morris Jobke | 2015-09-24 | 2 | -4/+6 |
| * | | [App Code Check] add check for version and mandatory fields | Morris Jobke | 2015-09-24 | 13 | -2/+338 |
* | | | Merge pull request #18517 from owncloud/17753_to_master | Thomas Müller | 2015-09-24 | 2 | -13/+15 |
|\ \ \ | |||||
| * | | | Fix preview of old file on public upload conflicts | Olivier Paroz | 2015-09-20 | 2 | -13/+15 |
| | |/ | |/| | |||||
* | | | Merge pull request #18834 from owncloud/delay-listen-owner-changes | Thomas Müller | 2015-09-24 | 2 | -2/+22 |
|\ \ \ | |||||
| * | | | only initialize once | Robin Appelman | 2015-09-23 | 1 | -0/+6 |
| * | | | Delay listening to owner changes untill we use a share for that owner | Robin Appelman | 2015-09-23 | 2 | -2/+16 |
* | | | | Merge pull request #19305 from owncloud/share-hasusershares | Thomas Müller | 2015-09-24 | 2 | -2/+72 |
|\ \ \ \ | |||||
| * | | | | Fix ShareItemModel.hasUserShares to only check shares of current item | Vincent Petry | 2015-09-23 | 2 | -2/+72 |
* | | | | | Merge pull request #19335 from owncloud/phil-davis-view-typos | Thomas Müller | 2015-09-24 | 1 | -3/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Comment typos in tests/lib/files/view.php | Phil Davis | 2015-09-24 | 1 | -3/+3 |
* | | | | | | Merge pull request #19337 from owncloud/fix-shipped-check-for-apps | Thomas Müller | 2015-09-24 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Correctly check whether an app is shipped | Joas Schilling | 2015-09-24 | 1 | -1/+1 |
* | | | | | | | Merge pull request #19340 from owncloud/enc_fix_user_check | Thomas Müller | 2015-09-24 | 2 | -7/+11 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | only check if the user exists if a user was added as parameter | Bjoern Schiessle | 2015-09-24 | 2 | -7/+11 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #19341 from owncloud/enc_all_improved_messages | Thomas Müller | 2015-09-24 | 1 | -0/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | no need to list users if all users already had a key-pair | Bjoern Schiessle | 2015-09-24 | 1 | -0/+6 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #19342 from owncloud/fix-15836 | Thomas Müller | 2015-09-24 | 2 | -2/+13 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | LDAP Wizard: enable/disable test login name button depending on whether a log... | Arthur Schiwon | 2015-09-24 | 2 | -2/+13 |
* | | | | | | | | Merge pull request #19339 from owncloud/share-expirationisstring | Thomas Müller | 2015-09-24 | 2 | -5/+5 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Expiration date was always a string | Vincent Petry | 2015-09-24 | 2 | -5/+5 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #19248 from owncloud/allow-status-code-403-and-503-for-lis... | Thomas Müller | 2015-09-24 | 3 | -1/+134 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Add since-tag | Joas Schilling | 2015-09-23 | 2 | -0/+14 |
| * | | | | | | Allow listeners to set status code and message | Joas Schilling | 2015-09-23 | 3 | -1/+120 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #19303 from owncloud/usecorrectvariable | Thomas Müller | 2015-09-24 | 2 | -1/+26 |
|\ \ \ \ \ \ | |||||
| * | | | | | | add is* storage tests | Jörn Friedrich Dreyer | 2015-09-23 | 1 | -0/+25 |
| * | | | | | | use correct variable | Jörn Friedrich Dreyer | 2015-09-23 | 1 | -1/+1 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge pull request #19313 from owncloud/ext-validate-mount | Thomas Müller | 2015-09-24 | 15 | -40/+143 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Unit tests for storage validation in service | Robin McCorkell | 2015-09-23 | 2 | -0/+56 |
| * | | | | | | Perform visibility checks on storages | Robin McCorkell | 2015-09-23 | 14 | -40/+87 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge pull request #19328 from owncloud/update-shipped-apps-list | Thomas Müller | 2015-09-24 | 1 | -2/+2 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Remove user_webdavauth which is now part of user_external | Joas Schilling | 2015-09-24 | 1 | -1/+0 |
| * | | | | | Update the list of shipped apps | Joas Schilling | 2015-09-24 | 1 | -1/+2 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #19326 from owncloud/issue-19314-querybuilder-set-null | Thomas Müller | 2015-09-24 | 2 | -1/+5 |
|\ \ \ \ \ | |||||
| * | | | | | Allow `set('column', 'null')` to work like in Doctrine | Joas Schilling | 2015-09-24 | 2 | -1/+5 |
* | | | | | | Merge pull request #16479 from owncloud/core-fixgetrelativepathwrongmatches | Thomas Müller | 2015-09-24 | 2 | -29/+107 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Add more tests for relativePath | Joas Schilling | 2015-09-22 | 1 | -23/+91 |
| * | | | | | Prevent wrong matches in getRelativePath | Vincent Petry | 2015-09-22 | 2 | -11/+21 |
* | | | | | | Merge pull request #19307 from owncloud/large-sidebar-preview-resize | Thomas Müller | 2015-09-24 | 2 | -5/+9 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into large-sidebar-preview-resize | Morris Jobke | 2015-09-24 | 25 | -255/+338 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| * | | | | | | adjust the height of the sidebar preview image when resizing the browser | Robin Appelman | 2015-09-23 | 2 | -5/+9 |
* | | | | | | | Merge pull request #19292 from owncloud/close-icon | Thomas Müller | 2015-09-24 | 2 | -1/+8 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | add slight shadow to close icon to make it visible on top of dark images, fix... | Jan-Christoph Borchardt | 2015-09-23 | 2 | -1/+8 |