summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-08-1943-68/+30
|
* Merge pull request #4467 from owncloud/storage-wrapper-quotaicewind19912013-08-1913-142/+310
|\ | | | | Move quota logic from filesystem proxy to storage wrapper
| * merge master in storage-wrapper-quotaRobin Appelman2013-08-18115-1255/+2145
| |\
| * | remove outdated quota proxyRobin Appelman2013-08-161-114/+0
| | |
| * | fix quota wrapper reporting negative free_space, breaking user interfaceRobin Appelman2013-08-161-1/+1
| | | | | | | | | | | | return 0 instead
| * | use renamed constantsRobin Appelman2013-07-251-1/+1
| | |
| * | use storage wrapper for quota instead of a filesystem proxyRobin Appelman2013-07-251-2/+22
| | |
| * | add conveince function to wrap all storagesRobin Appelman2013-07-251-0/+12
| | |
| * | use renamed constantsRobin Appelman2013-07-251-2/+2
| | |
| * | add option to wrap existing mountsRobin Appelman2013-07-252-0/+14
| | |
| * | fix getPermissionsCache for storage wrapperRobin Appelman2013-07-251-1/+1
| | |
| * | add quota storage wrapperRobin Appelman2013-07-251-0/+104
| | |
| * | add quota streamwrapper that limits the amount of data that can be written ↵Robin Appelman2013-07-252-16/+147
| | | | | | | | | | | | to a stream
| * | rename constantsRobin Appelman2013-07-253-4/+5
| | |
* | | Merge pull request #4239 from owncloud/decrypt_files_againBjörn Schießle2013-08-183-1/+36
|\ \ \ | | | | | | | | Enable user to decrypt files again after encryption app was disabled
| * \ \ Merge branch 'master' into decrypt_files_againBjoern Schiessle2013-08-17109-1018/+1679
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/tests/keymanager.php
| * | | | throw exception if encryption was disabled but files are still encrypted to ↵Bjoern Schiessle2013-08-141-1/+11
| | | | | | | | | | | | | | | | | | | | prevent the client from syncing unreadable files
| * | | | check if some encrypted files are left after the app was disabled and warn ↵Bjoern Schiessle2013-08-122-0/+25
| | | | | | | | | | | | | | | | | | | | the user
| * | | | fix searchUsers() call in group.phpBjoern Schiessle2013-07-311-1/+1
| | | | |
* | | | | Merge pull request #4497 from owncloud/newlines_at_eof_kondouKondou2013-08-189-9/+9
|\ \ \ \ \ | | | | | | | | | | | | Add newlines at the end of files
| * | | | | Add _many_ newlines at the end of fileskondou2013-08-189-9/+9
| | |_|_|/ | |/| | |
* | | | | Port DAV groupMemberSet fix to master #4458Thomas Tanghus2013-08-181-6/+8
| | | | |
* | | | | Merge pull request #4485 from guruz/class_autoloader_optimizationMarkus Goetz2013-08-182-1/+54
|\ \ \ \ \ | |/ / / / |/| | | | Class Auto Loader: Cache paths in APC
| * | | | Class Auto Loader: Cache paths in APCMarkus Goetz2013-08-182-1/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using benchmark_single.php (from administration repo) I can measure a speed improvement of 5% to 20% loading the /index.php when logged in. (when using APC and php-fpm).
* | | | | Merge pull request #4339 from owncloud/mimetype-defaultsThomas Müller2013-08-173-236/+375
|\ \ \ \ \ | |_|_|/ / |/| | | | Add the option to provide templates for newly created files
| * | | | Merge branch 'master' into mimetype-defaultsThomas Müller2013-08-1699-850/+1360
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/ajax/newfile.php
| * | | | | use ===Robin Appelman2013-08-071-4/+4
| | | | | |
| * | | | | add the option to have templates for newly created filesRobin Appelman2013-08-072-0/+60
| | | | | |
| * | | | | split of mimetype detection code from OC_Helper, adding the option for apps ↵Robin Appelman2013-08-072-236/+315
| | | | | | | | | | | | | | | | | | | | | | | | to register additional mimetype mappings
* | | | | | remove ru_RU - fixes #3135Thomas Müller2013-08-171-6/+0
| | | | | |
* | | | | | Merge pull request #4314 from owncloud/css-fixesJan-Christoph Borchardt2013-08-161-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Design fixes
| * \ \ \ \ \ merge master into css-fixesJan-Christoph Borchardt2013-08-16109-1008/+1661
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | change long couldn't be determined string to question mark againJan-Christoph Borchardt2013-08-041-1/+1
| | | | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-168-29/+34
| |/ / / / / |/| | | | |
* | | | | | fixing all broken translation filesThomas Müller2013-08-1578-312/+312
| | | | | |
* | | | | | Cache OC_Util::checkServer() result in sessionMarkus Goetz2013-08-151-0/+7
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | The return value almost never changes but this function is called for every request.
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-1578-339/+357
| | | | |
* | | | | Merge pull request #4376 from owncloud/use_pluralsJörn Friedrich Dreyer2013-08-141-6/+4
|\ \ \ \ \ | | | | | | | | | | | | Use plural translations
| * | | | | Use plural translationskondou2013-08-091-6/+4
| | | | | |
* | | | | | Scanner: correctly pass trough reuse options when doing a recursive scanRobin Appelman2013-08-121-1/+1
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-1166-67/+1
| | | | | |
* | | | | | Changing elseif statement to what the PEAR coding guidelines say.Andreas Fischer2013-08-091-2/+1
| | | | | |
* | | | | | Do not pass numeric strings to strtotime() when formatting dates.Andreas Fischer2013-08-091-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | strtotime() will return false and the date will be formatted as the 0-timestamp (e.g. January 1, 1970 00:00) otherwise.
* | | | | Merge pull request #4344 from owncloud/appmgmt-in-navigationJan-Christoph Borchardt2013-08-091-9/+1
|\ \ \ \ \ | | | | | | | | | | | | show 'More apps' link to app administration directly in app navigation
| * | | | | show 'More apps' link to app administration directly in app navigationJan-Christoph Borchardt2013-08-071-9/+1
| | |/ / / | |/| | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-0972-71/+280
| | | | |
* | | | | Merge pull request #4271 from owncloud/plural_translationsOwen Winkler2013-08-082-9/+198
|\ \ \ \ \ | | | | | | | | | | | | Plural translations
| * | | | | initialize $plural_form_string with English defaultThomas Müller2013-08-031-1/+1
| | | | | |
| * | | | | unit tests for plural translations addedThomas Müller2013-08-022-6/+36
| | | | | |
| * | | | | PHPDoc comments adjusted *partially* - fixing call to createPluralFormFunctionThomas Müller2013-08-021-11/+18
| | | | | |