wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
17130 commits 157 branches 562 tags 714 MiB
Commit graph

943 commits

Author SHA1 Message Date
Thomas Müller
6bbbf8536f introduce reopen() method to be used for unit test execution only - right after a unit test has been executed the session will be reopened 2014-03-17 21:57:10 +01:00
Thomas Müller
756bbe8786 Merge pull request #7649 from owncloud/routing-public 
Move routing classes to an interface and expose it in the public api
 2014-03-17 21:07:05 +01:00
Vincent Petry
3cd09f2b09 Added PostgreSQL version warning on upgrade 2014-03-17 18:58:00 +01:00
icewind1991
6fbf3dd7c4 Merge pull request #7764 from owncloud/datadir-chmod 
use a non-recursive chmod on the datadir
 2014-03-17 15:52:44 +01:00
icewind1991
5c72b526a3 Merge pull request #7760 from owncloud/core-roundbytes 
Correctly round bytes when converted from human readable format
 2014-03-17 15:21:57 +01:00
Lukas Reschke
239069c838 Use $installedVersion instead of $currentVersion 2014-03-17 13:27:42 +01:00
icewind1991
4112d63a40 Merge pull request #7727 from owncloud/cli-trusteddomainupgradewarning 
Added warning for trusted_domains after CLI upgrade
 2014-03-17 13:21:54 +01:00
Vincent Petry
4033eba374 Fixed chunking and insufficient storage check 
- fixed free space detection based on the already uploaded chunks
- now deleting chunks as soon as it is read out before writing it into
  the part file, which reduces the space needed when assembling part
files
 2014-03-17 13:04:34 +01:00
Vincent Petry
bd98538a36 Merge pull request #7704 from owncloud/preview_use_pre_instead_of_post_delete_hook_2 
use preDelete instead of postDelete hook
 2014-03-17 12:59:35 +01:00
Robin Appelman
166dfbf58b use a non-recursive chmod on the datadir 2014-03-17 12:53:55 +01:00
Vincent Petry
145db370d1 Correctly round bytes when converted from human readable format 
Instead of leave two decimal places which is confusing, round the byte
values correctly to the closest byte.
 2014-03-17 12:15:12 +01:00
Thomas Müller
cd038604d3 unit tests for specific image type output added 2014-03-17 08:40:59 +01:00
Thomas Müller
79ba930ef9 fixing PHPDoc 2014-03-17 08:17:56 +01:00
Vincent Petry
b619ff6076 Return 503 when a config/data dir error exists 2014-03-14 21:05:15 +01:00
Georg Ehrke
3527adbbe1 OC_Image::_output() - throw exception instead of falling back to png 2014-03-14 18:19:16 +01:00
Georg Ehrke
9dee3772eb remove image/pjpeg from OC_Image::_output 2014-03-14 18:12:33 +01:00
Vincent Petry
3c46dcd7dd Added .ocdata file to check for data folder validity 
In environments where the data folder is mount from another partition,
it is important to check that the data folder we see is actually the
real one. If the mount failed for some reasons, this fix will make
ownCloud temporarily unavailable instead of causing unpredictable
behavior.
 2014-03-14 15:36:35 +01:00
Georg Ehrke
c140010e81 don't change mimetype of whole image object 2014-03-14 11:17:20 +01:00
Vincent Petry
1a116828cf Added warning for trusted_domains after CLI upgrade 
If trusted_domains is not set after a CLI upgrade, show a warning in the
output.
 2014-03-14 11:16:45 +01:00
Georg Ehrke
0c3c75efd5 always output a png 2014-03-14 11:14:09 +01:00
Georg Ehrke
6f96ab3e90 make it possible to influence output type of \OC_Image 2014-03-14 11:13:45 +01:00
Robin Appelman
eabeedb306 Merge branch 'master' into cachehooks-first 2014-03-13 15:22:00 +01:00
Georg Ehrke
f438337493 improve validation of getFileInfo in \OC\Preview 2014-03-13 12:32:13 +01:00
Georg Ehrke
8048868bd7 use preDelete instead of postDelete hook 2014-03-13 03:14:42 +01:00
Vincent Petry
b2ac8755ce Merge pull request #6632 from eduardosan/master 
Fix PostgreSQL port configuration on install
 2014-03-12 18:52:47 +01:00
