summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4302 from synchrone/masterMorris Jobke2013-08-141-0/+1
|\
| * Fixing owncloud/core#4301Alexander Bogdanov2013-08-021-0/+1
* | Merge pull request #4393 from owncloud/fix_4326Andreas Fischer2013-08-141-1/+1
|\ \
| * | use __DIR__ instead of realpathBjoern Schiessle2013-08-141-1/+1
| * | provide correct path for require_onceBjoern Schiessle2013-08-121-1/+1
* | | Merge pull request #4304 from tripflex/lostpw-themedThomas Müller2013-08-141-1/+2
|\ \ \
| * | | use getName instead of getTitleMyles McNamara2013-08-081-1/+1
| * | | fix syntax errorMyles McNamara2013-08-031-1/+1
| * | | use theme name and title for password resetMyles McNamara2013-08-031-1/+2
* | | | Merge pull request #4372 from owncloud/allow_empty_configvalueThomas Müller2013-08-141-1/+1
|\ \ \ \
| * | | | allow empty configvalue in appconfigJörn Friedrich Dreyer2013-08-091-1/+1
* | | | | 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