9111af0478
Merge pull request #7531 from owncloud/dont_create_shared_folder
...
don't allow to create a file or folder named 'Shared' in the root folder
2014-03-05 18:13:31 +01:00
dbf83aada2
fix issue with Non-static method Imagick ../..; @ doesn't seem to work in this case
2014-03-05 15:57:45 +01:00
32a5d51fa6
add fclose, fixes issue from bdb96b9af8
2014-03-05 15:37:26 +01:00
bdb96b9af8
fix issue with spamming logging files when loading cached thumbnail
2014-03-05 13:20:50 +01:00
2e73c957e5
don't allow to create a file or folder named 'Shared' in the root folder, also exclude all combinations of lower and upper case letters
2014-03-05 13:16:25 +01:00
7edd8df07f
Merge pull request #7521 from owncloud/docstrings_2_kondou
...
Fix some more docstrings
2014-03-05 00:40:49 +01:00
9986b470ee
Merge pull request #7251 from owncloud/fix-ocsapi-getuser
...
Add displayname for admins on external api
2014-03-04 15:37:45 +00:00
620dd4afbd
Merge pull request #7481 from tripflex/fix_downloadlink_spaces
...
replace spaces in download link without encoding entire URL
2014-03-04 16:33:41 +01:00
a8c67dc675
Add caching for getLocalFile on remote storages
2014-03-04 15:44:58 +01:00
5ef37c28d1
Remove the need for a custom SabreDav server constructor
2014-03-04 13:28:48 +01:00
ad195a881e
Merge pull request #7453 from owncloud/preview-fileinfo
...
Cache the fileinfo in OC\Preview
2014-03-03 18:52:25 +01:00
5e3b6f1fd9
Fix some more docstrings
2014-03-03 17:32:29 +01:00
7983c90fdc
Merge pull request #7500 from owncloud/theme-mailtemplate
...
Enable theming of the mail template header
2014-03-03 17:22:33 +01:00
06c6163265
Check if fields we need are actually set to prevent errors
2014-03-03 16:48:28 +01:00
79ae3c4527
Allow XML entity loader for MDB2 schema loader
...
Forward port of 762b0d9
2014-03-03 14:17:51 +01:00
fe994669cd
Make path for dummy fileinfo absolute
2014-03-03 13:57:08 +01:00
9231195c98
Fix FileInfo->getType
2014-03-03 13:51:49 +01:00
c87658feda
Fix updater when getFileInfo fails
2014-03-03 12:56:08 +01:00
b8d0fc9494
make mail notification header color themable
2014-03-03 12:43:22 +01:00
1291303c5a
Replace OC.Router.generate() with OC.generateUrl()
2014-03-02 22:30:24 +01:00
5d5306175f
Fix some docstrings in l10n.php
2014-03-01 03:38:35 +01:00
8951328a87
More PHPDoc updates
2014-02-28 21:03:43 +01:00
195bdff91f
move replace to inside isset
2014-02-28 11:19:19 -05:00
4ab7f58745
replace spaces in download link without encoding entire URL
2014-02-28 11:15:49 -05:00
dd32091016
Merge pull request #7444 from owncloud/fix/7443
...
remove unused code and fix wrong variable names - some PHPDoc updated
2014-02-28 14:48:21 +01:00
da386aad59
Allow re-using already known fileinfo when calculating folder sizes
2014-02-28 14:23:07 +01:00
3ff12ef4ec
Also send explicit cache hooks when calling file_put_contents with a resource
2014-02-28 14:21:33 +01:00
d3866754a4
Merge pull request #7471 from owncloud/fix-css-loading
...
CSS is now loaded directly instead via PHP
2014-02-28 14:19:36 +01:00
35a8dfb2fa
More PHPDoc fixes, using scrutinizer patches as hints
2014-02-28 13:53:41 +01:00
89e0763d3d
Update PHPDoc for I10N, OC_Config, OC\Template\Base and OCP\IL10N
2014-02-28 13:37:41 +01:00
8a93a2e7d5
Merge pull request #7455 from owncloud/rawlist-fileinfo
...
Update rawlist to work with new fileinfo object
2014-02-28 12:36:56 +01:00
4c4bb70cb6
CSS is now loaded directly instead via PHP
...
269f24cf96
2014-02-28 11:14:18 +01:00
49b331be39
add BMP mimetype for BMP previews
2014-02-27 14:39:16 +01:00
7c92e2e3ad
Update rawlist to work with new fileinfo object
2014-02-27 14:04:19 +01:00
8282cfff04
Cache the fileinfo in OC\Preview
2014-02-27 13:15:18 +01:00
22adc397de
Also quote old column name during DB migration
...
This fixes alter table commands that didn't quote the old column name
2014-02-27 09:09:16 +01:00
ab850b961d
remove unused code and fix wrong variable names - some PHPDoc updated
2014-02-26 23:56:46 +01:00
bc49c6be04
Manually triger the filecache update hooks before any other hook
2014-02-26 14:29:13 +01:00
59df3ffdf4
Merge pull request #7279 from owncloud/folderid-reuse
...
Reuse the folder id in View->getFolderContents
2014-02-26 12:18:34 +01:00
8759c35e74
Merge pull request #7399 from owncloud/themable-doc-links
...
introduce new theme function to allow full creation of documentation lin...
2014-02-26 12:04:52 +01:00
5c98e0c7c7
Merge pull request #7328 from owncloud/McNetic-zipstreamer
...
McNetic zipstreamer
2014-02-26 10:19:12 +01:00
574883c47a
introduce new theme function to allow full creation of documentation links: buildDocLinkToKey()
2014-02-25 23:06:23 +01:00
3a21755963
Pass the filesystem view as argument in the sabredav connectors and use the fileinfo object
2014-02-25 16:23:09 +01:00
7f7d674c2a
Merge pull request #7335 from owncloud/fix-7333
...
Fix code to search for mount.json in custom data folders
2014-02-25 15:27:47 +01:00
9b4af31bac
Merge pull request #7371 from owncloud/core-storagemovedeleteall
...
Replace deleteAll call with unlink call on rename
2014-02-25 14:52:21 +01:00
e10ca7c2e9
Merge pull request #7374 from owncloud/enc_dont_overwrite_keys
...
[encryption] don't overwrite keys if rename was done by a stream copy
2014-02-25 12:34:49 +01:00
432a42d846
Fix case where port is missing
...
Forward port of 6d3b5b24fd
2014-02-25 11:40:05 +01:00
ebd73aee8f
don't overwrite keys if rename was done by a stream copy
2014-02-24 17:24:43 +01:00
0d78d9c180
Merge branch 'master' into McNetic-zipstreamer
...
Conflicts:
3rdparty
2014-02-24 12:53:55 +01:00
a23ef25010
Removed unused deleteAll method on Common storage class
...
The "deleteAll" method on the Common storage class isn't used anywhere.
Also, it isn't defined on the Storage interface so this fix removes it
completely.
2014-02-24 12:21:48 +01:00
c465835e85
Replace deleteAll call with unlink call
...
The method deleteAll() doesn't officially exist on the Storage class as
it's not defined on the interface, which means it fails on the Quota
storage wrapper and might fail on some external storage classes.
Also, this here is the only use case for that one method.
2014-02-24 12:20:11 +01:00
c9ab11a9bd
Merge pull request #7259 from owncloud/overwritehost-always
...
Add overwritehost config on setup and upgrade
2014-02-22 07:35:56 +01:00
f86dffd56c
Merge branch 'master' into recursive-mkdir-local
2014-02-21 15:43:54 +01:00
3487a95eab
Remove fileid parameter for getFolderContent
2014-02-21 15:36:24 +01:00
dd98e6333f
Split getFolderContentById
2014-02-21 15:35:12 +01:00
3980a7d9c6
Merge branch 'master' into folderid-reuse
2014-02-21 15:33:12 +01:00
fe44ac264b
Add overwritehost config on setup and upgrade
2014-02-21 15:19:01 +01:00
27ad69eea5
Merge branch 'master' into no-css-js-delivery-via-php
2014-02-21 14:01:24 +01:00
a40cedf507
Merge branch 'master' into McNetic-zipstreamer
2014-02-21 13:57:18 +01:00
43b1d81f77
Use 'command -v' to detect whether and where software is installed (instead of 'which')
2014-02-21 13:45:57 +01:00
f19276f7bc
Merge branch 'master' into no-css-js-delivery-via-php
...
Conflicts:
config/config.sample.php
2014-02-21 09:51:51 +01:00
f7fa8662e2
Remove `session_id_regenerate` from here
...
Jenkins somewhat complains that there are already sent headers.
2014-02-21 08:12:45 +01:00
69325c5eeb
Move session_regenerate_id to `login()`
2014-02-21 08:11:07 +01:00
f11658698d
Fix path to the mount file
2014-02-20 18:53:37 +01:00
ec45a3c0e2
Merge pull request #6962 from owncloud/quota-space-root
...
Allow passing a root folder to get the used space from in the quota wrapper
2014-02-20 16:47:59 +01:00
b35cd54e87
Merge branch 'zipstreamer' of https://github.com/McNetic/owncloud_core into McNetic-zipstreamer
...
Conflicts:
lib/private/files.php
2014-02-20 16:36:37 +01:00
d1c392d9ad
Also make "regular" local storage's mkdir recursive
2014-02-20 15:36:30 +01:00
76aa4714cf
Recursive mkdir fixes #7047
2014-02-20 15:35:00 +01:00
c869e0116b
Merge pull request #6999 from kofemann/mount-config
...
mount: make location of mount.json configurable
2014-02-20 15:15:00 +01:00
4eadc36094
Merge pull request #6935 from owncloud/fix_urlGenerator
...
Add missing slash in URLGenerator::getAbsoluteURL().
2014-02-20 14:57:03 +01:00
e4c3ef2ca6
Merge pull request #7289 from owncloud/fix-filetype-icons
...
Fix filetype icons
2014-02-20 14:53:41 +01:00
0241ddc759
Merge pull request #6519 from nhirokinet/master
...
Security Update: session fixation
2014-02-20 14:28:26 +01:00
fbea02bebb
kill $coreStyles and $coreScripts
2014-02-20 14:18:01 +01:00
a0e790227e
remove unused functions - have been introduced with the old minimizer approach
2014-02-20 14:11:31 +01:00
31bab55847
Merge branch 'master' into no-css-js-delivery-via-php
2014-02-20 13:52:53 +01:00
742f54b6d5
Merge pull request #7301 from owncloud/fix-fuckup
...
fix master - #7274 brokes it
2014-02-20 13:40:12 +01:00
8cf73ca42f
integrate assetic for asset pipeline-ing
2014-02-20 13:28:27 +01:00
7242d00aa6
enable static delivery of css files
2014-02-20 13:27:46 +01:00
ac8e6b15b6
kill references to core.js and core.css
2014-02-20 13:23:24 +01:00
bf22ed7bdb
kill old minimizer code
2014-02-20 13:10:56 +01:00
16eb43c033
Merge pull request #7247 from owncloud/sharing_cleanup_step1
...
clean up the sharing ajax calls, add mail notification class
2014-02-20 11:56:20 +01:00
719f1111b6
Merge pull request #6714 from owncloud/files-newfileinvalidcharsfix
...
Added extra checks for invalid file chars in newfile.php and newfolder.php
2014-02-20 11:53:58 +01:00
3e235b2699
merge master
2014-02-20 10:51:13 +01:00
a6fb6abbe0
fix filetype icons for gzip, tex, perl, csv, sh
2014-02-20 10:45:11 +01:00
b76a3993d4
fix master - #7274 brokes it
2014-02-20 09:47:59 +01:00
b01492fecd
Feature Added : Ability to drag and drop in Chrome
2014-02-19 21:28:32 +00:00
79a6d89bcc
Feature Added : Ability to drag and drop in Chrome
2014-02-19 21:23:39 +00:00
2fd75d8f1c
clean up the sharing ajax calls, add mail notification class
2014-02-19 19:33:00 +01:00
cac4652c10
coding style: spaces around =>
2014-02-19 16:28:29 +01:00
937a25593b
fix lots of file type icons for archives, js, flash, ics, fonts, code, ...
2014-02-19 16:27:38 +01:00
2d5b3899a6
Hardening: Remove dangerous characters + Subdirectory Check
...
If an user is able to create folders in /core/l10n/ he is able to execute arbitrary code. Therefore I've added an `issubdirectory` check and removed all potential dangerous characters from `$lang`.
2014-02-19 15:38:00 +01:00
952584e9c7
Merge pull request #7195 from owncloud/files-selectall
...
Do not send file list for select all on Download/delete
2014-02-19 14:33:24 +01:00
bcad6e641a
Merge pull request #7274 from owncloud/scrutinizer-patch-1
...
Scrutinizer Auto-Fixes
2014-02-19 11:51:04 +01:00
f944707a15
fix wrong removes
2014-02-19 11:50:17 +01:00
2d5ab1a5c4
Merge pull request #7260 from owncloud/watcher-policy
...
Allow setting the frequency of which the file watcher checks for updates
2014-02-19 11:17:27 +01:00
1331de554c
Reuse the folder id in View->getFolderContents
2014-02-19 10:46:02 +01:00
e517e642be
Merge pull request #7257 from owncloud/filelist-fileinfo
...
use a FileInfo object of the directory when generting the filelist
2014-02-19 09:40:11 +01:00
adaee6a5a1
Scrutinizer Auto-Fixes
...
This patch was automatically generated as part of the following inspection:
https://scrutinizer-ci.com/g/owncloud/core/inspections/cdfecc4e-a37e-4233-8025-f0d7252a8720
Enabled analysis tools:
- PHP Analyzer
- JSHint
- PHP Copy/Paste Detector
- PHP PDepend
2014-02-19 09:31:54 +01:00
1e321406ee
Merge pull request #7114 from owncloud/scrutinizer_documentation_patches
...
polish documentation based on scrutinizer patches
2014-02-19 07:04:37 +01:00
c6f4f85e27
Merge branch 'master' into scrutinizer_documentation_patches
...
Conflicts:
lib/private/migration/content.php
2014-02-18 18:31:33 +01:00
3cc7228c7c
Merge pull request #7253 from owncloud/preferences-caching
...
Add caching to OC\Preferences
2014-02-18 18:17:58 +01:00
8991e4505a
Merge pull request #6796 from owncloud/statementwrapper-bindparam
...
Add bindParam to the database statement wrapper
2014-02-18 18:13:57 +01:00
1e84d6b14b
Merge pull request #7190 from owncloud/appconfig-legacy-apps
...
Remove usage of legacy OC_Appconfig
2014-02-18 18:10:22 +01:00
bd71a1b7b6
Added file name check in webdav connector
...
- added file name check for the put, rename and setNames() methods which
throw a "Bad Request" whenever invalid characters are used
- replaced \OC\Filesystem usage with $this->getFS() to be able to write
unit tests
2014-02-18 17:54:32 +01:00
797e0a614c
Added extra checks for invalid file chars in newfile.php and newfolder.php
...
- added PHP utility function to check for file name validity
- fixes issue where a user can create a file called ".." from the files UI
- added extra checks to make sure newfile.php and newfolder.php also
check for invalid characters
2014-02-18 17:54:32 +01:00
a573fe7d76
Merge pull request #6650 from owncloud/migration_unit_tests
...
User migration fix, and basic unit test
2014-02-18 17:35:49 +01:00
3b1083f46e
Merge pull request #7176 from owncloud/style
...
Some style fixes
2014-02-18 17:30:26 +01:00
0beaeed713
Remove unused variables
2014-02-18 16:28:04 +00:00
2166683e3b
Allow setting the frequency of which the file watcher checks for updates
2014-02-18 16:34:25 +01:00
d18b9f6ea4
use a FileInfo object of the directory when generting the filelist
2014-02-18 15:39:35 +01:00
ac2e3ab373
remove some unneeded isset's
2014-02-18 14:27:55 +01:00
2e97a4cd32
Fix some phpdoc
2014-02-18 14:26:27 +01:00
df38d4ef1a
Return 101 if user doesnt exist
2014-02-18 10:36:18 +00:00
b6f44e9a1d
Add caching to OC\Preferences
2014-02-18 11:21:39 +01:00
2f1a24eee7
Add displayname for admins
2014-02-18 09:50:46 +00:00
5d3fc03750
Merge pull request #7239 from owncloud/cbr-filetype-icon
...
add cbr/cbz file type icon, fix #6953
2014-02-18 10:23:54 +01:00
c2adf033f2
use file icon as fallback instead of application icon, fix #7237
2014-02-17 20:58:33 +01:00
0f434038a7
add cbr/cbz file type icon, fix #6953
2014-02-17 20:48:32 +01:00
a4b6d66703
Merge branch 'master' into migration_unit_tests
2014-02-17 11:03:57 +00:00
750ffa8231
Merge pull request #7156 from owncloud/backgroundjob-public
...
Add the background job list to the public server container
2014-02-14 23:11:10 +01:00
9fac95c2ab
Merge branch 'master' into scrutinizer_documentation_patches
...
Conflicts:
lib/private/appconfig.php
2014-02-14 23:03:27 +01:00
df282d9ef8
Merge pull request #7207 from owncloud/fileinfo-serializable
...
Remove the JsonSerializable interface from \OC\Files\FileInfo
2014-02-14 22:11:54 +01:00
41f0ad2d13
Merge pull request #7204 from owncloud/groupexists-duplicate
...
Remove duplicate call to groupExists
2014-02-14 21:53:03 +01:00
09502fcb36
remove the JsonSerializable interface from \OC\Files\FileInfo
2014-02-14 19:26:06 +01:00
2a7509ee50
Merge pull request #6748 from owncloud/fileinfo
...
Add a FileInfo class which holds all info of a file ...
2014-02-14 15:16:39 +01:00
b35f679483
Fix test cases for group manager
2014-02-14 15:07:08 +01:00
0ba0596341
remove duplicate call to groupExists
2014-02-14 14:25:45 +01:00
f62f1658ce
suppress error msg caused by php bug
2014-02-14 11:23:39 +01:00
d5397d813c
Do not send file list for select all on Download/delete
...
- When all files are selected, do not send the whole file list
- Download will trigger download for the parent folder, also works
with root
- Delete will send "allfiles" to the server that will find the file
list or the passed directory by itself
2014-02-13 20:28:52 +01:00
181bbd4325
Remove usage of legacy OC_Appconfig
2014-02-13 16:28:49 +01:00
4b84e3a7e8
Merge pull request #4624 from owncloud/convert-oc_appconfig
...
Convert OC_Appconfig to object interface
2014-02-13 15:51:40 +01:00
fc01a13811
Fix imagerotate and move loadFromBase64() one up.
...
imagerotate() with third parameter being -1 does not seem to work in PHP 5.5
loadFromBase64() one up, so debug-logs aren't spammed (as much) with urlencoded
base64-data from loadFromFile() debug output.
2014-02-12 22:35:49 +01:00
2c6411b897
$default of OC_Config::[gs]etValue can have more then string as type
2014-02-12 17:38:32 +01:00
7af456730e
Merge pull request #6964 from owncloud/storagestatistics-reuse
...
Reuse the calculated free_space in buildFileStorageStatistics
2014-02-12 15:48:14 +01:00
d6576c640c
Add unit tests for JobList
2014-02-12 13:52:13 +01:00
62288971ca
Additional phpdoc
2014-02-12 13:32:16 +01:00
60bd9d512d
Merge branch 'master' into backgroundjob-public
2014-02-12 13:21:47 +01:00
1fb5f96c37
Style fixes
2014-02-12 09:09:51 +01:00
c442a03d3a
Merge pull request #7075 from owncloud/quota-storagexsendfile
...
Added isLocal() method to storage, used for xsendfile
2014-02-11 14:49:39 +01:00
50cc6a85e5
Add explicit sorting
2014-02-11 14:26:40 +01:00
a6399f9cef
Add the background job list to the public server container
2014-02-11 14:00:24 +01:00
a7c50514ac
Merge branch 'master' into convert-oc_appconfig
2014-02-11 13:26:54 +01:00
af781bdea7
fix DI
2014-02-11 10:50:03 +01:00
32afdcbefe
Inject logger
2014-02-11 10:49:59 +01:00
20bfbb0fd9
wrong tld
2014-02-11 10:49:54 +01:00
82716ced48
sort following entries in alphabetical order
2014-02-11 10:49:41 +01:00
41e8d44cf7
move sorter into a class
2014-02-11 10:49:34 +01:00
082abdc620
Merge branch 'master' into migration_unit_tests
2014-02-10 21:32:17 +01:00
bea80ffe20
Merge pull request #6881 from owncloud/remove-user-storage-entry
...
Also remove the user's home storage from the storage table when deleting a user
2014-02-10 15:04:05 +01:00
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
e6df86f4cb
Merge branch 'master' into quota-space-root
2014-02-10 14:03:06 +01:00
753af3a3ff
Merge branch 'master' into storagestatistics-reuse
2014-02-10 14:01:32 +01:00
5ffc43cba0
Merge branch 'master' into remove-user-storage-entry
2014-02-10 13:53:01 +01:00
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
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
8de9758fee
Merge pull request #7071 from jcfischer/master
...
close statement in MimeType detection is executed [#7069 ]
2014-02-10 10:27:21 +01:00
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
b330d07b51
Fix more documentation failes
...
Issue #7111
2014-02-08 11:47:55 +01:00
8ad3fc89be
Merge branch 'master' into quota-space-root
2014-02-07 23:29:26 +01:00
2ff0d3a255
Test if $url is already prefixed by '/'
2014-02-07 17:39:19 +01:00
dbec143f09
Change MySQL to MySQL/MariaDB in the frontend
...
Fix issue #6269
2014-02-07 17:03:43 +01:00
dc53c83e7b
getData() always needs to return an array
2014-02-07 16:38:15 +01:00
cd3ef0bb9d
Add caching to appconfig
2014-02-07 14:03:39 +01:00
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
b537d90e58
use the 'new' server container for appconfig
2014-02-07 13:45:59 +01:00
788c8540aa
Added isLocal() method to storage, used for xsendfile
...
Added isLocal() method to Storage to find out whether the storage is
local or not.
This method is used for the x-sendfile logic to find out whether to add
the headers.
2014-02-06 20:53:15 +01:00
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
5ab12a8b85
Merge pull request #6445 from owncloud/fix_5956
...
fix issue with logging non utf8 chars
2014-02-06 17:47:13 +01:00
2a6a9a8cef
polish documentation based on scrutinizer patches
2014-02-06 17:02:21 +01:00
79fc4f3126
Within OC:init() the minimum set of apps is loaded - which is filesystem, authentication and logging
2014-02-06 11:34:27 +01:00
0db5fead8e
remove some more global variable $RUNTIME_NOAPPS
2014-02-06 10:04:18 +01:00
1e79369338
merge master into storagestatistics-reuse
2014-02-05 13:36:55 +01:00
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
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
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
f830ad0e47
Don't create new thumbnails on the write hook
2014-02-04 16:28:41 +01:00
3c80071807
Merge pull request #4795 from owncloud/setup
...
Move core setup code to controller class
2014-02-04 06:04:21 -08:00
a27529709b
Merge pull request #6647 from owncloud/memcache-public
...
Add Memcache to the public api
2014-02-04 05:38:53 -08:00
d55ef442cd
properly check if pdf and svg modules are installed
2014-02-04 12:59:14 +01:00
36838b2837
add test for password remove method
2014-02-04 11:18:04 +01:00
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
0ae4022fb4
Also clean up the filecache table when deleting a storage entry
2014-02-03 16:36:21 +01:00
8d6a3a00b4
Revert "Use Cache->clear to cleanup the filecache for removed users"
...
This reverts commit 5a5b6f187e
2014-02-03 16:29:04 +01:00
cf5277b558
also load error handler if debugging is enabled
2014-02-03 12:08:28 +01:00
44b637470c
remove passwords in URLs from all log messages
2014-02-03 12:07:56 +01:00
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
bca725dc32
Merge branch 'master' into setup
...
Conflicts:
core/setup.php
2014-01-31 16:43:12 +01:00
0d9fe770f3
Mark an app as loaded before we start loading it
2014-01-31 15:12:21 +01:00
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
8cc9727520
mount: make location of mount.json configurable
...
do not share users data with config files
Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
2014-01-29 17:14:23 +01:00
4e2b52a376
merge master into fileinfo
2014-01-29 16:33:27 +01:00
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
229f13adc0
change order of issubdirectory() calls to avoid error messages for non-apps
2014-01-29 14:40:59 +01:00
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
ab9ddda8f2
Merge pull request #6907 from owncloud/webdav-logexceptions
...
Added exception logger plugin for sabre connector
2014-01-27 07:48:40 -08:00
20c2aaab00
Actually rename the variable
2014-01-27 16:26:54 +01:00
c8207312c7
Fix phpdoc
2014-01-27 16:00:10 +01:00
3c1ab66eda
Reuse the calculated free_space in buildFileStorageStatistics
2014-01-27 15:56:57 +01:00
a521949baf
Allow passing a root folder to get the used space from in the quota wrapper
2014-01-27 15:41:56 +01:00
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
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
5f610a1cbc
Add missing slash in URLGenerator::getAbsoluteURL(). Refs. #6840
2014-01-24 16:40:32 +01:00
1ab7ca0a19
Fix some phpdoc errors and rename interface
2014-01-24 16:01:19 +01:00
fc5f20112e
Add isReadable, isUpdateable, isDeletable, isShareable
2014-01-24 15:54:40 +01:00
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
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
96f194c0f6
Add icons for mdb and accdb files.
2014-01-23 03:06:14 +01:00
47ea7704ca
Fix icons for xml,ppt,dot,dotx files.
2014-01-23 02:46:05 +01:00
689516ebd7
Remove duplicate mimetypes while keeping previous behaviour.
2014-01-23 02:23:20 +01:00
6241655df4
Bring mimetype list into alphabetical order.
2014-01-23 02:15:42 +01:00
02aa44d055
Merge branch 'master' into memcache-public
2014-01-22 13:19:49 +01:00
5a5b6f187e
Use Cache->clear to cleanup the filecache for removed users
2014-01-22 13:00:45 +01:00
99ad4e8000
switched zip file creation to ZipStreamer to create zip files directly in memory
2014-01-22 12:49:52 +01:00
791772abea
refactored/cleaned up lib/files.php
...
cleaned up get() logic
fixed get() to only send headers if requested (xsendfile could get in the way)
do no longer readfile() when already using mod_xsendfile or similar
2014-01-22 11:53:03 +01:00
374e3475c9
Also remove the user's home storage from the storage table when deleting a user
2014-01-21 23:58:48 +01:00
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
262f221d11
Merge branch 'master' into fix-setupfs-only-for-existing-users-master
2014-01-21 15:35:32 +01:00
267e1f3c40
use 'download.zip' as default name for zip downloads instead of 'owncloud.zip'
2014-01-21 12:41:10 +01:00
23a4d0d44e
OC_Util::setupFS($user) will create a data dir for the given string - no matter if the user really exists - OCP\JSON::checkUserExists($owner); introduces a ready to use check which will bail out with an JSON error
2014-01-21 11:32:30 +01:00
0f794b6889
Merge pull request #6820 from owncloud/phpunit-test-config
...
Load a separate config (if present) when running unit tests
2014-01-20 12:14:09 -08:00
3d6d8d1bb6
Reuse the data retrieved from the cache in checkUpdate
2014-01-20 15:21:21 +01:00
62dd58aa19
Merge pull request #6838 from owncloud/core-quotawrapperfailedfopenfix
...
Fixed quota wrapper to not wrap failed fopen streams
2014-01-20 05:29:27 -08:00
221e656e91
Revert "use getAppWebPath() in here as well"
...
This reverts commit 6254f0a403
2014-01-20 10:10:34 +01:00
39be83ca8b
Merge pull request #6676 from aseques/check_internet_proxy
...
Fix internet detection to use OC_Util::getUrlContent
2014-01-19 12:08:55 -08:00
1af7dab535
Fixed quota wrapper to not wrap failed fopen streams
...
When calling fopen() on some storage types, these return false instead
of throwing an exception.
This fix makes sure that in case the stream wasn't opened (for example
when a file doesn't exist any more) the stream isn't wrapped.
Also added 'rb' as another case that doesn't need to be wrapped.
Fixes #6832
2014-01-19 18:51:36 +01:00
3a2e03a7f0
Merge pull request #6784 from owncloud/fix-activation-of-unknown-apps
...
Fix activation of unknown apps
2014-01-18 08:13:57 -08:00
66aa9b4e27
lib/files.php: make use of === instead of ==
2014-01-18 15:16:17 +01:00
bf0471a92e
show link to app documentation
2014-01-17 14:56:25 +01:00
5cb08bb9cb
Merge branch 'master' into fileinfo
...
Conflicts:
tests/lib/files/cache/cache.php
2014-01-17 14:47:29 +01:00
6b4c3df087
Load a separate config (if present) when running unit tests
2014-01-17 14:40:48 +01:00
504645cf00
Add bindParam to statement wrapper
2014-01-16 14:07:16 +01:00
7f68497b39
error handling in case a requested app doesn't exists
2014-01-15 17:11:29 +01:00
729210daa0
Merge branch 'master' into memcache-public
...
Conflicts:
apps/user_ldap/lib/connection.php
2014-01-15 13:02:15 +01:00
d4519125db
Merge pull request #6744 from owncloud/fix_ocs_response_messages
...
keep response message
2014-01-15 03:17:24 -08:00
34559ef114
Merge pull request #6768 from owncloud/scanner-use-storage-mtime
...
Use storage_mtime when determining if we can reuse cached data while scanning
2014-01-15 01:31:33 -08:00
c01949ec0e
Merge branch 'master' into fileinfo
2014-01-14 16:31:08 +01:00
c3a0b0d7f3
Merge pull request #6704 from owncloud/encryptedfoldersizecalc
...
Fix calculated folder size to use unencrypted size
2014-01-14 07:20:16 -08:00
203d5d01ca
Use storage_mtime when determining if we can reuse cached data while scanning
2014-01-14 13:54:07 +01:00
e706cf6c06
add Support for passing a FileInfo instance to View->putFileInfo
2014-01-13 15:57:49 +01:00
82762bb462
remove ArrayAccess, JsonSerializable from the public part of FileInfo
2014-01-13 15:13:45 +01:00
617acbd6f9
Add a FileInfo class which holds all info of a file and return that from getFileInfo, getDirectoryContent and search
2014-01-13 14:28:49 +01:00
6845860470
keep response message
2014-01-13 12:27:05 +01:00
a2cae551f3
fixing typo in redirection query string
2014-01-12 15:49:32 +01:00
6f21da12e8
encode imagePath and fix documentation of loadFromFile
2014-01-11 12:07:28 +01:00
2abea96462
Disabled internet checking as mentioned when in proxy mode
2014-01-10 09:33:35 +01:00
acd81f6c69
Readd support for memcached_server config variable.
2014-01-10 00:57:40 +01:00
320353c237
Add support for multiple memcached servers.
2014-01-10 00:57:34 +01:00
4faba49f0a
Fix calculated folder size to use unencrypted size
...
The encrypted size was used when calculating folder sizes.
This fix now also sums up the unencrypted size and shows that one when
available.
2014-01-09 17:47:50 +01:00
b24c21b00f
Merge pull request #6687 from owncloud/sharing-fixpartfilehandling
...
Removed special handling of part files in shared storage rename
2014-01-09 06:16:43 -08:00
5d456c7cc2
Merge branch 'master' into memcache-public
2014-01-09 13:54:58 +01:00
22bd69f75c
set login name within apache auth backend
2014-01-09 10:28:24 +01:00
9b7c3a5c66
fixing PHPDoc and use cameCase names
2014-01-09 10:27:47 +01:00
d8b8abb429
Merge pull request #6681 from owncloud/userreport
...
add command line option to get user number statistics
2014-01-08 10:41:39 -08:00
4585b4ea3f
Infowarning about 32bit
2014-01-08 19:41:10 +01:00
8eaa39f4e2
Removed special handling of part files in shared storage rename
...
This fixes the issue introduced by the transfer id which itself wasn't
taken into account by the shortcut code for part file in the shared
storage class.
2014-01-08 18:43:20 +01:00
e35bca1c26
Fix ownCloud for php5.3.x
2014-01-08 16:07:01 +01:00
5a2a0426a6
Also update the OCP\IServerContainer
2014-01-08 15:51:40 +01:00
be7837402d
get the memorycache factory from OCP\Server instead of a cache instance
...
this allows apps to specify a prefix to use
2014-01-08 15:18:12 +01:00
d7cb5ab080
add tests for user counting
2014-01-08 13:26:48 +01:00
cb6a3e2617
if backends have the same class name, sum their users up instead of overwriting
2014-01-08 13:24:28 +01:00
f642ad3961
Prevent deleting storage root
...
Storage mount points are not deletable, so make sure that the unlink
operation and its hooks aren't run in such cases.
Note that some storages might recursively delete their contents when
calling unlink on their root. This fix prevents that as well.
2014-01-08 13:17:36 +01:00
4c93b00990
Merge branch 'master' into disable-mod_pagespeed
2014-01-08 10:19:16 +01:00
1614ad42b3
Merge pull request #6673 from owncloud/master-quota-insufficientstorageforfilesfix
...
Now also preventing to override "files" dir size with -1
2014-01-08 00:55:11 -08:00
5eef107344
turn off mod_pagespeed
2014-01-08 07:56:08 +01:00
f356894aa3
Merge pull request #6594 from owncloud/kill-index.php-from-url
...
Kill index.php from url
2014-01-07 22:28:58 -08:00
428d2b6e0f
Remove unused spaces
2014-01-08 00:16:37 -02:00
938ece1a3f
Remove name from code
2014-01-08 00:15:08 -02:00
1e1ced7772
Introduce user count action to user management
2014-01-07 23:05:37 +01:00
5be4af9f51
Now also preventing to override "files" dir size with -1
...
Fixes #6526
2014-01-07 22:34:01 +01:00
b6474506eb
Merge pull request #6660 from owncloud/fixing-disabled-function-checks
...
Fixing disabled function checks
2014-01-07 11:10:45 -08:00
2d5427efa9
Merge pull request #6290 from owncloud/files-androidcontentdisposition
...
Files androidcontentdisposition
2014-01-07 11:06:20 -08:00
09d7882571
trimming all array elements
2014-01-07 19:47:01 +01:00
3abe4c3e88
Merge pull request #6663 from owncloud/fix_empty_mimetypes
...
remove duplicate exe mimetype, add correct msi mimetype
2014-01-07 07:31:12 -08:00
9404a8f40c
remove duplicate exe mimetype, add correct msi mimetype
2014-01-07 15:51:08 +01:00
9d869ab596
we shall explode on ',' only
2014-01-07 14:53:02 +01:00
07a84aa5eb
reuse existing helper function OC_Helper::is_function_enabled
2014-01-07 14:52:18 +01:00
970eed2867
Merge pull request #6530 from owncloud/prevent-corruption-on-parallel-upload-master
...
Adding a random postfix to the part file.
2014-01-07 03:25:26 -08:00
ed469a7d2c
in order to work properly with encryption ocTransferId is added to the file path - questionable usage of magic string
2014-01-07 11:53:33 +01:00
5c3c379f35
Merge branch 'fix-5388-master' into migration_unit_tests
2014-01-07 00:40:36 +00:00
4d65a80892
Remove the static dependency on OC_Util from Memcache
2014-01-06 13:11:38 +01:00
cd147bb37a
Use APCIterator for Memcache\APC::clear()
2014-01-06 12:58:43 +01:00
1df1b55b66
expose memory cache in public api
2014-01-06 12:55:56 +01:00
ce3df44699
Merge pull request #6031 from s0taka/master
...
No decimal points for Kilobyte and Byte #5371 .
2014-01-05 11:52:10 -08:00
569851fa0e
Add tabs to conformance with owncloud code standards
2014-01-05 12:38:54 -02:00
d258ade35e
Fix PostgreSQL port configuration on install
2014-01-04 19:23:25 -02:00
1824ae1222
Merge branch 'master' into fix-5388-master
2014-01-04 13:46:08 +00:00
f016a3ead3
Merge pull request #6610 from owncloud/apcu-clear
...
Fix APCIterator syntax in \OC\Memcache\APCu::clear
2014-01-03 05:30:49 -08:00
1ce45713bd
Merge pull request #6605 from owncloud/free_space_disabled
...
Return SPACE_UNKNOWN if disk_free_space is disabled
2014-01-02 08:19:52 -08:00
83f968ace2
Fix APCIterator syntax in \OC\Memcache\APCU::clear
...
see http://www.php.net/manual/en/apciterator.construct.php
2014-01-02 16:12:56 +01:00
14e0b1b6d1
Merge pull request #6513 from owncloud/user-no-change-displayname
...
Re-add the config options to remove the ability for users to change their displayname
2014-01-02 05:04:27 -08:00
25370fcb82
Return SPACE_UNKNOWN if disk_free_space is disabled when getting the free space on a local storage
2014-01-02 13:19:10 +01:00
25a9311e94
Merge pull request #6601 from AdamWill/pimple-include
...
don't specify path to 3rdparty directory when registering Pimple autoloader
2014-01-01 15:25:58 -08:00
9b4a827e0b
don't specify path to 3rdparty directory when registering Pimple autoloader
...
The core 3rdparty directory is in the include_path from lib/base.php anyway, so this is unnecessary, and causes problems for downstream distributors who unbundle Pimple.
2014-01-01 09:52:19 -08:00
d5382ac05d
Add support mimetype
...
Add support mimetype for extension .sh, .bash and .sh-lib
2014-01-01 14:09:02 +01:00
4c179850ab
Revert "Added support for extra backends (see pull request #5043 )"
...
This reverts commit 2d75914f2a760fa9ea30
2014-01-01 13:43:23 +01:00
2d75914f2a
Added support for extra backends (see pull request #5043 )
...
Somebody had forgotten "OC_User::setupBackends();"...
2014-01-01 11:53:27 +01:00
6254f0a403
use getAppWebPath() in here as well
2013-12-31 15:12:17 +01:00
ae5671d281
new config parameter 'front_controller_active' which will instruct the url generator to generate urls without index.php
2013-12-31 14:36:02 +01:00
97031ba45c
Merge pull request #6520 from owncloud/tests-testcleanuplistener
...
Added test cleanup listener to detect untidy tests
2013-12-24 14:27:39 -08:00
efdeba7416
Merge pull request #6449 from owncloud/core-appsorderfix
...
Fixed apps loading order
2013-12-24 14:26:11 -08:00
Björn Schießle
Georg Ehrke
Thomas Müller
Tom Needham
Vincent Petry
Robin Appelman
kondou
Frank Karlitschek
Jan-Christoph Borchardt
Bart Visscher
Myles McNamara
Morris Jobke
icewind1991
Lukas Reschke
Vincent Petry
Philipp Schmitt
Joshua Medeiros
Luke Policinski
Scrutinizer Auto-Fixer
tomneedham
Arthur Schiwon
Andreas Fischer
Joas Schilling
Thomas Tanghus
Jörn Friedrich Dreyer
Jens-Christian Fischer
Pellaeon Lin
Tigran Mkrtchyan
Martial Saunois
Otto Sabart
Nicolai Ehemann
st3so
Joan
eduardo
Adam Williamson
lolozere
Niklas Sombert