summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | Merge pull request #5768 from owncloud/quota-workaroundwhenmissingrootsize-ho...Morris Jobke2013-11-138-25/+303
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Now using HomeStorage for legacy home storage idsVincent Petry2013-11-124-6/+115
| | * | | | | | | | | Now calling parent method when path is not rootVincent Petry2013-11-121-16/+8
| | * | | | | | | | | Do not use -1 as the size for the root folder of the home storageRobin Appelman2013-11-125-19/+196
| | | |_|_|_|/ / / / | | |/| | | | | | |
| * | | | | | | | | Merge pull request #5831 from owncloud/files-charatissueMorris Jobke2013-11-131-3/+3
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fixed total dirs/files message hiding conditionVincent Petry2013-11-131-3/+3
| | | |_|_|/ / / / / | | |/| | | | | | |
* | / | | | | | | | beta 4Frank Karlitschek2013-11-131-2/+2
|/ / / / / / / / /
* | | | | | | | | Merge pull request #5447 from owncloud/fixing-5117-masterVincent Petry2013-11-137-75/+132
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | rename fixPartialFilePath() to stripPartialFileExtension(), this name describ...Bjoern Schiessle2013-11-124-12/+12
| * | | | | | | | missed some replacements... now tests should workBjoern Schiessle2013-11-121-13/+6
| * | | | | | | | fixing tests for the new part file handlingBjoern Schiessle2013-11-125-42/+86
| * | | | | | | | let encryption app detect transfer id in path and handle it correctlyBjoern Schiessle2013-11-113-36/+34
| * | | | | | | | make it possible to detect transferID partBjoern Schiessle2013-11-111-1/+1
| * | | | | | | | adding oc-mtime handling to chunked uploadThomas Müller2013-10-211-0/+9
| * | | | | | | | chunked files are assembled into a part file on the target storage followed b...Thomas Müller2013-10-211-3/+16
* | | | | | | | | Merge pull request #5822 from owncloud/delete_hooks_trash_and_versionsMorris Jobke2013-11-123-0/+6
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | add trash bin and file versions delete hooks in OC::registerPreviewHooksGeorg Ehrke2013-11-121-0/+2
| * | | | | | | | implement delete hooks in file versions libGeorg Ehrke2013-11-121-0/+3
| * | | | | | | | replace $path with '/files_trashbin/files/' . $fileGeorg Ehrke2013-11-121-1/+1
| * | | | | | | | add delete hook for trash bin appGeorg Ehrke2013-11-121-0/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #5810 from owncloud/disbaledtextareasMorris Jobke2013-11-121-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | new line for css ruleMorris Jobke2013-11-121-1/+2
| * | | | | | | | Disabled textareas should look like they are disabledArthur Schiwon2013-11-111-1/+1
* | | | | | | | | Merge pull request #5816 from Wikinaut/patch-1Thomas Müller2013-11-121-1/+5
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Update config.sample.phpWikinaut2013-11-121-1/+5
|/ / / / / / / /
* | | | | | | | Merge pull request #5804 from owncloud/files-selectionsummaryMorris Jobke2013-11-111-1/+1
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Selection summary is now displayed properlyVincent Petry2013-11-111-1/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #5707 from owncloud/fixwrongfilesizeintestsMorris Jobke2013-11-111-0/+3
|\ \ \ \ \ \ \
| * | | | | | | Fixed filesize issue in watchr testVincent Petry2013-11-051-0/+3
* | | | | | | | Merge pull request #5769 from owncloud/files-changedirjseventMorris Jobke2013-11-111-0/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Added JS event for when the user changes the directoryVincent Petry2013-11-081-0/+6
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge pull request #5701 from owncloud/sharing-updateownerfoldersizesMorris Jobke2013-11-116-114/+341
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixed unit tests for files sharing watcherVincent Petry2013-11-062-3/+3
| * | | | | | | | Added unit tests for shared files watcherVincent Petry2013-11-054-108/+317
| * | | | | | | | Removed unused methodVincent Petry2013-11-051-18/+0
| * | | | | | | | Fixed watcher to also update the owner's folder sizesVincent Petry2013-11-053-7/+43
| | |/ / / / / / | |/| | | | | |
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-11-11439-3661/+3757
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge pull request #5687 from owncloud/fixing-5659-masterThomas Müller2013-11-091-8/+3
|\ \ \ \ \ \ \
| * | | | | | | display the exception instead of meaningless messageThomas Müller2013-11-041-8/+3
* | | | | | | | Merge pull request #5759 from owncloud/fixing-5757-masterThomas Müller2013-11-091-2/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | implementing solution using <ifModule mod_authz_core>Thomas Müller2013-11-081-4/+8
| * | | | | | | | adding proper htaccess commands for Apache 2.4Thomas Müller2013-11-081-2/+9
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-11-09145-361/+3976
* | | | | | | | | Merge pull request #5763 from owncloud/fixing-sharing-ocs-api-masterThomas Müller2013-11-081-0/+8
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | the filesystem has to be initialized once we know the userThomas Müller2013-11-081-0/+8
| |/ / / / / / /
* | | | | | | | Merge pull request #5762 from owncloud/files-uploaderrordelayJan-Christoph Borchardt2013-11-081-6/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Increased upload error delay to 10 secondsVincent Petry2013-11-081-6/+5
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #5747 from owncloud/scanner-post-hooksMorris Jobke2013-11-071-0/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Add post hooks for filesystem scannerRobin Appelman2013-11-071-0/+5
* | | | | | | Now removing stray old cookies from 5.0.12Vincent Petry2013-11-071-0/+5
|/ / / / / /