Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #6476 from ogasser/dbal_precision_scale | Thomas Müller | 2013-12-18 | 6 | -3/+51 |
|\ | | | | | DB: Support DECIMAL(precision,scale) syntax in XML | ||||
| * | Add unit tests for decimal type usage | Oliver Gasser | 2013-12-18 | 3 | -2/+33 |
| | | |||||
| * | Increment number of columns by one | Oliver Gasser | 2013-12-18 | 1 | -1/+1 |
| | | |||||
| * | Typo fixed | Oliver Gasser | 2013-12-17 | 1 | -1/+1 |
| | | |||||
| * | Add decimal(precision,scale) column to unit tests | Oliver Gasser | 2013-12-17 | 2 | -0/+9 |
| | | |||||
| * | DB: Support DECIMAL(precision,scale) syntax in XML | Oliver Gasser | 2013-12-17 | 1 | -0/+8 |
| | | | | | | | | | | | | | | Add support for specifying the precision and scale of a decimal data type to the XML description language. See owncloud/core#6475 | ||||
* | | Merge pull request #6295 from owncloud/files-fromlinkerrormessagefixes | Thomas Müller | 2013-12-18 | 5 | -13/+45 |
|\ \ | | | | | | | Fixed download file from URL error messages | ||||
| * | | Fixed download file from URL error messages | Vincent Petry | 2013-12-12 | 5 | -13/+45 |
| | | | | | | | | | | | | | | | | | | | | | | | | - L10N now converted to string to make them work with json_encode - Added specific error message when server doesn't allow fopen on URLs - Fixed client side to correctly show error message in a notification - Added OCP\JSON::encode() method to encode JSON with support for the OC_L10N_String values | ||||
* | | | Merge pull request #6461 from owncloud/check-xcache-varsize | Thomas Müller | 2013-12-18 | 1 | -3/+7 |
|\ \ \ | | | | | | | | | Do not use xcache variable cache if cache size is 0. | ||||
| * | | | Do not use xcache variable cache if cache size is 0. | Andreas Fischer | 2013-12-17 | 1 | -3/+7 |
| | | | | | | | | | | | | | | | | | | | | This is possible because it is possible to only use xcache as an opcode cache but not a variable cache. | ||||
* | | | | Merge pull request #6469 from owncloud/enc_cleanup | Thomas Müller | 2013-12-18 | 2 | -47/+1 |
|\ \ \ \ | | | | | | | | | | | remove duplicated code | ||||
| * | | | | remove unused method tail() | Bjoern Schiessle | 2013-12-17 | 1 | -43/+0 |
| | | | | | |||||
| * | | | | remove duplicated code | Bjoern Schiessle | 2013-12-17 | 1 | -4/+1 |
| | | | | | |||||
* | | | | | Merge pull request #6256 from owncloud/session-preserver-thirdparty | Thomas Müller | 2013-12-18 | 2 | -2/+13 |
|\ \ \ \ \ | | | | | | | | | | | | | preserve 3rd party values in in the Session destructor | ||||
| * | | | | | check if a $_SESSION entry exists before we try to remove it | Robin Appelman | 2013-12-11 | 1 | -1/+3 |
| | | | | | | |||||
| * | | | | | preserve 3rd party values in in the Session destructor | Robin Appelman | 2013-12-09 | 2 | -2/+11 |
| | | | | | | |||||
* | | | | | | Merge pull request #6485 from owncloud/extstorage-issuetemplate | Frank Karlitschek | 2013-12-18 | 1 | -0/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Added entry with ext storage info | ||||
| * | | | | | | Added entry with ext storage info | Vincent Petry | 2013-12-18 | 1 | -0/+2 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #6431 from owncloud/core-pluraltranslationsfix | Thomas Müller | 2013-12-18 | 1 | -4/+8 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Added plural translation fallback | ||||
| * | | | | | | Fixed JS plural function to be per app | Vincent Petry | 2013-12-16 | 1 | -4/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some apps might not define the same "nplural" value. To avoid conflicts, the plural function is now generated per app. Fixes #6427 | ||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-18 | 12 | -12/+12 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #6366 from owncloud/fix-6335 | Jan-Christoph Borchardt | 2013-12-17 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Bump the footer down 20px to avoid overlap. | ||||
| * | | | | | | | Bump the footer down 20px to avoid overlap. | ringmaster | 2013-12-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #6335. | ||||
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-17 | 26 | -44/+66 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | Merge pull request #6474 from owncloud/enc_detect_encrypted_files | Björn Schießle | 2013-12-17 | 1 | -10/+12 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | reliable detect encrypted files | ||||
| * | | | | | | | reliable detect encrypted files | Bjoern Schiessle | 2013-12-17 | 1 | -10/+12 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | clarifying license | Frank Karlitschek | 2013-12-17 | 1 | -0/+4 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #6436 from owncloud/allconfig-defaults | Frank Karlitschek | 2013-12-17 | 2 | -10/+29 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add default parameter to OC\AllConfig/OCP\IConfig's getValue's | ||||
| * | | | | | | | Also add default to the \OCP\IConfig interface | Robin Appelman | 2013-12-16 | 2 | -5/+18 |
| | | | | | | | | |||||
| * | | | | | | | add default parameter for AllConfig->get*Value() | Robin Appelman | 2013-12-16 | 1 | -6/+12 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-17 | 165 | -2500/+5386 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | 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 |
| | | | | | | | |