summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6476 from ogasser/dbal_precision_scaleThomas Müller2013-12-186-3/+51
|\ | | | | DB: Support DECIMAL(precision,scale) syntax in XML
| * Add unit tests for decimal type usageOliver Gasser2013-12-183-2/+33
| |
| * Increment number of columns by oneOliver Gasser2013-12-181-1/+1
| |
| * Typo fixedOliver Gasser2013-12-171-1/+1
| |
| * Add decimal(precision,scale) column to unit testsOliver Gasser2013-12-172-0/+9
| |
| * DB: Support DECIMAL(precision,scale) syntax in XMLOliver Gasser2013-12-171-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-fromlinkerrormessagefixesThomas Müller2013-12-185-13/+45
|\ \ | | | | | | Fixed download file from URL error messages
| * | Fixed download file from URL error messagesVincent Petry2013-12-125-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-varsizeThomas Müller2013-12-181-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 Fischer2013-12-171-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_cleanupThomas Müller2013-12-182-47/+1
|\ \ \ \ | | | | | | | | | | remove duplicated code
| * | | | remove unused method tail()Bjoern Schiessle2013-12-171-43/+0
| | | | |
| * | | | remove duplicated codeBjoern Schiessle2013-12-171-4/+1
| | | | |
* | | | | Merge pull request #6256 from owncloud/session-preserver-thirdpartyThomas Müller2013-12-182-2/+13
|\ \ \ \ \ | | | | | | | | | | | | preserve 3rd party values in in the Session destructor
| * | | | | check if a $_SESSION entry exists before we try to remove itRobin Appelman2013-12-111-1/+3
| | | | | |
| * | | | | preserve 3rd party values in in the Session destructorRobin Appelman2013-12-092-2/+11
| | | | | |
* | | | | | Merge pull request #6485 from owncloud/extstorage-issuetemplateFrank Karlitschek2013-12-181-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Added entry with ext storage info
| * | | | | | Added entry with ext storage infoVincent Petry2013-12-181-0/+2
| | | | | | |
* | | | | | | Merge pull request #6431 from owncloud/core-pluraltranslationsfixThomas Müller2013-12-181-4/+8
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Added plural translation fallback
| * | | | | | Fixed JS plural function to be per appVincent Petry2013-12-161-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 transifexJenkins for ownCloud2013-12-1812-12/+12
| | | | | | |
* | | | | | | Merge pull request #6366 from owncloud/fix-6335Jan-Christoph Borchardt2013-12-171-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Bump the footer down 20px to avoid overlap.
| * | | | | | | Bump the footer down 20px to avoid overlap.ringmaster2013-12-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #6335.
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-1726-44/+66
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge pull request #6474 from owncloud/enc_detect_encrypted_filesBjörn Schießle2013-12-171-10/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | reliable detect encrypted files
| * | | | | | | reliable detect encrypted filesBjoern Schiessle2013-12-171-10/+12
| | |_|_|/ / / | |/| | | | |
* | | | | | | clarifying licenseFrank Karlitschek2013-12-171-0/+4
| | | | | | |
* | | | | | | Merge pull request #6436 from owncloud/allconfig-defaultsFrank Karlitschek2013-12-172-10/+29
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add default parameter to OC\AllConfig/OCP\IConfig's getValue's
| * | | | | | | Also add default to the \OCP\IConfig interfaceRobin Appelman2013-12-162-5/+18
| | | | | | | |
| * | | | | | | add default parameter for AllConfig->get*Value()Robin Appelman2013-12-161-6/+12
| | |_|/ / / / | |/| | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-17165-2500/+5386
| |/ / / / / |/| | | | |
* | | | | | 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
| | | | | | | |