Vincent Petry
ce790119ae Merge pull request #7683 from owncloud/proper-content-type-on-ocs-exceptions 
set content-type on ocs exceptions
 2014-03-12 10:19:40 +01:00
Thomas Müller
88f6dd7db1 fixing method names 2014-03-12 10:00:22 +01:00
Thomas Müller
743addd1e3 set content-type on ocs exceptions 2014-03-12 00:35:19 +01:00
Thomas Müller
7c78368e8b sanitize fallbackId 2014-03-12 00:18:51 +01:00
Robin Appelman
d55c7223a9 Merge branch 'master' into foldersize-reuse 
Conflicts:
lib/private/files/cache/homecache.php
 2014-03-11 13:04:20 +01:00
Vincent Petry
c1cb9ee9b0 Merge pull request #7650 from owncloud/quota-totalspace 
Fixed total space display when data size exceeds quota
 2014-03-11 12:40:59 +01:00
Thomas Müller
0de43f1fbe remove magic handling of recipient lists by exploding the string - this functionality is nowhere used this way and nowhere documented - and broken because only $toaddress will be exploded not $toname 2014-03-10 21:56:37 +01:00
Thomas Müller
f1ecc758f5 send an individual email to each recipient 2014-03-10 21:54:23 +01:00
Vincent Petry
1cde17d60b Merge pull request #7602 from owncloud/flush-updater-cache 
Reset time of last update feed polling after successful update
 2014-03-10 19:54:00 +01:00
Vincent Petry
010eef95c0 Fixed total space display when data size exceeds quota 
The total space display in the personal page now shows the quota value
instead of used space when used space exceeds the quota (soft quota).
 2014-03-10 17:59:14 +01:00
Vincent Petry
f4f61f03c9 Disable XML entities when parsing XML 2014-03-10 17:51:13 +01:00
Thomas Müller
9fe5033f1e PHPDoc updated 2014-03-10 17:15:19 +01:00
Thomas Müller
41f814515e Merge branch 'master' into close-session-faster-master 2014-03-10 17:00:09 +01:00
Vincent Petry
4fdf7682c9 Merge pull request #7398 from owncloud/trash_dont_rely_on_db 
[trash] fall back if file is not in db
 2014-03-10 16:04:47 +01:00
Thomas Müller
a074adb2af fix close() implementation in \OC\Session\Internal 2014-03-10 15:36:20 +01:00
Bjoern Schiessle
4562909a20 get trash size from file cache 2014-03-10 15:13:28 +01:00
Thomas Müller
3c5185edab Merge pull request #7632 from owncloud/fix-7582-master 
we first shall check if the current session is valid - otherwise the ses...
 2014-03-10 15:10:19 +01:00
Thomas Müller
f0603a971d close the session for all DAV calls right after authentication - no need to write to the session afterwards 2014-03-10 14:40:36 +01:00
Thomas Müller
73a1ece753 adding an explicit close method to class session - write operations (set and remove) being called after close() will throw an exception 2014-03-10 14:21:12 +01:00
Robin Appelman
26793e1f94 switch OC::getRouter usages to OC::$server->getRouter 2014-03-10 14:06:47 +01:00
Robin Appelman
8ab7d18a6a Move the router classes to a namespace and expose it with a public interface 2014-03-10 14:04:58 +01:00
Vincent Petry
26513bc17b Merge pull request #7624 from owncloud/enc-encryptedusedspacefix 
[master] Fixed used space to be based on unencrypted size
 2014-03-10 09:38:24 +01:00
Thomas Tanghus
212699e389 Merge pull request #7628 from owncloud/fileinfo-type 
Fix FileInfo->getType errors
 2014-03-09 23:34:01 +01:00
Thomas Müller
25f523680a fixing ident 2014-03-07 20:06:06 +01:00
Thomas Müller
0d90b90d94 we first shall check if the current session is valid - otherwise the session-id will be regenerated on login via basic auth 2014-03-07 20:00:34 +01:00
Robin Appelman
51165a1a04 Check if value exists before returning 2014-03-07 15:16:35 +01:00
Vincent Petry
48d63a6278 Return unencrypted_size of folder when queried 
This fixes the "used space" to be based on the unencrypted size, not
encrypted size, to be consistent with how quota/space is handled when
encryption is enabled
 2014-03-07 14:59:09 +01:00
