mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
16,563 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

16563 Commits

Author SHA1 Message Date
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
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
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 658758c3f7 fix intendation 2014-02-20 15:36:52 +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
Vincent Petry 44441b56d6 Fixed trashbin title 2014-02-20 15:16:45 +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
Vincent Petry 476444ab1a Fixed title format 2014-02-20 14:56:28 +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
Vincent Petry 6cf83de60e Merge branch 'patch-1' of github.com:GuillaumeAmat/core into GuillaumeAmat-patch-1 2014-02-20 14:49:54 +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
Thomas Müller fbea02bebb kill $coreStyles and $coreScripts 2014-02-20 14:18:01 +01:00
Thomas Müller 01929096fe revert wrong change to .htaccess 2014-02-20 14:11:31 +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
Arthur Schiwon d5690a174e LDAP: fix and extend tests 2014-02-20 14:05:45 +01:00
Lukas Reschke 2955d9b483 Indentation 2014-02-20 13:54:05 +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
Jan-Christoph Borchardt 20b740f8e4 do not show display name on mobile when profile picture is present 2014-02-20 13:37:23 +01:00
Jan-Christoph Borchardt 92d57cb5a7 move avatar into clickable area of user menu 2014-02-20 13:36:52 +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 328428e40a reference 3rdparty branch add-assetic 2014-02-20 13:26:23 +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
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
Jan-Christoph Borchardt 3e2c56157b reduce width of searchbox on mobile, fix overlap, fix #7282 2014-02-20 11:33:46 +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
Thomas Müller 3ce77a35e5 fixing js syntax error 2014-02-20 10:42:54 +01:00
Vincent Petry b060a17b59 Added extra checks for ext storage class 2014-02-20 10:40:10 +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