Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #6345 from owncloud/mysql-set-names-utf8-tests | Thomas Müller | 2013-12-17 | 1 | -0/+27 |
|\ | | | | | DB tests: Test whether we can insert and read UTF8 data. | ||||
| * | add missing quotes + field declarations | Thomas Müller | 2013-12-17 | 1 | -1/+16 |
| | | |||||
| * | Use old school query style that actually works. | Andreas Fischer | 2013-12-12 | 1 | -9/+8 |
| | | |||||
| * | DB tests: Test whether we can insert and read UTF8 data. | Andreas Fischer | 2013-12-12 | 1 | -0/+13 |
| | | |||||
* | | Merge pull request #6438 from owncloud/core-logexceptionfix | Thomas Müller | 2013-12-17 | 2 | -4/+2 |
|\ \ | | | | | | | Do not use L10n when logging exceptions | ||||
| * | | Do not use L10n when logging exceptions | Vincent Petry | 2013-12-16 | 2 | -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 Karlitschek | 2013-12-17 | 3 | -15/+13 |
|\ \ \ | | | | | | | | | | | | | | | | | owncloud/trash_always_show_deleted_files_breadcrumb always show 'Deleted Files' breadcrumb | ||||
| * | | | always show home breadcrumb in files view | Bjoern Schiessle | 2013-12-16 | 2 | -11/+9 |
| | | | | |||||
| * | | | always show 'Deleted Files' breadcrumb | Bjoern Schiessle | 2013-12-13 | 1 | -4/+4 |
| | | | | |||||
* | | | | Merge pull request #6183 from owncloud/enc_tests | Björn Schießle | 2013-12-16 | 3 | -20/+92 |
|\ \ \ \ | | | | | | | | | | | enable more encryption tests | ||||
| * | | | | update file cache for target file | Bjoern Schiessle | 2013-12-16 | 1 | -0/+9 |
| | | | | | |||||
| * | | | | only remove encryption keys if a real file gets deleted, skip this method if ↵ | Bjoern Schiessle | 2013-12-16 | 2 | -9/+67 |
| | | | | | | | | | | | | | | | | | | | | a file outside of /data/user/files was deleted | ||||
| * | | | | call set password hook because it doesn't get triggered during test ↵ | Bjoern Schiessle | 2013-12-16 | 1 | -3/+12 |
| | | | | | | | | | | | | | | | | | | | | execution and fix paths | ||||
| * | | | | enable more tests | Bjoern Schiessle | 2013-12-04 | 1 | -8/+4 |
| | | | | | |||||
* | | | | | Merge pull request #6448 from owncloud/silence_favourites | Thomas Tanghus | 2013-12-16 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Use DEBUG instead of ERROR when favourites not found. | ||||
| * | | | | | Use DEBUG instead of ERROR when favourites not found. Fix #6419 | Thomas Tanghus | 2013-12-16 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #6315 from owncloud/ingroup-cache | icewind1991 | 2013-12-16 | 1 | -7/+18 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | cache the result from inGroup | ||||
| * | | | | remove unneeded ; in comment | Robin Appelman | 2013-12-12 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | user Group->users as assosiative array | Robin Appelman | 2013-12-11 | 1 | -5/+3 |
| | | | | | |||||
| * | | | | cache the result from inGroup | Robin Appelman | 2013-12-11 | 1 | -7/+20 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-13 | 46 | -304/+384 |
| | | | | | |||||
* | | | | | Merge pull request #6321 from sevoku/master | Vincent Petry | 2013-12-13 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | fix smbclient directory listing parser | ||||
| * | | | | | fix smbclient directory listing parser | Vsevolod Kukol | 2013-12-11 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #6392 from owncloud/no-backgroundjobs-during-upgrade | Vincent Petry | 2013-12-13 | 2 | -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 yet | Robin Appelman | 2013-12-13 | 2 | -46/+51 |
|/ / / / / / | |||||
* | | | | | | adjust test | Arthur Schiwon | 2013-12-13 | 1 | -2/+13 |
| | | | | | | |||||
* | | | | | | coding style | Arthur Schiwon | 2013-12-13 | 1 | -0/+1 |
| | | | | | | |||||
* | | | | | | coding style | Arthur Schiwon | 2013-12-13 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | On webdav sesssions, loginname was compared to username which does not need ↵ | Arthur Schiwon | 2013-12-13 | 2 | -4/+37 |
| | | | | | | | | | | | | | | | | | | | | | | | | to match necessarily | ||||
* | | | | | | rely only on php DateTime to parse the db datetime string | Jörn Friedrich Dreyer | 2013-12-13 | 1 | -3/+2 |
| | | | | | | |||||
* | | | | | | LDAP: fix method behind save button on advancend and expert tabs, fixes at ↵ | Arthur Schiwon | 2013-12-13 | 1 | -5/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | least Home Folder setinng | ||||
* | | | | | | Merge pull request #6390 from owncloud/migration-fixwebroot | Vincent Petry | 2013-12-13 | 2 | -1/+9 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | Fix webroot for update page | ||||
| * | | | | | Fix webroot for update page | Vincent Petry | 2013-12-13 | 2 | -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-cache | Thomas Müller | 2013-12-13 | 2 | -67/+74 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | cache the home folder of a User | ||||
| * | | | | | | fix fallback overwriting result of getHome | Robin Appelman | 2013-12-12 | 1 | -1/+2 |
| | | | | | | | |||||
| * | | | | | | cache the home folder of a User | Robin Appelman | 2013-12-11 | 2 | -67/+73 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #6347 from owncloud/cache-test-utf8 | Thomas Müller | 2013-12-13 | 1 | -1/+31 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Add test for having utf8 filenames in the cache | ||||
| * | | | | | | remove unneeded ; in comment | Robin Appelman | 2013-12-12 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Add test for having utf8 filenames in the cache | Robin Appelman | 2013-12-12 | 1 | -1/+31 |
| |/ / / / / | |||||
* | | | | | | Update 3rdparty ref | Thomas Müller | 2013-12-13 | 1 | -0/+0 |
| | | | | | | |||||
* | | | | | | Merge pull request #6356 from owncloud/fix_6353 | Vincent Petry | 2013-12-12 | 1 | -0/+8 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | [trashbin] toggle select all checkbox | ||||
| * | | | | | | toggle select all checkbox | Bjoern Schiessle | 2013-12-12 | 1 | -0/+8 |
| | | | | | | | |||||
* | | | | | | | update 3rdparty | Jörn Friedrich Dreyer | 2013-12-12 | 1 | -0/+0 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #6302 from owncloud/mysql-set-names-utf8 | Owen Winkler | 2013-12-12 | 1 | -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.6 | Andreas Fischer | 2013-12-11 | 1 | -0/+3 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | LDAP: the browser shall not autofill userdn and password, usually login ↵ | Arthur Schiwon | 2013-12-12 | 1 | -2/+2 |
| |_|_|_|/ |/| | | | | | | | | | | | | | | credentials are inserted. fixes #6283 | ||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-11 | 98 | -292/+379 |
| |/ / / |/| | | | |||||
* | | | | Merge pull request #6270 from owncloud/sharing-mixeduppermissionsfix | Vincent Petry | 2013-12-11 | 2 | -1/+124 |
|\ \ \ \ | |/ / / |/| | | | Fixed sharing results to include the correct permissions | ||||
| * | | | Added unit test for sharing permissions | Vincent Petry | 2013-12-10 | 1 | -0/+110 |
| | | | | |||||
| * | | | Fixed sharing results to include the correct permissions | Vincent Petry | 2013-12-09 | 1 | -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 |