summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add doc to config.sample for enforce LDAP home folder naming ruleMorris Jobke2015-09-251-0/+15
* Merge pull request #15098 from owncloud/fix_preview_versions_revert_issueThomas Müller2015-09-244-1/+49
|\
| * delete cached preview when rolling back file's versionGeorg Ehrke2015-09-204-1/+49
* | Merge pull request #19349 from owncloud/revert-18692-patch-2Lukas Reschke2015-09-241-1/+0
|\ \
| * | Revert "Update apps.css (Scroll more smoothly for Webkit browser)"Jan-Christoph Borchardt2015-09-241-1/+0
|/ /
* | Merge pull request #19306 from owncloud/app-code-check-versionThomas Müller2015-09-2413-2/+340
|\ \
| * | public, remote and default_enable are not deprecatedMorris Jobke2015-09-241-3/+3
| * | encode arrays as stringMorris Jobke2015-09-242-4/+6
| * | [App Code Check] add check for version and mandatory fieldsMorris Jobke2015-09-2413-2/+338
* | | Merge pull request #18517 from owncloud/17753_to_masterThomas Müller2015-09-242-13/+15
|\ \ \
| * | | Fix preview of old file on public upload conflictsOlivier Paroz2015-09-202-13/+15
| | |/ | |/|
* | | Merge pull request #18834 from owncloud/delay-listen-owner-changesThomas Müller2015-09-242-2/+22
|\ \ \
| * | | only initialize onceRobin Appelman2015-09-231-0/+6
| * | | Delay listening to owner changes untill we use a share for that ownerRobin Appelman2015-09-232-2/+16
* | | | Merge pull request #19305 from owncloud/share-hasusersharesThomas Müller2015-09-242-2/+72
|\ \ \ \
| * | | | Fix ShareItemModel.hasUserShares to only check shares of current itemVincent Petry2015-09-232-2/+72
* | | | | Merge pull request #19335 from owncloud/phil-davis-view-typosThomas Müller2015-09-241-3/+3
|\ \ \ \ \
| * | | | | Comment typos in tests/lib/files/view.phpPhil Davis2015-09-241-3/+3
* | | | | | Merge pull request #19337 from owncloud/fix-shipped-check-for-appsThomas Müller2015-09-241-1/+1
|\ \ \ \ \ \
| * | | | | | Correctly check whether an app is shippedJoas Schilling2015-09-241-1/+1
* | | | | | | Merge pull request #19340 from owncloud/enc_fix_user_checkThomas Müller2015-09-242-7/+11
|\ \ \ \ \ \ \
| * | | | | | | only check if the user exists if a user was added as parameterBjoern Schiessle2015-09-242-7/+11
| |/ / / / / /
* | | | | | | Merge pull request #19341 from owncloud/enc_all_improved_messagesThomas Müller2015-09-241-0/+6
|\ \ \ \ \ \ \
| * | | | | | | no need to list users if all users already had a key-pairBjoern Schiessle2015-09-241-0/+6
| |/ / / / / /
* | | | | | | Merge pull request #19342 from owncloud/fix-15836Thomas Müller2015-09-242-2/+13
|\ \ \ \ \ \ \
| * | | | | | | LDAP Wizard: enable/disable test login name button depending on whether a log...Arthur Schiwon2015-09-242-2/+13
* | | | | | | | Merge pull request #19339 from owncloud/share-expirationisstringThomas Müller2015-09-242-5/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Expiration date was always a stringVincent Petry2015-09-242-5/+5
| |/ / / / / /
* | | | | | | Merge pull request #19248 from owncloud/allow-status-code-403-and-503-for-lis...Thomas Müller2015-09-243-1/+134
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Add since-tagJoas Schilling2015-09-232-0/+14
| * | | | | | Allow listeners to set status code and messageJoas Schilling2015-09-233-1/+120
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #19303 from owncloud/usecorrectvariableThomas Müller2015-09-242-1/+26
|\ \ \ \ \ \
| * | | | | | add is* storage testsJörn Friedrich Dreyer2015-09-231-0/+25
| * | | | | | use correct variableJörn Friedrich Dreyer2015-09-231-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #19313 from owncloud/ext-validate-mountThomas Müller2015-09-2415-40/+143
|\ \ \ \ \ \
| * | | | | | Unit tests for storage validation in serviceRobin McCorkell2015-09-232-0/+56
| * | | | | | Perform visibility checks on storagesRobin McCorkell2015-09-2314-40/+87
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #19328 from owncloud/update-shipped-apps-listThomas Müller2015-09-241-2/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Remove user_webdavauth which is now part of user_externalJoas Schilling2015-09-241-1/+0
| * | | | | Update the list of shipped appsJoas Schilling2015-09-241-1/+2
| | |/ / / | |/| | |
* | | | | Merge pull request #19326 from owncloud/issue-19314-querybuilder-set-nullThomas Müller2015-09-242-1/+5
|\ \ \ \ \
| * | | | | Allow `set('column', 'null')` to work like in DoctrineJoas Schilling2015-09-242-1/+5
* | | | | | Merge pull request #16479 from owncloud/core-fixgetrelativepathwrongmatchesThomas Müller2015-09-242-29/+107
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add more tests for relativePathJoas Schilling2015-09-221-23/+91
| * | | | | Prevent wrong matches in getRelativePathVincent Petry2015-09-222-11/+21
* | | | | | Merge pull request #19307 from owncloud/large-sidebar-preview-resizeThomas Müller2015-09-242-5/+9
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into large-sidebar-preview-resizeMorris Jobke2015-09-2425-255/+338
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | adjust the height of the sidebar preview image when resizing the browserRobin Appelman2015-09-232-5/+9
* | | | | | | Merge pull request #19292 from owncloud/close-iconThomas Müller2015-09-242-1/+8
|\ \ \ \ \ \ \
| * | | | | | | add slight shadow to close icon to make it visible on top of dark images, fix...Jan-Christoph Borchardt2015-09-232-1/+8