summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6345 from owncloud/mysql-set-names-utf8-testsThomas Müller2013-12-171-0/+27
|\ | | | | DB tests: Test whether we can insert and read UTF8 data.
| * add missing quotes + field declarationsThomas Müller2013-12-171-1/+16
| |
| * Use old school query style that actually works.Andreas Fischer2013-12-121-9/+8
| |
| * DB tests: Test whether we can insert and read UTF8 data.Andreas Fischer2013-12-121-0/+13
| |
* | Merge pull request #6438 from owncloud/core-logexceptionfixThomas Müller2013-12-172-4/+2
|\ \ | | | | | | Do not use L10n when logging exceptions
| * | Do not use L10n when logging exceptionsVincent Petry2013-12-162-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | In some specific situations, the L10N bundle isn't loadable yet (for example when there is an issue with the app_config table). In such case, we still want to be able to log the real exception. This fixes errors that say "OC_L10N_String::__toString must not throw exceptions"
* | | Merge pull request #6386 from ↵Frank Karlitschek2013-12-173-15/+13
|\ \ \ | | | | | | | | | | | | | | | | owncloud/trash_always_show_deleted_files_breadcrumb always show 'Deleted Files' breadcrumb
| * | | always show home breadcrumb in files viewBjoern Schiessle2013-12-162-11/+9
| | | |
| * | | always show 'Deleted Files' breadcrumbBjoern Schiessle2013-12-131-4/+4
| | | |
* | | | Merge pull request #6183 from owncloud/enc_testsBjörn Schießle2013-12-163-20/+92
|\ \ \ \ | | | | | | | | | | enable more encryption tests
| * | | | update file cache for target fileBjoern Schiessle2013-12-161-0/+9
| | | | |
| * | | | only remove encryption keys if a real file gets deleted, skip this method if ↵Bjoern Schiessle2013-12-162-9/+67
| | | | | | | | | | | | | | | | | | | | a file outside of /data/user/files was deleted
| * | | | call set password hook because it doesn't get triggered during test ↵Bjoern Schiessle2013-12-161-3/+12
| | | | | | | | | | | | | | | | | | | | execution and fix paths
| * | | | enable more testsBjoern Schiessle2013-12-041-8/+4
| | | | |
* | | | | Merge pull request #6448 from owncloud/silence_favouritesThomas Tanghus2013-12-161-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Use DEBUG instead of ERROR when favourites not found.
| * | | | | Use DEBUG instead of ERROR when favourites not found. Fix #6419Thomas Tanghus2013-12-161-1/+1
|/ / / / /
* | | | | Merge pull request #6315 from owncloud/ingroup-cacheicewind19912013-12-161-7/+18
|\ \ \ \ \ | |_|_|/ / |/| | | | cache the result from inGroup
| * | | | remove unneeded ; in commentRobin Appelman2013-12-121-1/+1
| | | | |
| * | | | user Group->users as assosiative arrayRobin Appelman2013-12-111-5/+3
| | | | |
| * | | | cache the result from inGroupRobin Appelman2013-12-111-7/+20
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-1346-304/+384
| | | | |
* | | | | 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