Robin Appelman
65f52fee4f Fix FileInfo->getType errors 2014-03-07 14:52:44 +01:00
icewind1991
3eb58d9973 Merge pull request #7529 from owncloud/getlocalfile-cache 
Add caching for getLocalFile on remote storages
 2014-03-07 13:29:47 +01:00
Vincent Petry
7f24d42ca5 Propagate unencrypted_size up to the file cache root 2014-03-07 11:00:22 +01:00
Vincent Petry
ba3f5fe53a Merge pull request #7583 from owncloud/trusteddomainerrorpage 
[master] Show warning page when accessing server from an untrusted domain
 2014-03-07 10:37:16 +01:00
Thomas Tanghus
ceb5b918d7 Add \OC:: to URLGenerator::getAbsoluteURL() 2014-03-06 23:56:11 +01:00
Vincent Petry
536c33895f Merge pull request #7592 from owncloud/fixstoragefreespace 
Fixed upload issue when free space is not known (ex: FTP)
 2014-03-06 17:22:40 +01:00
Vincent Petry
1b8cf18c91 Merge pull request #7182 from owncloud/imagerotate_and_loadbase64_fix 
Fix imagerotate and move loadFromBase64() one up
 2014-03-06 17:18:17 +01:00
Victor Dubiniuk
242cbb802a Reset time of last update feed polling 2014-03-06 18:19:58 +03:00
Vincent Petry
6e4ea09d52 Merge pull request #7494 from owncloud/fix-7307 
Replace OC.Router.generate() with OC.generateUrl()
 2014-03-06 14:49:12 +01:00
Robin Appelman
895fc0fa26 Fix check if fileinfo is valid 2014-03-06 14:23:27 +01:00
Vincent Petry
0dcac65aa1 Fixed upload issue when free space is not known 2014-03-06 13:53:55 +01:00
Georg Ehrke
eb5265b106 fix merge conflicts 2014-03-06 11:55:45 +01:00
Vincent Petry
9136e6ad30 Fixed X-Forwarded-Host parsing 2014-03-06 11:51:25 +01:00
Vincent Petry
f8fe2753b1 Added localhost as trusted domain 2014-03-06 11:51:10 +01:00
Vincent Petry
421cff00bd Show warning page when accessing server from an untrusted domain 
Added early check for the requested domain host and show a warning
page if the domain is not trusted.
 2014-03-06 11:51:08 +01:00
Thomas Müller
32b29c9d73 Merge branch 'master' into fix-7307 
Conflicts:
	core/js/router.js
	settings/js/admin.js
 2014-03-06 00:15:08 +01:00
Lukas Reschke
e3156fa5ad Merge pull request #7354 from pschmitt/master 
Use 'command -v' to detect whether and where software is installed (instead of 'which')
 2014-03-05 19:25:09 +01:00
Björn Schießle
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
Georg Ehrke
dbf83aada2 fix issue with Non-static method Imagick ../..; @ doesn't seem to work in this case 2014-03-05 15:57:45 +01:00
Georg Ehrke
32a5d51fa6 add fclose, fixes issue from bdb96b9af8 2014-03-05 15:37:26 +01:00
Georg Ehrke
bdb96b9af8 fix issue with spamming logging files when loading cached thumbnail 2014-03-05 13:20:50 +01:00
Bjoern Schiessle
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
Thomas Müller
7edd8df07f Merge pull request #7521 from owncloud/docstrings_2_kondou 
Fix some more docstrings
 2014-03-05 00:40:49 +01:00
Tom Needham
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
Vincent Petry
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
Robin Appelman
a8c67dc675 Add caching for getLocalFile on remote storages 2014-03-04 15:44:58 +01:00
Vincent Petry
ad195a881e Merge pull request #7453 from owncloud/preview-fileinfo 
Cache the fileinfo in OC\Preview
 2014-03-03 18:52:25 +01:00
kondou
5e3b6f1fd9 Fix some more docstrings 2014-03-03 17:32:29 +01:00
Frank Karlitschek
7983c90fdc Merge pull request #7500 from owncloud/theme-mailtemplate 
Enable theming of the mail template header
 2014-03-03 17:22:33 +01:00
