Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fixing all broken translation files | Thomas Müller | 2013-08-15 | 288 | -956/+956 |
| | |||||
* | fixing call to join | Thomas Müller | 2013-08-15 | 1 | -1/+1 |
| | |||||
* | Merge pull request #4441 from guruz/checkServer_cache_result | Markus Goetz | 2013-08-15 | 1 | -0/+7 |
|\ | | | | | Cache OC_Util::checkServer() result in session | ||||
| * | Cache OC_Util::checkServer() result in session | Markus Goetz | 2013-08-15 | 1 | -0/+7 |
|/ | | | | | The return value almost never changes but this function is called for every request. | ||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-15 | 615 | -8868/+8099 |
| | |||||
* | Merge pull request #4302 from synchrone/master | Morris Jobke | 2013-08-14 | 1 | -0/+1 |
|\ | | | | | Fixing owncloud/core#4301 | ||||
| * | Fixing owncloud/core#4301 | Alexander Bogdanov | 2013-08-02 | 1 | -0/+1 |
| | | | | | | Adding a CURLOPT_FOLLOWLOCATION for HTTP 301 support (e.g yandex disk uses those) | ||||
* | | Merge pull request #4393 from owncloud/fix_4326 | Andreas Fischer | 2013-08-14 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | provide correct path for require_once * owncloud/fix_4326: use __DIR__ instead of realpath provide correct path for require_once | ||||
| * | | use __DIR__ instead of realpath | Bjoern Schiessle | 2013-08-14 | 1 | -1/+1 |
| | | | |||||
| * | | provide correct path for require_once | Bjoern Schiessle | 2013-08-12 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #4304 from tripflex/lostpw-themed | Thomas Müller | 2013-08-14 | 1 | -1/+2 |
|\ \ \ | | | | | | | | | use theme name and title for password reset | ||||
| * | | | use getName instead of getTitle | Myles McNamara | 2013-08-08 | 1 | -1/+1 |
| | | | | |||||
| * | | | fix syntax error | Myles McNamara | 2013-08-03 | 1 | -1/+1 |
| | | | | | | | | | | | | accidentally had ; included, and changed concatenating | ||||
| * | | | use theme name and title for password reset | Myles McNamara | 2013-08-03 | 1 | -1/+2 |
| | | | | | | | | | | | | password reset email uses owncloud, updated to use theme settings | ||||
* | | | | Merge pull request #4372 from owncloud/allow_empty_configvalue | Thomas Müller | 2013-08-14 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | allow empty configvalue in appconfig | ||||
| * | | | | allow empty configvalue in appconfig | Jörn Friedrich Dreyer | 2013-08-09 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #4376 from owncloud/use_plurals | Jörn Friedrich Dreyer | 2013-08-14 | 5 | -35/+16 |
|\ \ \ \ \ | | | | | | | | | | | | | Use plural translations | ||||
| * | | | | | Reword a phrase | kondou | 2013-08-14 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Use plural translations | kondou | 2013-08-09 | 5 | -35/+16 |
| | | | | | | |||||
* | | | | | | Merge pull request #4363 from owncloud/fix-4355 | Thomas Müller | 2013-08-14 | 1 | -11/+16 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Send mime-type for new files | ||||
| * | | | | | | Use multiple lines for the JSON data array. | Andreas Fischer | 2013-08-08 | 1 | -1/+5 |
| | | | | | | | |||||
| * | | | | | | Adjust JSON code to stable5. | Andreas Fischer | 2013-08-08 | 1 | -1/+2 |
| | | | | | | | |||||
| * | | | | | | Do not repeat JSON success code. | Andreas Fischer | 2013-08-08 | 1 | -8/+7 |
| | | | | | | | |||||
| * | | | | | | Do not repeat definition of $target. | Andreas Fischer | 2013-08-08 | 1 | -5/+6 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #4410 from owncloud/fix_sharing_defaults | Jörn Friedrich Dreyer | 2013-08-13 | 2 | -2/+3 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix sharing defaults | ||||
| * | | | | | | comment clarification | Jörn Friedrich Dreyer | 2013-08-14 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | use edit & reshare permission as default | Jörn Friedrich Dreyer | 2013-08-13 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | add PERMISSIONS_ALL summary | Jörn Friedrich Dreyer | 2013-08-13 | 1 | -0/+1 |
| | | | | | | | |||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-13 | 61 | -153/+224 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #4391 from owncloud/scanner-reuse-recursive | icewind1991 | 2013-08-12 | 3 | -1/+93 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Fix recursive scanner to reusing etags | ||||
| * | | | | | | Scanner: correctly pass trough reuse options when doing a recursive scan | Robin Appelman | 2013-08-12 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Scanner: additional tests for reusing etags during scanning | Robin Appelman | 2013-08-12 | 2 | -0/+92 |
|/ / / / / / | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-11 | 254 | -1148/+1100 |
| | | | | | | |||||
* | | | | | | Merge pull request #4360 from owncloud/format-date-numeric-strings | Owen Winkler | 2013-08-09 | 2 | -2/+13 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Do not pass numeric strings to strtotime() when formatting dates. | ||||
| * | | | | | adding test case for a numeric value | Thomas Müller | 2013-08-09 | 1 | -2/+7 |
| | | | | | | |||||
| * | | | | | Add datetime test for numeric string. | Andreas Fischer | 2013-08-09 | 1 | -0/+7 |
| | | | | | | |||||
| * | | | | | Changing elseif statement to what the PEAR coding guidelines say. | Andreas Fischer | 2013-08-09 | 1 | -2/+1 |
| | | | | | | |||||
| * | | | | | Do not pass numeric strings to strtotime() when formatting dates. | Andreas Fischer | 2013-08-09 | 1 | -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-navigation | Jan-Christoph Borchardt | 2013-08-09 | 6 | -17/+40 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | show 'More apps' link to app administration directly in app navigation | ||||
| * | | | | draw attention to the newly added app entry by flashing it twice | Jan-Christoph Borchardt | 2013-08-07 | 1 | -0/+3 |
| | | | | | |||||
| * | | | | scroll the app navigation down so the newly added app is seen | Jan-Christoph Borchardt | 2013-08-07 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | prepend the new app before the 'More apps' function | Jan-Christoph Borchardt | 2013-08-07 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | show 'More apps' link to app administration directly in app navigation | Jan-Christoph Borchardt | 2013-08-07 | 5 | -16/+33 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-09 | 1143 | -3444/+5299 |
| |/ / / |/| | | | |||||
* | | | | Merge pull request #4271 from owncloud/plural_translations | Owen Winkler | 2013-08-08 | 9 | -51/+407 |
|\ \ \ \ | | | | | | | | | | | Plural translations | ||||
| * | | | | remove unneeded vars from unit test | Thomas Müller | 2013-08-05 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | adding proper evaluation of plural form - uses LGPL licensed code of jsgettext | Thomas Müller | 2013-08-03 | 1 | -17/+62 |
| | | | | | |||||
| * | | | | initialize $plural_form_string with English default | Thomas Müller | 2013-08-03 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | return plural form in ajax translations | Thomas Müller | 2013-08-03 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | unit tests for plural translations added | Thomas Müller | 2013-08-02 | 6 | -6/+106 |
| | | | | |