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
b6f44e9a1d
Add caching to OC\Preferences
2014-02-18 11:21:39 +01: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
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
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
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
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
a8943ad022
replace 'size' with 'unencrypted_size' if encryption is enabled
2014-02-07 12:53:13 +01:00
81031984a6
remove duplicate param lines for OCP\User::getUsers()
2014-02-07 12:12:16 +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
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
Thomas Müller
icewind1991
Björn Schießle
Lukas Reschke
Jan-Christoph Borchardt
Morris Jobke
Vincent Petry
Robin Appelman
Scrutinizer Auto-Fixer
Tom Needham
tomneedham
Georg Ehrke
Bart Visscher
Arthur Schiwon
Andreas Fischer
Joas Schilling
Thomas Tanghus
Jörn Friedrich Dreyer
Jens-Christian Fischer