58be2eb955
Allow apps to add/modify config js output via hook.
2014-02-20 18:13:27 -05:00
917a505af4
Merge pull request #7291 from owncloud/adminess-raghu
...
Move isadmin to template and rename it to oc_isadmin
2014-02-20 19:01:28 +01:00
dde9193b2b
Merge pull request #7332 from owncloud/IE10-viewport
...
fix IE10 viewport sizeing
2014-02-20 18:35:44 +01:00
d9bb21146f
fix IE10 viewport sizeing
2014-02-20 18:14:40 +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
bfe6dfe5da
Merge pull request #7056 from owncloud/users-scrollperformance
...
Improve users list scrolling performance
2014-02-20 16:45:36 +01:00
5cc4a47f4c
Merge pull request #6808 from globalpointfamily/remove_ie9_navagation_width_fix
...
remove fix for IE9 nav bar width
2014-02-20 16:25:08 +01:00
d1b1ad0813
Merge pull request #7290 from owncloud/issue/5463
...
Correctly redirect to settings page when not selecting cert file for upload
2014-02-20 16:24:31 +01:00
984ea7b3ff
Merge pull request #7205 from owncloud/fix_7153
...
LDAP: prevent other configuration from being deleted when deleting the f...
2014-02-20 16:22:43 +01:00
b946c0f08b
Merge pull request #7319 from owncloud/remote-unneeded-if
...
Remove no longer needed if statement
2014-02-20 15:30:51 +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
d329049e53
Remove no longer needed if statement
2014-02-20 14:51:23 +01:00
b8048866c7
Merge pull request #7315 from owncloud/Jakobud-core-css-logos
...
Jakobud core css logos
2014-02-20 14:36:34 +01:00
3219433e20
Merge pull request #7036 from LeBlaaanc/patch-1
...
Removed '/'. Fixes #7035 .
2014-02-20 14:29:41 +01:00
3f6d14be85
Merge branch 'core-css-logos' of github.com:Jakobud/owncloud-core
...
Conflicts:
core/css/styles.css
2014-02-20 14:29:23 +01:00
0241ddc759
Merge pull request #6519 from nhirokinet/master
...
Security Update: session fixation
2014-02-20 14:28:26 +01:00
742f54b6d5
Merge pull request #7301 from owncloud/fix-fuckup
...
fix master - #7274 brokes it
2014-02-20 13:40:12 +01:00
169f4cf7ff
Fix typo
2014-02-20 12:51:15 +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
8114843973
Merge pull request #7287 from owncloud/subdirectory-harden
...
Hardening: Remove dangerous characters + Subdirectory Check
2014-02-20 11:46:11 +01:00
65c0b73c87
Merge pull request #7255 from owncloud/fix-admin-remote
...
An admin should not be able to add remote and public services on its own
2014-02-20 11:16:43 +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
3bd984ebf0
Merge pull request #7295 from owncloud/optimize_images_kondou
...
Optimize images
2014-02-20 10:35:14 +01:00
ba7a79372a
Variable value is expected and not an echoed output
2014-02-20 10:28:11 +01:00
b61f0f11c5
Move oc_isadmin to the config JS script
2014-02-20 10:26:05 +01:00
49f2014e0c
Revert "Added extra checks for ext storage class"
...
This reverts commit 9e9a5b9ea1
2014-02-20 10:01:49 +01:00
8f22535e75
Merge pull request #7284 from owncloud/ldap_filter_compilation
...
LDAP: improve compilation of filters
2014-02-20 09:55:02 +01:00
38d6c56249
Merge pull request #7294 from owncloud/extstorage-configclass
...
Added extra checks for ext storage class
2014-02-20 09:53:52 +01:00
b76a3993d4
fix master - #7274 brokes it
2014-02-20 09:47:59 +01:00
90f351afa2
Optimize some images
...
and strip metadata from png images with optipng in image_optimization.sh
2014-02-19 21:31:50 +01:00
2fd75d8f1c
clean up the sharing ajax calls, add mail notification class
2014-02-19 19:33:00 +01:00
9e9a5b9ea1
Added extra checks for ext storage class
2014-02-19 19:08:28 +01:00
a4f71267f0
Merge pull request #7027 from owncloud/extstorage-webdavurlencodingfixes
...
Fixed ext storage webdav path encoding
2014-02-19 18:57:59 +01:00
b2b35cd335
Fixed ext storage webdav path encoding
...
- Some WebDAV servers like lighttpd need paths in URLs to be properly
encoded
- Added error log output when curl connection failed
- Added check for 'resourcetype' in case the WebDAV server doesn't
support/return it
- Fixed touch() to return false if the server doesn't implement
PROPPATCH
- Added optional delay in WebDAV unit tests to use when testing against
lighttpd's WebDAV
2014-02-19 18:34:08 +01:00
16262e3fd2
Move isadmin to template and rename it to oc_isadmin
2014-02-19 17:56:12 +01:00
513940f4a4
Correctly redirect to settings page when not selecting cert file for upload
...
Fix #5463
2014-02-19 17:07:29 +01:00
16cbfd0383
Optimize images
2014-02-19 16:44:08 +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
c0328b4f0f
LDAP: improve compilation of filters
2014-02-19 13:13:01 +01:00
f9d4780d27
Merge pull request #7275 from owncloud/3rdparty-fix
...
fix 3rdparty submodule
2014-02-19 12:26:41 +01:00
4920373050
Merge pull request #7278 from owncloud/issue/7277
...
Add event parameter to keyup event
2014-02-19 12:20:47 +01:00
7330f61a94
Merge pull request #4799 from owncloud/tune_legacy_cache_webdav_properties_prefixing_master
...
Concatenate string in SQL instead of PHP
2014-02-19 11:58:48 +01:00
bcad6e641a
Merge pull request #7274 from owncloud/scrutinizer-patch-1
...
Scrutinizer Auto-Fixes
2014-02-19 11:51:04 +01:00
ringmaster
Lukas Reschke
Morris Jobke
Robin Appelman
Thomas Müller
Jan-Christoph Borchardt
icewind1991
blizzz
Björn Schießle
Jörn Friedrich Dreyer
Vincent Petry
kondou
Joas Schilling