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

16274 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lukas Reschke
69325c5eeb Move session_regenerate_id to login() 2014-02-21 08:11:07 +01:00
Thomas Müller
fe24aafe7d Merge pull request #7312 from owncloud/ldap_fix_add_test 
LDAP: fix and extend tests
 2014-02-21 00:42:43 +01:00
Lukas Reschke
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
Morris Jobke
dde9193b2b Merge pull request #7332 from owncloud/IE10-viewport 
fix IE10 viewport sizeing
 2014-02-20 18:35:44 +01:00
Robin Appelman
d9bb21146f fix IE10 viewport sizeing 2014-02-20 18:14:40 +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
Jan-Christoph Borchardt
bfe6dfe5da Merge pull request #7056 from owncloud/users-scrollperformance 
Improve users list scrolling performance
 2014-02-20 16:45:36 +01:00
Jan-Christoph Borchardt
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
icewind1991
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
blizzz
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
Morris Jobke
b946c0f08b Merge pull request #7319 from owncloud/remote-unneeded-if 
Remove no longer needed if statement
 2014-02-20 15:30:51 +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
Robin Appelman
d329049e53 Remove no longer needed if statement 2014-02-20 14:51:23 +01:00
Jan-Christoph Borchardt
b8048866c7 Merge pull request #7315 from owncloud/Jakobud-core-css-logos 
Jakobud core css logos
 2014-02-20 14:36:34 +01:00
Thomas Müller
3219433e20 Merge pull request #7036 from LeBlaaanc/patch-1 
Removed '/'. Fixes #7035.
 2014-02-20 14:29:41 +01:00
Jörn Friedrich Dreyer
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
Lukas Reschke
0241ddc759 Merge pull request #6519 from nhirokinet/master 
Security Update: session fixation
 2014-02-20 14:28:26 +01:00
Arthur Schiwon
d5690a174e LDAP: fix and extend tests 2014-02-20 14:05:45 +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
Lukas Reschke
169f4cf7ff Fix typo 2014-02-20 12:51:15 +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
Lukas Reschke
8114843973 Merge pull request #7287 from owncloud/subdirectory-harden 
Hardening: Remove dangerous characters + Subdirectory Check
 2014-02-20 11:46:11 +01:00
Lukas Reschke
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
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
3bd984ebf0 Merge pull request #7295 from owncloud/optimize_images_kondou 
Optimize images
 2014-02-20 10:35:14 +01:00
Lukas Reschke
ba7a79372a Variable value is expected and not an echoed output 2014-02-20 10:28:11 +01:00
Lukas Reschke
b61f0f11c5 Move oc_isadmin to the config JS script 2014-02-20 10:26:05 +01:00
Vincent Petry
49f2014e0c Revert "Added extra checks for ext storage class" 
This reverts commit 9e9a5b9ea1.

Unit tests weren't ready, need further tweaking.
 2014-02-20 10:01:49 +01:00
Lukas Reschke
8f22535e75 Merge pull request #7284 from owncloud/ldap_filter_compilation 
LDAP: improve compilation of filters
 2014-02-20 09:55:02 +01:00
Lukas Reschke
38d6c56249 Merge pull request #7294 from owncloud/extstorage-configclass 
Added extra checks for ext storage class
 2014-02-20 09:53:52 +01:00
Morris Jobke
b76a3993d4 fix master - #7274 brokes it 2014-02-20 09:47:59 +01:00
kondou
90f351afa2 Optimize some images 
and strip metadata from png images with optipng in image_optimization.sh
 2014-02-19 21:31:50 +01:00
Bjoern Schiessle
2fd75d8f1c clean up the sharing ajax calls, add mail notification class 2014-02-19 19:33:00 +01:00
Vincent Petry
9e9a5b9ea1 Added extra checks for ext storage class 2014-02-19 19:08:28 +01:00
Lukas Reschke
a4f71267f0 Merge pull request #7027 from owncloud/extstorage-webdavurlencodingfixes 
Fixed ext storage webdav path encoding
 2014-02-19 18:57:59 +01:00
Vincent Petry
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
Lukas Reschke
16262e3fd2 Move isadmin to template and rename it to oc_isadmin 2014-02-19 17:56:12 +01:00
Joas Schilling
513940f4a4 Correctly redirect to settings page when not selecting cert file for upload 
Fix #5463
 2014-02-19 17:07:29 +01:00
kondou
16cbfd0383 Optimize images 2014-02-19 16:44:08 +01:00
Jan-Christoph Borchardt
cac4652c10 coding style: spaces around => 2014-02-19 16:28:29 +01:00
Jan-Christoph Borchardt
937a25593b fix lots of file type icons for archives, js, flash, ics, fonts, code, ... 2014-02-19 16:27:38 +01:00
Lukas Reschke
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
Vincent Petry
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
Arthur Schiwon
c0328b4f0f LDAP: improve compilation of filters 2014-02-19 13:13:01 +01:00
Thomas Müller
f9d4780d27 Merge pull request #7275 from owncloud/3rdparty-fix 
fix 3rdparty submodule
 2014-02-19 12:26:41 +01:00
Jan-Christoph Borchardt
4920373050 Merge pull request #7278 from owncloud/issue/7277 
Add event parameter to keyup event
 2014-02-19 12:20:47 +01:00