summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Dropped an S from the mouseoverLukas Reschke2015-06-241-1/+1
| | | | We had a typo in the ldap initial binding menu mouse over, so changed the text in all references to be correct.
* Merge pull request #17070 from owncloud/lock-movemountbugVincent Petry2015-06-243-23/+153
|\ | | | | Lock correct paths when moving mount
| * Rollback folder scan if an entry was lockedVincent Petry2015-06-241-0/+5
| |
| * Fix locked paths in the moveMount caseVincent Petry2015-06-242-23/+148
| | | | | | | | | | | | | | When moving a mount point directly, the lock must be applied on the local mount point path instead of the attached storage root. Other operations will still lock the attached storage root.
* | Merge pull request #17110 from owncloud/share-error-handlingMorris Jobke2015-06-242-2/+11
|\ \ | | | | | | [sharing] handle shares of users that aren't available anymore
| * | [sharing] handle shares of users that aren't available anymoreMorris Jobke2015-06-232-2/+11
| | | | | | | | | | | | | | | * properly handle the case where an abandoned share is left and simply skip it
* | | Merge pull request #17136 from rullzer/fix_remove_link_OCSLukas Reschke2015-06-242-2/+24
|\ \ \ | | | | | | | | Allow removing of link password in OCS again
| * | | Added unit test to verify link password removealRoeland Jago Douma2015-06-241-1/+23
| | | |
| * | | set NULL correctly in password updateRoeland Jago Douma2015-06-241-1/+1
| | | | | | | | | | | | | | | | | | | | Old code used 'NULL' but docterine wants null. Now it is possible again to remove the password from a link share.
* | | | Merge pull request #17139 from owncloud/increase-oracle-init-timeThomas Müller2015-06-241-2/+2
|\ \ \ \ | | | | | | | | | | Let's wait a little longer until oracle finally is available
| * | | | Let's wait a little longer until oracle finally is availableThomas Müller2015-06-241-2/+2
|/ / / /
* | | | Merge pull request #17133 from owncloud/rename-user-webdavauthThomas Müller2015-06-241-3/+3
|\ \ \ \ | | | | | | | | | | Rename user_webdavauth to prevent accidental activation - refs #17112
| * | | | Rename user_webdavauth to prevent accidental activation - refs #17112Thomas Müller2015-06-241-3/+3
| | | | |
* | | | | Merge pull request #17130 from owncloud/update-mime-typesThomas Müller2015-06-241-1/+3
|\ \ \ \ \ | | | | | | | | | | | | Update wmv and add mts and mt2s
| * | | | | Update wmv and add mts and mt2s - fixes #17128 and owncloud/firewall#107Thomas Müller2015-06-241-1/+3
| | |/ / / | |/| | |
* | | | | Merge pull request #17105 from owncloud/app-content-z-indexMorris Jobke2015-06-241-1/+1
|\ \ \ \ \ | | | | | | | | | | | | explicitly set z-index on app-content, fix overlap from navigation
| * | | | | explicitly set z-index on app-content, fix overlap from navigationJan-Christoph Borchardt2015-06-231-1/+1
| | | | | |
* | | | | | Merge pull request #17106 from owncloud/htaccess-update-only-onceMorris Jobke2015-06-241-4/+14
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Only update the htaccess ErrorDocument links when they are not set yet
| * | | | | Only update the htaccess ErrorDocument links when they are not set yetJoas Schilling2015-06-231-4/+14
| |/ / / /
* | | | | Merge pull request #17131 from ↵Thomas Müller2015-06-241-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | owncloud/non-zero-exit-code-when-app-is-not-compliant Use non-zero exit code when app is not compliant (so CIs can detect t…
| * | | | Use non-zero exit code when app is not compliant (so CIs can detect the status)Joas Schilling2015-06-241-0/+1
|/ / / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-2466-82/+44
| | | |
* | | | Merge pull request #17095 from owncloud/proper-error-handlingMorris Jobke2015-06-233-11/+19
|\ \ \ \ | | | | | | | | | | Proper error handling
| * | | | [updater] keep maintenance active on failure and mark failure in redMorris Jobke2015-06-232-2/+3
| | | | |
| * | | | [updater] propagate error case properlyMorris Jobke2015-06-232-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add $success to the updateEnd hook * add new return code for a update failure * add exception class to failure hook message
| * | | | Added error message on initMountpoints exceptionMorris Jobke2015-06-231-1/+1
| | | | |
* | | | | Merge pull request #17048 from owncloud/hotfix/fix-firewall-blocking-dir-messageVincent Petry2015-06-232-0/+19
|\ \ \ \ \ | |_|_|/ / |/| | | | adding correct blocking logic for ffw
| * | | | adding correct blocking logic for fffClark Tomlinson2015-06-222-0/+19
| | | | |
* | | | | Merge pull request #17045 from owncloud/enc_improvementsBjörn Schießle2015-06-233-7/+66
|\ \ \ \ \ | |_|_|/ / |/| | | | encryption improvements
| * | | | make sure that we always read the header from the original fileBjoern Schiessle2015-06-232-6/+65
| | | | |
| * | | | remove files_encryption from database at the end of the migration processBjoern Schiessle2015-06-191-1/+1
| | | | |
* | | | | Merge pull request #17090 from owncloud/upgrade-app-infoJörn Friedrich Dreyer2015-06-232-0/+4
|\ \ \ \ \ | | | | | | | | | | | | [upgrade] print update message before running the update code
| * | | | | [upgrade] print update message before running the update codeMorris Jobke2015-06-232-0/+4
| | |_|/ / | |/| | | | | | | | | | | | | * otherwise you don't know during which app update something failed
* | | | | Merge pull request #17092 from owncloud/fix-language-experimentalJoas Schilling2015-06-231-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | Accept this language change "at your own risk"
| * | | | Accept this language change at your own riskJoas Schilling2015-06-231-1/+1
|/ / / /
* | | | Merge pull request #17081 from owncloud/issue-17079-risky-test-sabre-objecttreeLukas Reschke2015-06-231-1/+2
|\ \ \ \ | | | | | | | | | | Make an assertion in risky test testGetNodeForPathRoot
| * | | | Make an assertion in risky test testGetNodeForPathRootJoas Schilling2015-06-221-1/+2
| | | | |
* | | | | Merge pull request #17085 from owncloud/use-trusted-mimetypeMorris Jobke2015-06-231-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Use trusted mimetype
| * | | | | Use trusted mimetypeLukas Reschke2015-06-221-1/+1
| |/ / / / | | | | | | | | | | | | | | | We shall not use untrusted mimetypes in this context
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-2318-16/+78
| | | | |
* | | | | Merge pull request #16940 from owncloud/ext-s3-touchmtimefixThomas Müller2015-06-221-8/+13
|\ \ \ \ \ | | | | | | | | | | | | Properly set mtime on S3 for touch operation
| * | | | | Properly set mtime on S3 for touch operationVincent Petry2015-06-151-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code was missing the "MetadataDirective". Once added, some other parts of the code failed because the format of mtime was wrong. So this PR uses the RFC format that the S3 library already uses. Additionally, the code path where mtime is null was missing. Now defaulting to the current time.
* | | | | | Merge pull request #17068 from owncloud/fix_16878VicDeo2015-06-222-0/+6
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | fix search for results only from subfolder
| * | | | | remove whitespace on bottom when no search results, fix laylout, fix #16878Jan-Christoph Borchardt2015-06-222-2/+6
| | | | | |
| * | | | | add filter-empty class if no search result in current folderBjoern Schiessle2015-06-221-0/+2
| | |/ / / | |/| | |
* | | | | Merge pull request #12546 from oparoz/patch-1Björn Schießle2015-06-222-21/+51
|\ \ \ \ \ | |_|_|_|/ |/| | | | Send the mime icon if we can't generate a preview
| * | | | Remove unneeded returns from private cropping methodsOlivier Paroz2015-06-192-20/+15
| | | | |
| * | | | Remove unneeded returns from private cropping methodsOlivier Paroz2015-06-181-16/+6
| | | | |
| * | | | Move media type icon preview creation to its own methodOlivier Paroz2015-06-182-4/+46
| | | | |
| * | | | Send the mime icon if we can't generate a previewOlivier Paroz2015-06-181-1/+4
| | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-10 20:58:17 +0000