summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #8931 from owncloud/filelist-usepathforactionVincent Petry2014-06-234-4/+9
|\
| * Use actual file path on rename/deleteVincent Petry2014-06-064-4/+9
* | Merge pull request #8974 from owncloud/router-preventloadappsonupgradeVincent Petry2014-06-234-14/+34
|\ \
| * | Prevent loadApps on upgradeVincent Petry2014-06-184-14/+34
* | | Merge pull request #9153 from owncloud/files-unselectafterdeleteicewind19912014-06-232-1/+35
|\ \ \
| * | | Clear file selection when list is repopulatedVincent Petry2014-06-232-1/+35
* | | | Merge pull request #9150 from owncloud/remoteshare-fixsetuporderFrank Karlitschek2014-06-232-9/+12
|\ \ \ \ | |/ / / |/| | |
| * | | Setup the external share manager in a hookVincent Petry2014-06-232-9/+12
|/ / /
* | | trusted domains shall not be ignored on autosetupArthur Schiwon2014-06-231-1/+7
* | | Merge pull request #9138 from owncloud/fix-documentationVincent Petry2014-06-231-1/+5
|\ \ \
| * | | Add explanation about the current implementation of updateAppBart Visscher2014-06-221-1/+5
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-2330-155/+175
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-2229-137/+173
* | | 7.0.0 alpha 2v7.0.0alpha2Frank Karlitschek2014-06-211-2/+2
* | | Merge pull request #9120 from owncloud/fileactions-filelistfallbackMorris Jobke2014-06-211-1/+3
|\ \ \
| * | | Fixed file actions fallbackVincent Petry2014-06-201-1/+3
* | | | [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