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

16683 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lukas Reschke
c9ab11a9bd Merge pull request #7259 from owncloud/overwritehost-always 
Add overwritehost config on setup and upgrade
 2014-02-22 07:35:56 +01:00
Morris Jobke
079d64ce75 Merge pull request #7310 from owncloud/no-css-js-delivery-via-php 
No css js delivery via php
 2014-02-21 20:37:10 +01:00
Morris Jobke
e549977d0e update 3rdparty submodule to current master 2014-02-21 17:31:24 +01:00
root
300b1131b4 replace spaces with tabs 
use true instead of 1
 2014-02-21 17:09:36 +01:00
Vincent Petry
a2000a15f8 Merge pull request #7358 from owncloud/xmlfix-3rdparty 
Updated submodule to include XML processing fixes
 2014-02-21 17:01:00 +01:00
icewind1991
9b9b2255b6 Merge pull request #7355 from owncloud/new-menu-svg 
Use SVG icons in New file menu
 2014-02-21 16:18:43 +01:00
Robin Appelman
df35929ed2 Merge branch 'master' into add-js-config-vars 2014-02-21 16:07:21 +01:00
Robin Appelman
59ec61dc03 Merge branch 'master' into GuillaumeAmat-patch-1 2014-02-21 16:04:31 +01:00
Robin Appelman
f1475671ab Merge branch 'master' into extstorage-configclass 2014-02-21 15:51:41 +01:00
icewind1991
fa7fa4a6d3 Merge pull request #7088 from owncloud/sharing-userspathbug 
Fix usersPath bug
 2014-02-21 15:39:09 +01:00
Robin Appelman
3487a95eab Remove fileid parameter for getFolderContent 2014-02-21 15:36:24 +01:00
Robin Appelman
dd98e6333f Split getFolderContentById 2014-02-21 15:35:12 +01:00
Morris Jobke
a5c70f16d2 Merge pull request #7351 from owncloud/fix_thumbnails_for_conflicts_in_subdirs 
fix thumbnail generation for subdirectories in the conflicts dialog
 2014-02-21 15:33:13 +01:00
Robin Appelman
3980a7d9c6 Merge branch 'master' into folderid-reuse 2014-02-21 15:33:12 +01:00
Lukas Reschke
fe44ac264b Add overwritehost config on setup and upgrade 2014-02-21 15:19:01 +01:00
icewind1991
aa0bcf7ba4 Merge pull request #7336 from owncloud/IE-wipho-viewport 
fix viewport size on windows phone
 2014-02-21 15:13:20 +01:00
Vincent Petry
c0a6af8219 Updated submodule to include XML processing fixes 2014-02-21 15:12:15 +01:00
Björn Schießle
6bde602c09 Merge pull request #7292 from owncloud/sharing_tests 
fix sharing unit tests
 2014-02-21 14:24:51 +01:00
Jan-Christoph Borchardt
6f56fd99a6 fix too much distance between text and icon 2014-02-21 14:10:13 +01:00
Jan-Christoph Borchardt
877cfb963a use SVG icons from icons.css for New file menu 2014-02-21 14:07:25 +01:00
Robin Appelman
4715fb12c8 Add url parameter to control whether previews should return 404 when the mimetype is unsupported 2014-02-21 14:06:15 +01:00
Jörn Friedrich Dreyer
d9e333c0da use directory from original instead of current dir 2014-02-21 14:01:38 +01:00
Thomas Müller
27ad69eea5 Merge branch 'master' into no-css-js-delivery-via-php 2014-02-21 14:01:24 +01:00
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
Philipp Schmitt
43b1d81f77 Use 'command -v' to detect whether and where software is installed (instead of 'which') 2014-02-21 13:45:57 +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
kondou
88882e3fa7 Use addClass('hidden') and removeClass('hidden') 2014-02-21 12:42:07 +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
kondou
0e0b4d5575 Hide remove image, if there's no custom avatar 
Fix #7308
 2014-02-20 21:53:59 +01: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