summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* style fixes for preview libGeorg Ehrke2013-08-195-43/+46
* Merge master into oc_previewGeorg Ehrke2013-08-1997-600/+853
|\
| * Merge pull request #4239 from owncloud/decrypt_files_againBjörn Schießle2013-08-183-1/+36
| |\
| | * Merge branch 'master' into decrypt_files_againBjoern Schiessle2013-08-17109-1018/+1679
| | |\
| | * | throw exception if encryption was disabled but files are still encrypted to p...Bjoern Schiessle2013-08-141-1/+11
| | * | check if some encrypted files are left after the app was disabled and warn th...Bjoern Schiessle2013-08-122-0/+25
| | * | 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 _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 APCMarkus Goetz2013-08-182-1/+54
| * | | | Merge pull request #4339 from owncloud/mimetype-defaultsThomas Müller2013-08-173-236/+375
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Merge branch 'master' into mimetype-defaultsThomas Müller2013-08-1699-850/+1360
| | |\ \ \
| | * | | | 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 t...Robin Appelman2013-08-072-236/+315
| * | | | | 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
| |\ \ \ \ \
| | * \ \ \ \ 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
| | |_|/ / | |/| | |
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-1578-339/+357
* | | | | check if ->resource is a resourceGeorg Ehrke2013-08-151-2/+4
* | | | | add comment to make @jancborchardt happyGeorg Ehrke2013-08-151-0/+1
* | | | | fix svg and cache transparency issueGeorg Ehrke2013-08-153-3/+10
* | | | | improve unknown backendGeorg Ehrke2013-08-152-20/+35
* | | | | don't generate previews of empty txt filesGeorg Ehrke2013-08-141-0/+4
* | | | | Merge master into oc_previewGeorg Ehrke2013-08-1489-571/+1078
|\| | | |
| * | | | Merge pull request #4376 from owncloud/use_pluralsJörn Friedrich Dreyer2013-08-141-6/+4
| |\ \ \ \
| | * | | | 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
| |/ / / /
| * | | | 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 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
| |\ \ \ \
| | * | | | 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
| | * | | | Fix syntax error.Jakob Sack2013-08-011-1/+2
| | * | | | Fix copy and paste errors in l10n.phpJakob Sack2013-08-012-2/+2
| | * | | | Create plural functions on the flyJakob Sack2013-08-012-7/+86
| | * | | | Update l10n.php to read plural_forms stringJakob Sack2013-08-011-8/+22
| | * | | | Fix an error jenkins foundJakob Sack2013-07-161-1/+1
| | * | | | Add multiple plural forms to the php partJakob Sack2013-07-162-5/+38