Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #4302 from synchrone/master | Morris Jobke | 2013-08-14 | 1 | -0/+1 |
|\ | |||||
| * | Fixing owncloud/core#4301 | Alexander Bogdanov | 2013-08-02 | 1 | -0/+1 |
* | | Merge pull request #4393 from owncloud/fix_4326 | Andreas Fischer | 2013-08-14 | 1 | -1/+1 |
|\ \ | |||||
| * | | 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 #4376 from owncloud/use_plurals | Jörn Friedrich Dreyer | 2013-08-14 | 3 | -23/+8 |
|\ \ \ | |||||
| * | | | Reword a phrase | kondou | 2013-08-14 | 1 | -1/+1 |
| * | | | Use plural translations | kondou | 2013-08-09 | 3 | -23/+8 |
| |/ / | |||||
* | | | Merge pull request #4363 from owncloud/fix-4355 | Thomas Müller | 2013-08-14 | 1 | -11/+16 |
|\ \ \ | |||||
| * | | | 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 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-13 | 14 | -4/+51 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-11 | 10 | -0/+13 |
| |/ / |/| | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-09 | 500 | -522/+1549 |
|/ / | |||||
* | | Merge pull request #3912 from owncloud/css_cleanup_kondou | Jan-Christoph Borchardt | 2013-08-08 | 1 | -1/+1 |
|\ \ | |||||
| * \ | Merge branch 'master' into css_cleanup_kondou | kondou | 2013-07-24 | 862 | -1086/+79955 |
| |\ \ | |||||
| * | | | General CSS cleanup | kondou | 2013-07-09 | 1 | -1/+1 |
* | | | | Merge pull request #4243 from owncloud/no_empty_versions | Björn Schießle | 2013-08-08 | 1 | -2/+5 |
|\ \ \ \ | |||||
| * | | | | don't create empty versions | Bjoern Schiessle | 2013-07-30 | 1 | -2/+5 |
* | | | | | Merge pull request #4340 from owncloud/true-false-as-filename | Thomas Müller | 2013-08-08 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Check expected type after JSON decode instead of checking what is not expected. | Andreas Fischer | 2013-08-07 | 1 | -1/+1 |
* | | | | | | more error messages which might be useful for the user to debug his server co... | Bjoern Schiessle | 2013-08-08 | 2 | -2/+6 |
* | | | | | | improved error message to refect openSSL PHP extension and stock openSSL conf... | Bjoern Schiessle | 2013-08-08 | 1 | -1/+1 |
* | | | | | | also write error message to the log | Bjoern Schiessle | 2013-08-08 | 1 | -0/+1 |
* | | | | | | catch broken server config and disable encryption app. | Bjoern Schiessle | 2013-08-08 | 2 | -1/+13 |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-07 | 10 | -20/+37 |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-05 | 2 | -1/+3 |
* | | | | | | Merge pull request #4285 from owncloud/scan-files-script-master | Thomas Müller | 2013-08-05 | 1 | -0/+31 |
|\ \ \ \ \ \ | |||||
| * | | | | | | remove cli check | Thomas Müller | 2013-08-02 | 1 | -4/+0 |
| * | | | | | | adjust usage text | Thomas Müller | 2013-08-02 | 1 | -2/+2 |
| * | | | | | | Use console.php entry point for file scanning from console | Bart Visscher | 2013-08-02 | 1 | -0/+35 |
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-04 | 4 | -1/+8 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-03 | 8 | -1/+22 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Merge pull request #3006 from owncloud/===_and_!==_in_files_trashbin-app | Jörn Friedrich Dreyer | 2013-08-02 | 8 | -27/+27 |
|\ \ \ \ \ | |||||
| * | | | | | Use isIgnoredDir() | kondou | 2013-07-10 | 1 | -1/+1 |
| * | | | | | Use !== and === in files_trashbin-app | kondou | 2013-07-10 | 8 | -27/+27 |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-02 | 5 | -12/+26 |
| |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #4270 from owncloud/fix_4253 | Björn Schießle | 2013-08-01 | 2 | -11/+14 |
|\ \ \ \ \ | |||||
| * | | | | | fix test and make warning translatable | Bjoern Schiessle | 2013-08-01 | 2 | -3/+9 |
| * | | | | | cancel sharing if some users doesn't have a working encryption set-up. | Bjoern Schiessle | 2013-08-01 | 1 | -9/+6 |
* | | | | | | Merge pull request #4265 from berendt/OC_Files_Storage_AmazonS3_phpdoc | Jörn Friedrich Dreyer | 2013-08-01 | 1 | -0/+15 |
|\ \ \ \ \ \ | |||||
| * | | | | | | added @var tags | Christian Berendt | 2013-08-01 | 1 | -0/+15 |
* | | | | | | | Merge pull request #4266 from berendt/OC_Files_Storage_AmazonS3_logging | Jörn Friedrich Dreyer | 2013-08-01 | 1 | -0/+14 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | write all catched exception messages to the log | Christian Berendt | 2013-08-01 | 1 | -0/+14 |
| |/ / / / / | |||||
* / / / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-01 | 23 | -3/+90 |
|/ / / / / | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-31 | 11 | -1/+46 |
* | | | | | Merge pull request #4225 from owncloud/better-404 | Thomas Müller | 2013-07-30 | 3 | -0/+30 |
|\ \ \ \ \ | |||||
| * | | | | | Use default cursor for list items | Victor Dubiniuk | 2013-07-30 | 1 | -1/+1 |