Robin Appelman
06c6163265 Check if fields we need are actually set to prevent errors 2014-03-03 16:48:28 +01:00
Vincent Petry
79ae3c4527 Allow XML entity loader for MDB2 schema loader 
Forward port of 762b0d9 from stable6 to master
 2014-03-03 14:17:51 +01:00
Robin Appelman
c87658feda Fix updater when getFileInfo fails 2014-03-03 12:56:08 +01:00
Jan-Christoph Borchardt
b8d0fc9494 make mail notification header color themable 2014-03-03 12:43:22 +01:00
Thomas Müller
1291303c5a Replace OC.Router.generate() with OC.generateUrl() 2014-03-02 22:30:24 +01:00
kondou
5d5306175f Fix some docstrings in l10n.php 2014-03-01 03:38:35 +01:00
Bart Visscher
8951328a87 More PHPDoc updates 2014-02-28 21:03:43 +01:00
Myles McNamara
195bdff91f move replace to inside isset 2014-02-28 11:19:19 -05:00
Myles McNamara
4ab7f58745 replace spaces in download link without encoding entire URL 2014-02-28 11:15:49 -05:00
Thomas Müller
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
Robin Appelman
da386aad59 Allow re-using already known fileinfo when calculating folder sizes 2014-02-28 14:23:07 +01:00
Robin Appelman
3ff12ef4ec Also send explicit cache hooks when calling file_put_contents with a resource 2014-02-28 14:21:33 +01:00
Morris Jobke
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
Bart Visscher
35a8dfb2fa More PHPDoc fixes, using scrutinizer patches as hints 2014-02-28 13:53:41 +01:00
Bart Visscher
89e0763d3d Update PHPDoc for I10N, OC_Config, OC\Template\Base and OCP\IL10N 2014-02-28 13:37:41 +01:00
icewind1991
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
Lukas Reschke
4c4bb70cb6 CSS is now loaded directly instead via PHP 
269f24cf96 was not changed in setup.php which prevented loading of CSS files in some environments (e.g. my local setup) for apps.
 2014-02-28 11:14:18 +01:00
Morris Jobke
49b331be39 add BMP mimetype for BMP previews 2014-02-27 14:39:16 +01:00
Robin Appelman
7c92e2e3ad Update rawlist to work with new fileinfo object 2014-02-27 14:04:19 +01:00
Robin Appelman
8282cfff04 Cache the fileinfo in OC\Preview 2014-02-27 13:15:18 +01:00
Vincent Petry
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
Thomas Müller
ab850b961d remove unused code and fix wrong variable names - some PHPDoc updated 2014-02-26 23:56:46 +01:00
Robin Appelman
bc49c6be04 Manually triger the filecache update hooks before any other hook 2014-02-26 14:29:13 +01:00
icewind1991
59df3ffdf4 Merge pull request #7279 from owncloud/folderid-reuse 
Reuse the folder id in View->getFolderContents
 2014-02-26 12:18:34 +01:00
Jan-Christoph Borchardt
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
Vincent Petry
5c98e0c7c7 Merge pull request #7328 from owncloud/McNetic-zipstreamer 
McNetic zipstreamer
 2014-02-26 10:19:12 +01:00
Thomas Müller
574883c47a introduce new theme function to allow full creation of documentation links: buildDocLinkToKey() 2014-02-25 23:06:23 +01:00
Vincent Petry
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
Vincent Petry
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
Björn Schießle
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
Vincent Petry
432a42d846 Fix case where port is missing 
Forward port of 6d3b5b24fd to master
 2014-02-25 11:40:05 +01:00
Bjoern Schiessle
ebd73aee8f don't overwrite keys if rename was done by a stream copy 2014-02-24 17:24:43 +01:00
Thomas Müller
0d78d9c180 Merge branch 'master' into McNetic-zipstreamer 
Conflicts:
	3rdparty
 2014-02-24 12:53:55 +01:00
Vincent Petry
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
Vincent Petry
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
Lukas Reschke
c9ab11a9bd Merge pull request #7259 from owncloud/overwritehost-always 
Add overwritehost config on setup and upgrade
 2014-02-22 07:35:56 +01:00
