summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update backends and their configurationsThomas Müller2014-04-031-19/+72
|
* Moved dependency checks to end of class filesPhilipp Kapfer2014-04-039-248/+296
| | | | | | | | | | Dependency messages now appear below the configuration options instead of above Reworked dependency check method to support consolidated messages for multiple backends Conflicts: apps/files_external/lib/google.php apps/files_external/lib/swift.php apps/files_external/templates/settings.php
* Added cURL dependency for Amazon S3, Dropbox and SWIFTPhilipp Kapfer2014-04-034-3/+42
| | | | | | Conflicts: apps/files_external/lib/amazons3.php apps/files_external/lib/swift.php
* Changed dependency check messages from warnings to notesPhilipp Kapfer2014-04-035-8/+41
| | | | Added check for duplicate dependency check messages to display only the first
* Added cURL dependency check to Google Drive and WebDAV backendPhilipp Kapfer2014-04-034-4/+33
| | | | | | | | Added check for backend's checkDependencies method to OC_Mount_Config::getBackends() when backend is configured to have some instead of blindly calling it and crashing Conflicts: apps/files_external/lib/config.php apps/files_external/lib/google.php
* Modified app to dynamically register backends instead of hard-coding themPhilipp Kapfer2014-04-034-158/+129
| | | | | | | | Moved dependency check to the individual backends instead of the config Conflicts: apps/files_external/appinfo/app.php apps/files_external/lib/config.php
* [tx-robot] updated from transifexJenkins for ownCloud2014-04-0340-119/+145
|
* Merge pull request #8014 from owncloud/uploadsize-reuseicewind19912014-04-021-1/+1
|\ | | | | Reuse known free space in the files app
| * 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 touch
| * there is no need to re-calculate the shares after a touchBjoern Schiessle2014-03-311-45/+0
| |
* | Merge pull request #7995 from owncloud/fix-h3-stylesMorris Jobke2014-04-022-2/+3
|\ \ | | | | | | fix h3 style, move out from settings to apps CSS
| * | fix h3 style, move out from settings to apps CSSJan-Christoph Borchardt2014-04-022-2/+3
| | |
* | | Merge pull request #8003 from owncloud/extstorage-sftp-upgradephpseclibVincent Petry2014-04-0227-723/+1287
|\ \ \ | | | | | | | | Upgraded phpseclib to version 0.3.6 (SFTP ext storage)
| * | | Upgraded phpseclib to version 0.3.6Vincent Petry2014-04-0227-723/+1287
| | | |
* | | | Merge pull request #8006 from wakeup/masterMorris Jobke2014-04-021-1/+1
|\ \ \ \ | | | | | | | | | | Fix admin-dir_permissions redirection when cannot write warning is shown.
| * | | | Fix admin-dir_permissions redirection when cannot write warningVolkan Gezer2014-04-021-1/+1
| | | | | | | | | | | | | | | | | | | | is shown.
* | | | | Merge pull request #7977 from owncloud/fix_enc_if_sharing_is_disabledMorris Jobke2014-04-023-13/+11
|\ \ \ \ \ | | | | | | | | | | | | always encrypt files to owner
| * | | | | always encrypt files to ownerBjoern Schiessle2014-03-313-13/+11
| | | | | |
* | | | | | Merge pull request #7968 from owncloud/core-overwritewebrootwithrootVincent Petry2014-04-022-3/+4
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Allow using "/" in "overwritewebroot"
| * | | | | Allow using "/" in "overwritewebroot"Vincent Petry2014-03-312-3/+4
| |/ / / / | | | | | | | | | | | | | | | | | | | | Whenever the reverse proxy is using "/" as the webroot, it is now possible to set that value in "overwritewebroot"
* | | | | Merge pull request #7979 from owncloud/core-fixfilegetcontentsloopVincent Petry2014-04-023-8/+48
|\ \ \ \ \ | |_|_|/ / |/| | | | Correctly read the full stream in file_get_contents
| * | | | Added missing fclose in file_get_contents and file_put_contentsVincent Petry2014-04-011-1/+4
| | | | |
| * | | | Correctly read the full stream in file_get_contentsVincent Petry2014-04-013-7/+44
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using user-defined stream wrappers, PHP will return a maximum of 8192 bytes even if more was requested. This fix uses stream_get_contents to make sure the full stream is read and not only the first 8 KB. Added unit test with a bigger test file to cover this case.
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-02180-3035/+3004
| | | |
* | | | Merge pull request #7989 from owncloud/files-deletefileregressionfixThomas Müller2014-04-012-8/+20
|\ \ \ \ | | | | | | | | | | Fixed broken delete file action
| * | | | Fixed broken delete file actionVincent Petry2014-04-012-8/+20
| | | | |
* | | | | Merge pull request #7884 from owncloud/use-idn_to_ascii-if-availableThomas Müller2014-04-012-0/+12
|\ \ \ \ \ | | | | | | | | | | | | idn_to_ascii is only used if available
| * | | | | idn_to_ascii is only used if availableThomas Müller2014-03-262-0/+12
| | | | | |
* | | | | | Merge pull request #7935 from owncloud/getpath-sharedVincent Petry2014-04-014-14/+120
|\ \ \ \ \ \ | | | | | | | | | | | | | | Make getPath work for shared files
| * | | | | | Improve phpdocRobin Appelman2014-03-312-1/+10
| | | | | | |
| * | | | | | Implement getPath for shared filesRobin Appelman2014-03-282-8/+82
| | | | | | |
| * | | | | | Give storages the option to implement the getById behaviour for View->getPathRobin Appelman2014-03-282-6/+29
| | | | | | |
* | | | | | | Merge pull request #7817 from owncloud/app-navigation-for-appsMorris Jobke2014-04-014-60/+50
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Makes #app-navigation a part of app management.
| * | | | | | | apply proposed changeMorris Jobke2014-04-011-2/+2
| | | | | | | |
| * | | | | | | merge CSS rulesMorris Jobke2014-03-311-4/+2
| | | | | | | |
| * | | | | | | Removes highlighting of selected items, padding from apps management.raghunayyar2014-03-302-3/+3
| | | | | | | |
| * | | | | | | Adds Style changes to app-navigation in core/css/apps.cssraghunayyar2014-03-242-4/+13
| | | | | | | |
| * | | | | | | Makes #app-navigation a part of app management.raghunayyar2014-03-203-59/+42
| | | | | | | |
* | | | | | | | Merge pull request #7997 from owncloud/correct-remember-trashbin-stateBart Visscher2014-04-011-3/+3
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | Correct the remembering of the trashbin app state in encryption test
| * | | | | | | 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 exist
| * | | | | | | 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: change confusing 'applicable' to 'available for', default to »All Users«
| * | | | | | | 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 #7696 from owncloud/chunk-remainingspacefixVincent Petry2014-04-012-3/+48
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Fixed chunking and insufficient storage check
| * | | | | | | Fixed chunking and insufficient storage checkVincent Petry2014-03-172-3/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fixed free space detection based on the already uploaded chunks - now deleting chunks as soon as it is read out before writing it into the part file, which reduces the space needed when assembling part files
* | | | | | | | Merge pull request #7293 from owncloud/update-shares-postgresVincent Petry2014-04-014-16/+109
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | fix update to remove shares where file doesn't exist on postgres
| * | | | | | | | Fixed share upgrade cleanup tests to use the correct idsVincent Petry2014-03-261-9/+9
| | | | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-07 00:05:35 +0000