da19109f40
Config to disable basic_auth username chacking
...
This can be confusing and/or annoying
2014-02-26 18:06:13 +01:00
7f05c23231
Merge pull request #3760 from IMM0rtalis/remove_logout_redirect_slash
...
- removed slash-adding for logout-header-redirect
2014-02-26 16:05:09 +01:00
b7385986ae
Merge pull request #7393 from owncloud/fix_path_in_sharing_results
...
fix path in sharing results if it is a file in the Shared folder
2014-02-26 15:19:30 +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
e3f676e009
fix path in sharing results if it is a file in the Shared folder
2014-02-25 17:27:23 +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
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
80481a1e41
Merge branch 'master' into mobile-header
2014-02-21 12:46:09 +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
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
3e2c56157b
reduce width of searchbox on mobile, fix overlap, fix #7282
2014-02-20 11:33:46 +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
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
3aafa837b8
Remove internal methods from the public interface
2014-02-12 13:25:50 +01:00
60bd9d512d
Merge branch 'master' into backgroundjob-public
2014-02-12 13:21:47 +01:00
kondou
Bart Visscher
Björn Schießle
icewind1991
Jan-Christoph Borchardt
Vincent Petry
Thomas Müller
Vincent Petry
Lukas Reschke
Robin Appelman
Philipp Schmitt
Morris Jobke
Scrutinizer Auto-Fixer
Tom Needham
tomneedham
Georg Ehrke