summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-04-074-0/+9
* [tx-robot] updated from transifexJenkins for ownCloud2014-04-066-3/+19
* Show higher resolution previews for high dpi screensRobin Appelman2014-04-041-2/+4
* Merge pull request #8015 from owncloud/storageinfo-reuseVincent Petry2014-04-041-2/+2
|\
| * Allow reusing FileInfo for getStorageInfoRobin Appelman2014-04-021-2/+2
* | [tx-robot] updated from transifexJenkins for ownCloud2014-04-0471-224/+115
* | Merge pull request #6968 from owncloud/files-ajaxloadMorris Jobke2014-04-0338-1366/+2337
|\ \
| * | Correctly set svg for crumb dividerVincent Petry2014-04-031-1/+1
| * | Fixed dirInfo check for non existing dir in files ajax callVincent Petry2014-04-031-1/+1
| * | Removed redundant free space and upload limit in public pageVincent Petry2014-04-031-4/+0
| * | Files, trashbin, public apps use ajax/JSON for the file listVincent Petry2014-04-0238-1365/+2340
* | | Merge pull request #7969 from Xenopathic/files_external_fixVincent Petry2014-04-031-4/+4
|\ \ \
| * | | Fix error log spamRobin McCorkell2014-04-031-4/+4
* | | | Merge pull request #7970 from owncloud/webdav-upload-hashThomas Müller2014-04-031-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fix uploading files containing a # in the path for webdavRobin Appelman2014-03-311-1/+1
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-0313-1/+23
* | | | Merge pull request #8014 from owncloud/uploadsize-reuseicewind19912014-04-021-1/+1
|\ \ \ \
| * | | | Reuse known free space in the files appRobin Appelman2014-04-021-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #7978 from owncloud/enc_cleanupVincent Petry2014-04-021-45/+0
|\ \ \ \ | |/ / / |/| | |
| * | | there is no need to re-calculate the shares after a touchBjoern Schiessle2014-03-311-45/+0
| |/ /
* | | Merge pull request #8003 from owncloud/extstorage-sftp-upgradephpseclibVincent Petry2014-04-0227-723/+1287
|\ \ \
| * | | Upgraded phpseclib to version 0.3.6Vincent Petry2014-04-0227-723/+1287
* | | | Merge pull request #7977 from owncloud/fix_enc_if_sharing_is_disabledMorris Jobke2014-04-022-10/+8
|\ \ \ \ | |/ / / |/| | |
| * | | always encrypt files to ownerBjoern Schiessle2014-03-312-10/+8
| |/ /
* | / [tx-robot] updated from transifexJenkins for ownCloud2014-04-0254-98/+16
| |/ |/|
* | Merge pull request #7989 from owncloud/files-deletefileregressionfixThomas Müller2014-04-012-8/+20
|\ \
| * | Fixed broken delete file actionVincent Petry2014-04-012-8/+20
* | | Merge pull request #7935 from owncloud/getpath-sharedVincent Petry2014-04-012-8/+89
|\ \ \
| * | | Improve phpdocRobin Appelman2014-03-311-0/+7
| * | | Implement getPath for shared filesRobin Appelman2014-03-282-8/+82
* | | | Merge pull request #7997 from owncloud/correct-remember-trashbin-stateBart Visscher2014-04-011-3/+3
|\ \ \ \
| * | | | Remember before change works betterBart Visscher2014-04-011-3/+3
| | |_|/ | |/| |
* | | | Merge pull request #7986 from owncloud/files-fixredirectwhendirnotexistsVincent Petry2014-04-011-1/+1
|\ \ \ \
| * | | | Fix dirInfo check when dir does not existVincent Petry2014-04-011-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #7984 from owncloud/wording-applicable2Morris Jobke2014-04-011-4/+7
|\ \ \ \ | |/ / / |/| | |
| * | | external storage: set storages to be available for All Users by defaultJan-Christoph Borchardt2014-04-011-3/+6
| * | | external storage: change confusing 'applicable' to 'available for'Jan-Christoph Borchardt2014-04-011-1/+1
* | | | Merge pull request #7293 from owncloud/update-shares-postgresVincent Petry2014-04-014-16/+109
|\ \ \ \ | |/ / / |/| | |
| * | | Fixed share upgrade cleanup tests to use the correct idsVincent Petry2014-03-261-9/+9
| * | | Fixed share updater unit testVincent Petry2014-03-251-8/+10
| * | | remove invalid shares with one SQL statementMorris Jobke2014-03-131-12/+5
| * | | Added backticks for Oracle in sharing updater unit testVincent Petry2014-03-131-8/+8
| * | | Clean up database before setup the database for testingMorris Jobke2014-03-131-0/+4
| * | | Refactor update script to class and add unit testMorris Jobke2014-03-133-13/+108
| * | | fix update to remove shares where file doesn't exist on postgresJamie McClelland2014-03-132-15/+14
* | | | Merge pull request #7912 from owncloud/enc_move_checks_to_pre_hookBjörn Schießle2014-04-013-87/+66
|\ \ \ \
| * | | | don't call getFileInfo() to avoid to open the same file twiceBjoern Schiessle2014-03-311-12/+16
| * | | | move check if a file should be encrypted to the pre hookBjoern Schiessle2014-03-312-75/+50
| | |_|/ | |/| |
* | | | Merge pull request #7975 from owncloud/fix-7973-master-2Vincent Petry2014-04-011-5/+0
|\ \ \ \
| * | | | remove pl_PL - fixes #7973Thomas Müller2014-03-311-5/+0
| | |_|/ | |/| |