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

16389 Commits

Author SHA1 Message Date
Robin Appelman 3f52eb073d Merge branch 'master' into mimeicons-svg 2014-02-21 14:00:17 +01:00
Thomas Müller 29c43ddb91 Merge pull request #7350 from owncloud/config-gitignore 
ignore optional additional config files
 2014-02-21 13:58:23 +01:00
Thomas Müller a40cedf507 Merge branch 'master' into McNetic-zipstreamer 2014-02-21 13:57:18 +01:00
Björn Schießle 9f0fc30251 Merge pull request #7337 from owncloud/test_for_6935 
add unit test for \OC\URLGenerator::getAbsoluteURL
 2014-02-21 13:45:49 +01:00
Robin Appelman 37a228422c Merge branch 'master' into sharing-userspathbug 2014-02-21 13:43:15 +01:00
Bjoern Schiessle 0c0e4fced5 fix test so that it doesn't depend on the array order 2014-02-21 13:37:47 +01:00
Bjoern Schiessle 6ca4d3bfde fix usersPath and add unit tests 2014-02-21 13:37:46 +01:00
Morris Jobke 387cdc81dc Merge pull request #7309 from owncloud/mobile-header 
Header optimizations for mobile
 2014-02-21 13:37:01 +01:00
Bjoern Schiessle cf7ef0d356 fix sharing unit tests 2014-02-21 13:36:00 +01:00
Robin Appelman 80481a1e41 Merge branch 'master' into mobile-header 2014-02-21 12:46:09 +01:00
Morris Jobke fc209a5944 Merge pull request #7347 from owncloud/patch-headers-already-sent 
Fix "headers are already sent" introduced with #6519
 2014-02-21 12:36:24 +01:00
Robin Appelman 292525d10b Merge branch 'master' into patch-headers-already-sent 2014-02-21 11:23:06 +01:00
icewind1991 c9ea8af3a6 Merge pull request #7348 from owncloud/remove-problematic-test 
Remove unit tests which causes the filesystem tests to fail
 2014-02-21 11:21:50 +01:00
Morris Jobke 2f6639875e ignore optional additional config files 2014-02-21 10:58:05 +01:00
Thomas Müller 0e2ce33ab0 updating 3rdparty 2014-02-21 10:03:02 +01:00
Robin Appelman 2293563488 Remove unit tests which causes the filesystem tests to fail 2014-02-21 10:02:03 +01:00
Thomas Müller f19276f7bc Merge branch 'master' into no-css-js-delivery-via-php 
Conflicts:
	config/config.sample.php
 2014-02-21 09:51:51 +01:00
Jan-Christoph Borchardt b22d82f941 code style: else on same line 2014-02-21 09:42:19 +01:00
Lukas Reschke f7fa8662e2 Remove `session_id_regenerate` from here 
Jenkins somewhat complains that there are already sent headers.
 2014-02-21 08:12:45 +01:00
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
ringmaster 58be2eb955 Allow apps to add/modify config js output via hook. 2014-02-20 18:13:27 -05:00
Bjoern Schiessle 1ae6e9ec21 add unit test for \OC\URLGenerator::getAbsoluteURL to verify #6935 2014-02-20 19:06:42 +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
Lukas Reschke f11658698d Fix path to the mount file 2014-02-20 18:53:37 +01:00
Robin Appelman daf28225b7 fix viewport size on windows phone 2014-02-20 18:42:59 +01:00
Jan-Christoph Borchardt d5739e83d1 remove additional transition rule, reduce width of collapsed search bar 2014-02-20 18:40:08 +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
Lukas Reschke 6cb64a4fce Fix code to search for mount.json in custom data folders 2014-02-20 18:34:27 +01:00
Robin Appelman d9bb21146f fix IE10 viewport sizeing 2014-02-20 18:14:40 +01:00
Jan-Christoph Borchardt d466458469 restrict zooming in to not mangle layout accidentally 2014-02-20 17:37:48 +01:00
Robin Appelman f710205ee7 Make unit tests expect the svg icons 2014-02-20 16:56:09 +01:00
Robin Appelman 0624476aa1 Merge branch 'master' into mimeicons-svg 2014-02-20 16:55:18 +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
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