aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* update license headers and authorsMorris Jobke2015-06-25302-227/+629
* [license script] sort names case insensitiveMorris Jobke2015-06-251-1/+1
* Merge pull request #17152 from owncloud/LDAP/AD-TypoMorris Jobke2015-06-251-1/+1
|\
| * Dropped an S from the mouseoverLukas Reschke2015-06-241-1/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2015-06-2564-34/+190
|/
* Merge pull request #17070 from owncloud/lock-movemountbugVincent Petry2015-06-243-23/+153
|\
| * 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
* | Merge pull request #17110 from owncloud/share-error-handlingMorris Jobke2015-06-242-2/+11
|\ \
| * | [sharing] handle shares of users that aren't available anymoreMorris Jobke2015-06-232-2/+11
* | | Merge pull request #17136 from rullzer/fix_remove_link_OCSLukas Reschke2015-06-242-2/+24
|\ \ \
| * | | 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
* | | | 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 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 #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 - 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 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 yetJoas Schilling2015-06-231-4/+14
| |/ / / /
* | | | | Merge pull request #17131 from owncloud/non-zero-exit-code-when-app-is-not-co...Thomas Müller2015-06-241-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | 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
|\ \ \ \
| * | | | [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
| * | | | 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 fffClark Tomlinson2015-06-222-0/+19
* | | | | Merge pull request #17045 from owncloud/enc_improvementsBjörn Schießle2015-06-233-7/+66
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | 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 codeMorris Jobke2015-06-232-0/+4
| | |_|/ / | |/| | |
* | | | | Merge pull request #17092 from owncloud/fix-language-experimentalJoas Schilling2015-06-231-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | 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 testGetNodeForPathRootJoas Schilling2015-06-221-1/+2
* | | | | Merge pull request #17085 from owncloud/use-trusted-mimetypeMorris Jobke2015-06-231-1/+1
|\ \ \ \ \
| * | | | | Use trusted mimetypeLukas Reschke2015-06-221-1/+1
| |/ / / /
* | | | | [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 operationVincent Petry2015-06-151-8/+13
* | | | | | Merge pull request #17068 from owncloud/fix_16878VicDeo2015-06-222-0/+6
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | 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
|\ \ \ \ \ | |_|_|_|/ |/| | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-30 19:50:28 +0000