summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6321 from sevoku/masterVincent Petry2013-12-131-1/+1
|\ | | | | fix smbclient directory listing parser
| * fix smbclient directory listing parserVsevolod Kukol2013-12-111-1/+1
| |
* | Merge pull request #6392 from owncloud/no-backgroundjobs-during-upgradeVincent Petry2013-12-132-46/+51
|\ \ | | | | | | dont try to register background jobs if we haven't upgraded yet
| * | dont try to register background jobs if we haven't upgraded yetRobin Appelman2013-12-132-46/+51
|/ /
* | adjust testArthur Schiwon2013-12-131-2/+13
| |
* | coding styleArthur Schiwon2013-12-131-0/+1
| |
* | coding styleArthur Schiwon2013-12-131-1/+1
| |
* | On webdav sesssions, loginname was compared to username which does not need ↵Arthur Schiwon2013-12-132-4/+37
| | | | | | | | to match necessarily
* | rely only on php DateTime to parse the db datetime stringJörn Friedrich Dreyer2013-12-131-3/+2
| |
* | LDAP: fix method behind save button on advancend and expert tabs, fixes at ↵Arthur Schiwon2013-12-131-5/+6
| | | | | | | | least Home Folder setinng
* | Merge pull request #6390 from owncloud/migration-fixwebrootVincent Petry2013-12-132-1/+9
|\ \ | | | | | | Fix webroot for update page
| * | Fix webroot for update pageVincent Petry2013-12-132-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | On the update page, config.js was missing which caused oc_webroot to not be available. That would trigger the faulty oc_webroot fallback that didn't take URLs like "/owncloud/index.php/files/apps" into account. This fix adds config.js in the update page and also a fix for the oc_webroot fallback, in case it is used elsewhere.
* | | Merge pull request #6318 from owncloud/gethome-cacheThomas Müller2013-12-132-67/+74
|\ \ \ | | | | | | | | cache the home folder of a User
| * | | fix fallback overwriting result of getHomeRobin Appelman2013-12-121-1/+2
| | | |
| * | | cache the home folder of a UserRobin Appelman2013-12-112-67/+73
| | | |
* | | | Merge pull request #6347 from owncloud/cache-test-utf8Thomas Müller2013-12-131-1/+31
|\ \ \ \ | | | | | | | | | | Add test for having utf8 filenames in the cache
| * | | | remove unneeded ; in commentRobin Appelman2013-12-121-1/+1
| | | | |
| * | | | 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
|\ \ \ \ | | | | | | | | | | [trashbin] toggle select all checkbox
| * | | | 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.6
| * | | | 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 ↵Arthur Schiwon2013-12-121-2/+2
| | | | | | | | | | | | | | | | credentials are inserted. fixes #6283
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-1198-292/+379
| |/ / |/| |
* | | Merge pull request #6270 from owncloud/sharing-mixeduppermissionsfixVincent Petry2013-12-112-1/+124
|\ \ \ | |/ / |/| | Fixed sharing results to include the correct permissions
| * | Added unit test for sharing permissionsVincent Petry2013-12-101-0/+110
| | |
| * | Fixed sharing results to include the correct permissionsVincent Petry2013-12-091-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Passing $includeCollections would return more than one entry which gives mixed up file permissions. Added a method getFile() that doesn't set $includeCollections to make sure we only get one result which is the file itself. Fixes #6265
* | | Merge pull request #6244 from owncloud/memcached-connectivity-testsThomas Müller2013-12-101-3/+9
|\ \ \ | | | | | | | | Only run memcached tests if server is available.
| * | | 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 the legacy popup to make calendar settings look nicer
| * | | 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.php * owncloud/memcached-config-sample: Document memcached settings in config.sample.php
| * | | | 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 plural translation - fixes #6226
| * | 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
|\ \ \ | |/ / |/| | Add overlay noscript message to fix #6032
| * | 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
|\ \ \ | | | | | | | | Remove background jobs that are giving errors