16326 Commits (ebd73aee8ff96f7252fab65ab4dc7230d2eb551c)

 

All Branches   

Search

Author	SHA1	Message	Date
Bjoern Schiessle	ebd73aee8f	don't overwrite keys if rename was done by a stream copy	13 years ago
Lukas Reschke	11ca014034	Merge pull request #7305 from owncloud/extstorage-configclass ... Added extra checks for ext storage class	13 years ago
Lukas Reschke	c9ab11a9bd	Merge pull request #7259 from owncloud/overwritehost-always ... Add overwritehost config on setup and upgrade	13 years ago
Morris Jobke	079d64ce75	Merge pull request #7310 from owncloud/no-css-js-delivery-via-php ... No css js delivery via php	13 years ago
Morris Jobke	e549977d0e	update 3rdparty submodule to current master	13 years ago
Vincent Petry	a2000a15f8	Merge pull request #7358 from owncloud/xmlfix-3rdparty ... Updated submodule to include XML processing fixes	13 years ago
icewind1991	9b9b2255b6	Merge pull request #7355 from owncloud/new-menu-svg ... Use SVG icons in New file menu	13 years ago
Robin Appelman	f1475671ab	Merge branch 'master' into extstorage-configclass	13 years ago
icewind1991	fa7fa4a6d3	Merge pull request #7088 from owncloud/sharing-userspathbug ... Fix usersPath bug	13 years ago
Morris Jobke	a5c70f16d2	Merge pull request #7351 from owncloud/fix_thumbnails_for_conflicts_in_subdirs ... fix thumbnail generation for subdirectories in the conflicts dialog	13 years ago
Lukas Reschke	fe44ac264b	Add overwritehost config on setup and upgrade	13 years ago
icewind1991	aa0bcf7ba4	Merge pull request #7336 from owncloud/IE-wipho-viewport ... fix viewport size on windows phone	13 years ago
Vincent Petry	c0a6af8219	Updated submodule to include XML processing fixes	13 years ago
Björn Schießle	6bde602c09	Merge pull request #7292 from owncloud/sharing_tests ... fix sharing unit tests	13 years ago
Jan-Christoph Borchardt	6f56fd99a6	fix too much distance between text and icon	13 years ago
Jan-Christoph Borchardt	877cfb963a	use SVG icons from icons.css for New file menu	13 years ago
Jörn Friedrich Dreyer	d9e333c0da	use directory from original instead of current dir	13 years ago
Thomas Müller	27ad69eea5	Merge branch 'master' into no-css-js-delivery-via-php	13 years ago
Thomas Müller	29c43ddb91	Merge pull request #7350 from owncloud/config-gitignore ... ignore optional additional config files	13 years ago
Björn Schießle	9f0fc30251	Merge pull request #7337 from owncloud/test_for_6935 ... add unit test for \OC\URLGenerator::getAbsoluteURL	13 years ago
Robin Appelman	37a228422c	Merge branch 'master' into sharing-userspathbug	13 years ago
Bjoern Schiessle	0c0e4fced5	fix test so that it doesn't depend on the array order	13 years ago
Bjoern Schiessle	6ca4d3bfde	fix usersPath and add unit tests	13 years ago
Morris Jobke	387cdc81dc	Merge pull request #7309 from owncloud/mobile-header ... Header optimizations for mobile	13 years ago
Bjoern Schiessle	cf7ef0d356	fix sharing unit tests	13 years ago
Robin Appelman	80481a1e41	Merge branch 'master' into mobile-header	13 years ago
Morris Jobke	fc209a5944	Merge pull request #7347 from owncloud/patch-headers-already-sent ... Fix "headers are already sent" introduced with #6519	13 years ago
Robin Appelman	292525d10b	Merge branch 'master' into patch-headers-already-sent	13 years ago
icewind1991	c9ea8af3a6	Merge pull request #7348 from owncloud/remove-problematic-test ... Remove unit tests which causes the filesystem tests to fail	13 years ago
Morris Jobke	2f6639875e	ignore optional additional config files	13 years ago
Robin Appelman	2293563488	Remove unit tests which causes the filesystem tests to fail	13 years ago
Thomas Müller	f19276f7bc	Merge branch 'master' into no-css-js-delivery-via-php ... Conflicts: config/config.sample.php	13 years ago
Lukas Reschke	f7fa8662e2	Remove `session_id_regenerate` from here ... Jenkins somewhat complains that there are already sent headers.	13 years ago
Lukas Reschke	69325c5eeb	Move session_regenerate_id to `login()`	13 years ago
Thomas Müller	fe24aafe7d	Merge pull request #7312 from owncloud/ldap_fix_add_test ... LDAP: fix and extend tests	13 years ago
Bjoern Schiessle	1ae6e9ec21	add unit test for \OC\URLGenerator::getAbsoluteURL to verify #6935	13 years ago
Lukas Reschke	917a505af4	Merge pull request #7291 from owncloud/adminess-raghu ... Move isadmin to template and rename it to oc_isadmin	13 years ago
Robin Appelman	daf28225b7	fix viewport size on windows phone	13 years ago
Jan-Christoph Borchardt	d5739e83d1	remove additional transition rule, reduce width of collapsed search bar	13 years ago
Morris Jobke	dde9193b2b	Merge pull request #7332 from owncloud/IE10-viewport ... fix IE10 viewport sizeing	13 years ago
Robin Appelman	d9bb21146f	fix IE10 viewport sizeing	13 years ago
Jan-Christoph Borchardt	d466458469	restrict zooming in to not mangle layout accidentally	13 years ago
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	13 years ago
Jan-Christoph Borchardt	bfe6dfe5da	Merge pull request #7056 from owncloud/users-scrollperformance ... Improve users list scrolling performance	13 years ago
Jan-Christoph Borchardt	5cc4a47f4c	Merge pull request #6808 from globalpointfamily/remove_ie9_navagation_width_fix ... remove fix for IE9 nav bar width	13 years ago
icewind1991	d1b1ad0813	Merge pull request #7290 from owncloud/issue/5463 ... Correctly redirect to settings page when not selecting cert file for upload	13 years ago
blizzz	984ea7b3ff	Merge pull request #7205 from owncloud/fix_7153 ... LDAP: prevent other configuration from being deleted when deleting the f...	13 years ago
Morris Jobke	b946c0f08b	Merge pull request #7319 from owncloud/remote-unneeded-if ... Remove no longer needed if statement	13 years ago
Lukas Reschke	c869e0116b	Merge pull request #6999 from kofemann/mount-config ... mount: make location of mount.json configurable	13 years ago
Björn Schießle	4eadc36094	Merge pull request #6935 from owncloud/fix_urlGenerator ... Add missing slash in URLGenerator::getAbsoluteURL().	13 years ago