Robin Appelman
f86dffd56c Merge branch 'master' into recursive-mkdir-local 2014-02-21 15:43:54 +01:00
Robin Appelman
3487a95eab Remove fileid parameter for getFolderContent 2014-02-21 15:36:24 +01:00
Robin Appelman
dd98e6333f Split getFolderContentById 2014-02-21 15:35:12 +01:00
Robin Appelman
3980a7d9c6 Merge branch 'master' into folderid-reuse 2014-02-21 15:33:12 +01:00
Lukas Reschke
fe44ac264b Add overwritehost config on setup and upgrade 2014-02-21 15:19:01 +01:00
Thomas Müller
27ad69eea5 Merge branch 'master' into no-css-js-delivery-via-php 2014-02-21 14:01:24 +01:00
Thomas Müller
a40cedf507 Merge branch 'master' into McNetic-zipstreamer 2014-02-21 13:57:18 +01:00
Philipp Schmitt
43b1d81f77 Use 'command -v' to detect whether and where software is installed (instead of 'which') 2014-02-21 13:45:57 +01:00
Thomas Müller
f19276f7bc Merge branch 'master' into no-css-js-delivery-via-php 
Conflicts:
	config/config.sample.php
 2014-02-21 09:51:51 +01:00
Lukas Reschke
f7fa8662e2 Remove session_id_regenerate from here 
Jenkins somewhat complains that there are already sent headers.
 2014-02-21 08:12:45 +01:00
Lukas Reschke
69325c5eeb Move session_regenerate_id to login() 2014-02-21 08:11:07 +01:00
Lukas Reschke
f11658698d Fix path to the mount file 2014-02-20 18:53:37 +01:00
Thomas Müller
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
Thomas Müller
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
Robin Appelman
d1c392d9ad Also make "regular" local storage's mkdir recursive 2014-02-20 15:36:30 +01:00
Joshua Medeiros
76aa4714cf Recursive mkdir fixes #7047 2014-02-20 15:35:00 +01:00
Lukas Reschke
c869e0116b Merge pull request #6999 from kofemann/mount-config 
mount: make location of mount.json configurable
 2014-02-20 15:15:00 +01:00
Björn Schießle
4eadc36094 Merge pull request #6935 from owncloud/fix_urlGenerator 
Add missing slash in URLGenerator::getAbsoluteURL().
 2014-02-20 14:57:03 +01:00
Lukas Reschke
e4c3ef2ca6 Merge pull request #7289 from owncloud/fix-filetype-icons 
Fix filetype icons
 2014-02-20 14:53:41 +01:00
Lukas Reschke
0241ddc759 Merge pull request #6519 from nhirokinet/master 
Security Update: session fixation
 2014-02-20 14:28:26 +01:00
Thomas Müller
fbea02bebb kill $coreStyles and $coreScripts 2014-02-20 14:18:01 +01:00
Thomas Müller
a0e790227e remove unused functions - have been introduced with the old minimizer approach 2014-02-20 14:11:31 +01:00
Thomas Müller
31bab55847 Merge branch 'master' into no-css-js-delivery-via-php 2014-02-20 13:52:53 +01:00
icewind1991
742f54b6d5 Merge pull request #7301 from owncloud/fix-fuckup 
fix master - #7274 brokes it
 2014-02-20 13:40:12 +01:00
Thomas Müller
8cf73ca42f integrate assetic for asset pipeline-ing 2014-02-20 13:28:27 +01:00
Thomas Müller
7242d00aa6 enable static delivery of css files 2014-02-20 13:27:46 +01:00
Thomas Müller
ac8e6b15b6 kill references to core.js and core.css 2014-02-20 13:23:24 +01:00
Thomas Müller
bf22ed7bdb kill old minimizer code 2014-02-20 13:10:56 +01:00
Björn Schießle
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
Lukas Reschke
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
Jan-Christoph Borchardt
3e235b2699 merge master 2014-02-20 10:51:13 +01:00
Jan-Christoph Borchardt
a6fb6abbe0 fix filetype icons for gzip, tex, perl, csv, sh 2014-02-20 10:45:11 +01:00
Morris Jobke
b76a3993d4 fix master - #7274 brokes it 2014-02-20 09:47:59 +01:00