summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | Add test for having utf8 filenames in the cacheRobin Appelman2013-12-121-1/+31
| |/ / / / /
* | | | | | Update 3rdparty refThomas Müller2013-12-131-0/+0
* | | | | | Merge pull request #6356 from owncloud/fix_6353Vincent Petry2013-12-121-0/+8
|\ \ \ \ \ \
| * | | | | | toggle select all checkboxBjoern Schiessle2013-12-121-0/+8
* | | | | | | update 3rdpartyJörn Friedrich Dreyer2013-12-121-0/+0
* | | | | | | Merge pull request #6302 from owncloud/mysql-set-names-utf8Owen Winkler2013-12-121-0/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Send "SET NAMES utf8" to MySQL for PHP below 5.3.6Andreas Fischer2013-12-111-0/+3
| | |_|/ / / | |/| | | |
* | | | | | LDAP: the browser shall not autofill userdn and password, usually login crede...Arthur Schiwon2013-12-121-2/+2
| |_|_|_|/ |/| | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-1198-292/+379
| |/ / / |/| | |
* | | | Merge pull request #6270 from owncloud/sharing-mixeduppermissionsfixVincent Petry2013-12-112-1/+124
|\ \ \ \ | |/ / / |/| | |
| * | | Added unit test for sharing permissionsVincent Petry2013-12-101-0/+110
| * | | Fixed sharing results to include the correct permissionsVincent Petry2013-12-091-1/+14
* | | | Merge pull request #6244 from owncloud/memcached-connectivity-testsThomas Müller2013-12-101-3/+9
|\ \ \ \
| * | | | Ensure memcached extension is there before attempting to create an instance.Andreas Fischer2013-12-091-4/+3
| * | | | Only run memcached tests if server is available.Andreas Fischer2013-12-091-0/+7
* | | | | Merge pull request #5968 from owncloud/legacy-popup-fixesVincent Petry2013-12-101-3/+11
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | fix shadow size and arrow positionJan-Christoph Borchardt2013-12-091-2/+2
| * | | | fix the legacy popup to make calendar settings look nicerJan-Christoph Borchardt2013-11-201-2/+10
* | | | | Merge pull request #6246 from owncloud/memcached-config-sampleAndreas Fischer2013-12-091-0/+3
|\ \ \ \ \
| * | | | | Document memcached settings in config.sample.phpAndreas Fischer2013-12-091-0/+3
| | |/ / / | |/| | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-0946-92/+3380
| |_|/ / |/| | |
* | | | Merge pull request #6231 from owncloud/fix-plural-l10nblizzz2013-12-095-5/+5
|\ \ \ \ | |/ / / |/| | |
| * | | fix wrong test data in l10nMorris Jobke2013-12-073-3/+3
| * | | fix plural translation - fixes #6226Morris Jobke2013-12-072-2/+2
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-07275-4625/+4977
* | | | Merge pull request #6202 from owncloud/fix_6032_altMorris Jobke2013-12-073-0/+34
|\ \ \ \ | |/ / / |/| | |
| * | | fix IE8 transparent backgroundMorris Jobke2013-12-071-0/+5
| * | | Remove reference to ownCloud.ringmaster2013-12-051-1/+1
| * | | Link to enable-javascript.comringmaster2013-12-052-1/+8
| * | | Make noscript message translatableringmaster2013-12-051-1/+1
| * | | Move message up 10%ringmaster2013-12-051-1/+1
| * | | Add overlay noscript message to fix #6032ringmaster2013-12-052-0/+22
* | | | Merge pull request #6150 from owncloud/backgroundjob-log-exceptionblizzz2013-12-068-47/+136
|\ \ \ \
| * | | | add test case for removing background jobs that are throwing exceptionsRobin Appelman2013-12-052-3/+59
| * | | | Dont use exceptions for the backgroundjob test casesRobin Appelman2013-12-042-35/+46
| * | | | remove background jobs if they are failingRobin Appelman2013-12-021-0/+1
| * | | | Catch exceptions from background jobs and log themRobin Appelman2013-12-024-9/+30
* | | | | Merge pull request #6201 from owncloud/backgroundscan-reuse-etagVincent Petry2013-12-064-25/+104
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into backgroundscan-reuse-etagRobin Appelman2013-12-06205-3639/+4894
| |\ \ \ \ \
| * | | | | | get rid of failing test that don't cause additional downloadsRobin Appelman2013-12-063-25/+25
| * | | | | | extend test case for etag preservationRobin Appelman2013-12-061-2/+2
| * | | | | | reuse etags when doing a background scanRobin Appelman2013-12-052-1/+80
* | | | | | | Merge pull request #6220 from owncloud/debug_oracle_errorsBjörn Schießle2013-12-063-18/+28
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | XSendfile and encryption don't work togetherBart Visscher2013-12-061-0/+3
| * | | | | | Don't try to encrypt a file when the temp file isn't createdBart Visscher2013-12-061-18/+21
| * | | | | | Users of getFolderContent are mostly interested in the unecrypted file sizeBart Visscher2013-12-061-0/+4
* | | | | | | Merge pull request #6218 from leo-b/fix_ldap_setOption_returncodeblizzz2013-12-061-1/+1
|\ \ \ \ \ \ \
| * | | | | | | correctly propagate the return value of ldap_set_optionroot2013-12-061-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #6222 from owncloud/enc_reset_enc_file_sizeBjörn Schießle2013-12-061-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | set unencrypted_size to 0 after decryption... so that the unencrypted_size ge...Bjoern Schiessle2013-12-061-1/+1
|/ / / / / /