Commit Graph

5566 Commits

Author SHA1 Message Date
Tom Needham 84607db284 Merge pull request #6988 from owncloud/oc_api_fix_warinigs
[ocs API] getData() always needs to return an array
2014-02-10 13:43:16 +00:00
Thomas Müller 45d07906b8 Merge pull request #7131 from owncloud/issue/6269
Change MySQL to MariaDB/MySQL in the frontend
2014-02-10 11:09:03 +01:00
Thomas Müller 8c7fb64b8b Merge pull request #7066 from owncloud/check_svg_installed
properly check if pdf and svg modules are installed
2014-02-10 10:28:32 +01:00
Thomas Müller 8de9758fee Merge pull request #7071 from jcfischer/master
close statement in MimeType detection is executed [#7069]
2014-02-10 10:27:21 +01:00
Andreas Fischer bbfd97ce03 Merge pull request #6247 from owncloud/memcached-multiple-servers
Add support for multiple memcached servers.

* owncloud/memcached-multiple-servers:
  Readd support for memcached_server config variable.
  Add support for multiple memcached servers.
2014-02-08 14:21:19 +01:00
Joas Schilling dbec143f09 Change MySQL to MySQL/MariaDB in the frontend
Fix issue #6269
2014-02-07 17:03:43 +01:00
Bjoern Schiessle dc53c83e7b getData() always needs to return an array 2014-02-07 16:38:15 +01:00
Vincent Petry 60cba9962d Merge pull request #7112 from owncloud/enc_fix_size_for_shared_files
replace 'size' with 'unencrypted_size' if encryption is enabled
2014-02-07 14:49:22 +01:00
Thomas Müller f0afbffaef Merge pull request #6997 from owncloud/fix_l10n_warnings
change order of issubdirectory() calls to avoid error messages for non-apps
2014-02-07 13:47:33 +01:00
Bjoern Schiessle a8943ad022 replace 'size' with 'unencrypted_size' if encryption is enabled 2014-02-07 12:53:13 +01:00
Vincent Petry be47e156a5 Merge pull request #6952 from MartialGeek/add_freebox_support
New user agent added for the Freebox.
2014-02-06 18:12:32 +01:00
Vincent Petry 5ab12a8b85 Merge pull request #6445 from owncloud/fix_5956
fix issue with logging non utf8 chars
2014-02-06 17:47:13 +01:00
Jan-Christoph Borchardt 0609f30d1c Merge pull request #6235 from NCTU-NBA/pr-exceed_upload_limit_msg
Change misleading message when file size exceeds upload limit
2014-02-04 08:04:19 -08:00
Jens-Christian Fischer 11f46e121c close statement in MimeType detection is executed [#7069]
close statement was never executed due to it being after a return
statement.
2014-02-04 17:03:52 +01:00
Vincent Petry bd6734291c Merge pull request #6081 from owncloud/partfilewebdavfix
Allow getting info or renaming part files through WebDAV
2014-02-04 07:48:37 -08:00
Morris Jobke 3c80071807 Merge pull request #4795 from owncloud/setup
Move core setup code to controller class
2014-02-04 06:04:21 -08:00
icewind1991 a27529709b Merge pull request #6647 from owncloud/memcache-public
Add Memcache to the public api
2014-02-04 05:38:53 -08:00
Georg Ehrke d55ef442cd properly check if pdf and svg modules are installed 2014-02-04 12:59:14 +01:00
Bjoern Schiessle 36838b2837 add test for password remove method 2014-02-04 11:18:04 +01:00
Björn Schießle c0aeaf9ec0 Merge pull request #7013 from owncloud/dont_write_passwords_to_log
wrap stat() call in a try/catch block
2014-02-03 07:58:44 -08:00
Bjoern Schiessle cf5277b558 also load error handler if debugging is enabled 2014-02-03 12:08:28 +01:00
Bjoern Schiessle 44b637470c remove passwords in URLs from all log messages 2014-02-03 12:07:56 +01:00
Bart Visscher f1c60c7f8b Remove unused functions from OC_Helper
init_var and init_radio  where only used in the installation template
2014-01-31 17:33:15 +01:00
Bart Visscher bca725dc32 Merge branch 'master' into setup
Conflicts:
	core/setup.php
2014-01-31 16:43:12 +01:00
Robin Appelman 0d9fe770f3 Mark an app as loaded before we start loading it 2014-01-31 15:12:21 +01:00
Pellaeon Lin 099b71c712 Merge branch 'master' into pr-exceed_upload_limit_msg
Conflicts:
	apps/files/templates/index.php
	apps/files_sharing/templates/public.php
2014-01-30 22:50:20 +08:00
Jan-Christoph Borchardt f5f918b8bf Merge pull request #6903 from owncloud/fix-ms-office-icons
Add/fix Microsoft Office file icons.
2014-01-29 07:31:25 -08:00
Bjoern Schiessle 229f13adc0 change order of issubdirectory() calls to avoid error messages for non-apps 2014-01-29 14:40:59 +01:00
Martial Saunois 0f1c587e6b The regexp of the Freebox user agent is now more strict.
A new unit test has been added in consequence.
2014-01-29 10:58:34 +01:00
Thomas Müller ab9ddda8f2 Merge pull request #6907 from owncloud/webdav-logexceptions
Added exception logger plugin for sabre connector
2014-01-27 07:48:40 -08:00
Morris Jobke b4d11df843 Merge pull request #6930 from jcfischer/master
Add 'mail_from_address' configuration
2014-01-27 04:27:35 -08:00
Morris Jobke 6ee1250d27 Merge pull request #6933 from seberm/master
Add check for apc.enabled option
2014-01-27 04:25:31 -08:00
Morris Jobke 0a1708ba11 Merge pull request #6912 from owncloud/replace-webroot-in-css
Remove %webroot% from CSS
2014-01-27 04:11:15 -08:00
Vincent Petry 11ef12a106 Added exception logger plugin for sabre connector
Whenever an exception occurs in the sabre connector code or code called
by it, it will be logged.

This plugin approach is needed because Sabre already catches exceptions
to return them to the client in the XML response, so they don't appear
logged in the web server log.

This will make it much easier to debug syncing issues.
2014-01-27 11:40:17 +01:00
Martial Saunois c2ed8d5aa1 New user agent added for the Freebox.
The Freebox is the multimedia device of a french Internet provider: Free. This device provides a seedbox which uses the user agent "Mozilla/5.0". In the "Content-Disposition" header, if the "filename" key is used with the "filename*=UTF-8''" value, the seedbox does not take care about the header and saves the file name with the origin URL. This patch brings the support for the Freebox users.
2014-01-26 18:46:09 +01:00
Robin Appelman 1ab7ca0a19 Fix some phpdoc errors and rename interface 2014-01-24 16:01:19 +01:00
Otto Sabart 2f8ebd03b0 Add check for apc.enabled option
Sometimes it's not possible to disable APC entirely and some of
apc_functions are disabled. Only thing which is possible is
to disable apc.enable option.
2014-01-24 15:52:28 +01:00
Jens-Christian Fischer 0f6c607171 added function documentation 2014-01-24 14:22:42 +01:00
Jens-Christian Fischer 506393090b Add 'mail_from_address' configuration
In environments where there are rules for the email addresses, the "from
address" that owncloud uses has to be configurable.

This patch adds a new configuration variable 'mail_from_address'.
If it is configured, owncloud will use this as the sender of *all*
emails. (OwnCloud uses 'sharing-noreply' and 'password-noreply' by
default). By using the 'mail_from_address' configuration, only this
email address will be used.
2014-01-24 14:04:37 +01:00
Thomas Müller 9fa788c452 Merge pull request #6736 from owncloud/tests-jsunittests
Added Javascript unit tests
2014-01-23 12:43:05 -08:00
Vincent Petry 5ad28f4d1f Allow getting info or renaming part files through WebDAV
When mounting an ownCloud (backend OC) inside another ownCloud (frontend
OC), the frontend OC will use WebDAV to upload file, which will create
part files. These part files need to be accessible for the frontend OC
to rename them to the actual file name.

This fix leaves the file cache untouched but gives direct access to part
file info when requested.

This means that part file can be accessed only when their path and name
are known. These won't appear in file listtings.

Fixes #6068
2014-01-23 18:42:56 +01:00
Jan-Christoph Borchardt 25e9b7a742 add icons.css file, first step to get rid of %webroot% 2014-01-23 12:55:39 +01:00
Andreas Fischer 96f194c0f6 Add icons for mdb and accdb files. 2014-01-23 03:06:14 +01:00
Andreas Fischer 47ea7704ca Fix icons for xml,ppt,dot,dotx files. 2014-01-23 02:46:05 +01:00
Andreas Fischer 689516ebd7 Remove duplicate mimetypes while keeping previous behaviour. 2014-01-23 02:23:20 +01:00
Andreas Fischer 6241655df4 Bring mimetype list into alphabetical order. 2014-01-23 02:15:42 +01:00
Robin Appelman 02aa44d055 Merge branch 'master' into memcache-public 2014-01-22 13:19:49 +01:00
Thomas Müller 9bab05fd45 Merge branch 'master' into fixing-gallery-password-protected-access-master 2014-01-21 19:36:20 +01:00
Jörn Friedrich Dreyer 0dd54a1250 Merge pull request #6844 from owncloud/fix-css-loading-master
Revert "use getAppWebPath() in here as well"
2014-01-21 08:31:22 -08:00
Thomas Müller c57c9eae76 Merge branch 'master' into fixing-gallery-password-protected-access-master 2014-01-21 16:01:24 +01:00