rnveach
|
e37455493b
|
added missing packages required to run "karma" and "phantomjs" inside
"autotest-js"
|
2014-03-12 19:22:11 -04:00 |
|
rnveach
|
820b161fc4
|
added missing ignores for files and directories created by "autotest-js"
|
2014-03-12 19:20:59 -04: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 |
|
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 |
|
icewind1991
|
fa7fa4a6d3
|
Merge pull request #7088 from owncloud/sharing-userspathbug
Fix usersPath bug
|
2014-02-21 15:39:09 +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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|