summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Moved office mimetype update to a repair stepVincent Petry2014-06-254-59/+199
* Merge pull request #9145 from owncloud/everyonecountblizzz2014-06-242-1/+4
|\
| * Better Logic to display user count for everyone.raghunayyar2014-06-242-1/+4
* | Merge pull request #9168 from owncloud/files-phpwarningondeleteVincent Petry2014-06-241-5/+2
|\ \
| * | Merge if statementsJoas Schilling2014-06-231-6/+2
| * | Remove warning when deleting all entriesVincent Petry2014-06-231-1/+2
* | | Merge pull request #9180 from owncloud/fix-error-on.update-pageVincent Petry2014-06-241-0/+6
|\ \ \
| * | | fixes the layout for error messages on the update pageMorris Jobke2014-06-241-0/+6
* | | | Merge pull request #9181 from owncloud/enc_recursive_mkdirMorris Jobke2014-06-242-3/+31
|\ \ \ \ | |/ / / |/| | |
| * | | add unit testsBjoern Schiessle2014-06-242-2/+30
| * | | always use '/' as directory seperatorBjoern Schiessle2014-06-241-1/+1
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-2434-325/+382
* | | Merge pull request #9074 from geez0x1/masterMorris Jobke2014-06-231-1/+1
|\ \ \
| * | | Update the modified date in UI on file reversiongeez0x12014-06-171-1/+1
* | | | Merge pull request #9158 from owncloud/no-recursion-on-rmdirr-masterThomas Müller2014-06-232-6/+35
|\ \ \ \
| * | | | update PHPDoc $fileInfo is a SplFileInfoThomas Müller2014-06-231-1/+1
| * | | | Added unit test for the helper's rmdirrVincent Petry2014-06-231-0/+24
| * | | | dir itself has to be removed as wellThomas Müller2014-06-231-0/+1
| * | | | fix recursion on rmdirrThomas Müller2014-06-231-7/+11
* | | | | Merge pull request #9170 from owncloud/files-renamevalidationblurLukas Reschke2014-06-232-4/+53
|\ \ \ \ \
| * | | | | Fix blurring of invalid file name on renameVincent Petry2014-06-232-4/+53
| | |_|/ / | |/| | |
* | | | | Merge pull request #9159 from owncloud/enabledapp-cache-loggedinJoas Schilling2014-06-231-2/+7
|\ \ \ \ \
| * | | | | Add commentRobin Appelman2014-06-231-0/+3
| * | | | | Only cache enabled apps when logged inRobin Appelman2014-06-231-2/+4
* | | | | | Merge pull request #9124 from owncloud/move-permissionsVincent Petry2014-06-231-0/+6
|\ \ \ \ \ \
| * | | | | | Dont allow opening writable streams on a read only dav mountRobin Appelman2014-06-231-0/+6
| |/ / / / /
* | | | | | 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