summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-06-2121-132/+146
* Merge pull request #9121 from owncloud/filepicker-avoidtwiceMorris Jobke2014-06-201-0/+7
|\
| * Prevent showing the file picker twiceVincent Petry2014-06-201-0/+7
* | Merge pull request #9102 from owncloud/viewermode-controlsMorris Jobke2014-06-201-0/+4
|\ \
| * | Fixed controls bar in viewer modeVincent Petry2014-06-181-0/+4
* | | Backport subset of #4179, re-established Oracle compatibility for LDAPArthur Schiwon2014-06-202-2/+3
* | | Merge pull request #9108 from owncloud/uploadintofolderfixMorris Jobke2014-06-205-69/+59
|\ \ \ | |_|/ |/| |
| * | Fix appending of rows after uploadVincent Petry2014-06-192-40/+33
| * | Fixed uploading by drag and drop into folderVincent Petry2014-06-194-29/+26
| |/
* | [tx-robot] updated from transifexJenkins for ownCloud2014-06-2022-119/+155
* | Merge pull request #9105 from owncloud/fix_8874Morris Jobke2014-06-193-5/+16
|\ \
| * | Make sure last seen tooltip always appears even after searching and filteringArthur Schiwon2014-06-193-5/+16
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2014-06-19403-1911/+2222
* | Merge pull request #9071 from owncloud/extstorage-list-unittestsMorris Jobke2014-06-193-0/+263
|\ \
| * | Added JS unit tests for ext storageVincent Petry2014-06-173-0/+263
* | | Merge pull request #9093 from owncloud/remove_unused_codeMorris Jobke2014-06-197-12/+8
|\ \ \
| * | | remove unused codeBjoern Schiessle2014-06-186-12/+7
| * | | initialize arrayBjoern Schiessle2014-06-181-0/+1
| | |/ | |/|
* | | Merge pull request #9068 from owncloud/trashbin_unittests_masterBjörn Schießle2014-06-188-36/+392
|\ \ \ | |/ / |/| |
| * | adjust encryption tests to the trash bin changesBjoern Schiessle2014-06-181-1/+1
| * | add additional tests for the trash binBjoern Schiessle2014-06-182-9/+132
| * | make sure that we always use the right userBjoern Schiessle2014-06-186-26/+27
| * | fix trash bin expire operation and add unit testsBjoern Schiessle2014-06-173-22/+254
* | | fix rename of encryption keysBjoern Schiessle2014-06-182-8/+9
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-18200-1697/+6854
* | | Merge pull request #9047 from owncloud/fix_preload_fundamental_appsLukas Reschke2014-06-181-0/+2
|\ \ \
| * | | Load fundamental apps, before any possible customizing app may followArthur Schiwon2014-06-161-0/+2
* | | | Merge pull request #8399 from owncloud/server-server-sharingicewind19912014-06-1745-106/+1222
|\ \ \ \
| * | | | Fix moving movablemount over webdavRobin Appelman2014-06-175-11/+24
| * | | | organize js a bit betterRobin Appelman2014-06-172-47/+69
| * | | | Better error handeling in testremoteRobin Appelman2014-06-171-3/+7
| * | | | testremote is for public accessRobin Appelman2014-06-171-1/+0
| * | | | fix broken buttons for IE8-11Morris Jobke2014-06-171-0/+1
| * | | | fixing layout issue - mostly alignmentMorris Jobke2014-06-171-0/+20
| * | | | Also support removeable mounts with rmdirRobin Appelman2014-06-161-19/+28
| * | | | Fix permission for movable storage rootRobin Appelman2014-06-161-5/+8
| * | | | Prevent warningRobin Appelman2014-06-161-1/+1
| * | | | Fix setupFromToken when a password is setRobin Appelman2014-06-161-1/+1
| * | | | Fix multiple users having the same external share mountpointRobin Appelman2014-06-163-5/+11
| * | | | Make testremote more robustRobin Appelman2014-06-161-3/+8
| * | | | Add route which went missing during rebaseRobin Appelman2014-06-161-0/+1
| * | | | Add some safety checksRobin Appelman2014-06-163-4/+7
| * | | | Always send a POST bodyRobin Appelman2014-06-141-4/+2
| * | | | Fix permissions functions for webdav external storagesRobin Appelman2014-06-141-2/+22
| * | | | Fix public share webdav permissionsRobin Appelman2014-06-142-2/+2
| * | | | fix modified date for external sharesRobin Appelman2014-06-141-0/+2
| * | | | Fix undefined index errorRobin Appelman2014-06-141-6/+0
| * | | | block server-to-server share if files_external is not activates, can be rever...Bjoern Schiessle2014-06-142-1/+10
| * | | | add settings to disable server to server sharingBjoern Schiessle2014-06-148-5/+82
| * | | | Properly expose read only public shares as read onlyRobin Appelman2014-06-145-0/+102