summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4376 from owncloud/use_pluralsJörn Friedrich Dreyer2013-08-145-35/+16
|\
| * Reword a phrasekondou2013-08-141-1/+1
| * Use plural translationskondou2013-08-095-35/+16
* | Merge pull request #4363 from owncloud/fix-4355Thomas Müller2013-08-141-11/+16
|\ \
| * | Use multiple lines for the JSON data array.Andreas Fischer2013-08-081-1/+5
| * | Adjust JSON code to stable5.Andreas Fischer2013-08-081-1/+2
| * | Do not repeat JSON success code.Andreas Fischer2013-08-081-8/+7
| * | Do not repeat definition of $target.Andreas Fischer2013-08-081-5/+6
* | | Merge pull request #4410 from owncloud/fix_sharing_defaultsJörn Friedrich Dreyer2013-08-132-2/+3
|\ \ \
| * | | comment clarificationJörn Friedrich Dreyer2013-08-141-1/+1
| * | | use edit & reshare permission as defaultJörn Friedrich Dreyer2013-08-131-2/+2
| * | | add PERMISSIONS_ALL summaryJörn Friedrich Dreyer2013-08-131-0/+1
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-1361-153/+224
* | | | Merge pull request #4391 from owncloud/scanner-reuse-recursiveicewind19912013-08-123-1/+93
|\ \ \ \ | |/ / / |/| | |
| * | | Scanner: correctly pass trough reuse options when doing a recursive scanRobin Appelman2013-08-121-1/+1
| * | | Scanner: additional tests for reusing etags during scanningRobin Appelman2013-08-122-0/+92
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-11254-1148/+1100
* | | Merge pull request #4360 from owncloud/format-date-numeric-stringsOwen Winkler2013-08-092-2/+13
|\ \ \ | |_|/ |/| |
| * | adding test case for a numeric valueThomas Müller2013-08-091-2/+7
| * | Add datetime test for numeric string.Andreas Fischer2013-08-091-0/+7
| * | 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-096-17/+40
|\ \
| * | draw attention to the newly added app entry by flashing it twiceJan-Christoph Borchardt2013-08-071-0/+3
| * | scroll the app navigation down so the newly added app is seenJan-Christoph Borchardt2013-08-071-0/+2
| * | prepend the new app before the 'More apps' functionJan-Christoph Borchardt2013-08-071-1/+2
| * | show 'More apps' link to app administration directly in app navigationJan-Christoph Borchardt2013-08-075-16/+33
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-091143-3444/+5299
| |/ |/|
* | Merge pull request #4271 from owncloud/plural_translationsOwen Winkler2013-08-089-51/+407
|\ \
| * | remove unneeded vars from unit testThomas Müller2013-08-051-2/+2
| * | adding proper evaluation of plural form - uses LGPL licensed code of jsgettextThomas Müller2013-08-031-17/+62
| * | initialize $plural_form_string with English defaultThomas Müller2013-08-031-1/+1
| * | return plural form in ajax translationsThomas Müller2013-08-031-1/+1
| * | unit tests for plural translations addedThomas Müller2013-08-026-6/+106
| * | another new lineThomas Müller2013-08-021-1/+1
| * | PHPDoc comments adjusted *partially* - fixing call to createPluralFormFunctionThomas Müller2013-08-021-11/+18
| * | add new line to generated php codeThomas Müller2013-08-021-1/+1
| * | 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
| * | Save the plural information given in po filesJakob Sack2013-08-011-5/+20
| * | Fix an error jenkins foundJakob Sack2013-07-161-1/+1
| * | Fix two bugs in l10n.plJakob Sack2013-07-161-2/+2
| * | Add multiple plural forms to the php partJakob Sack2013-07-163-11/+43
| * | Allow several plural forms in l10n php filesJakob Sack2013-07-161-6/+11
| * | Partly integrate plural translations into jsJakob Sack2013-07-071-19/+36
| * | make l10n libs capable of handling plural translationsJakob Sack2013-07-072-3/+28
| * | Add possibility to read/write plural translationsJakob Sack2013-07-071-6/+22
* | | Merge pull request #4151 from owncloud/doctrine-objectJörn Friedrich Dreyer2013-08-0810-337/+488
|\ \ \