Commit Graph

312 Commits

Author SHA1 Message Date
Michael Gapczynski 1ec75330ec Merge branch 'master' into sharing 2011-08-15 17:49:36 -04:00
Robin Appelman 6173c0fbc2 a bit of refactoring for oc_filesystem and implement user quota 2011-08-15 21:09:13 +02:00
Michael Gapczynski 4830555cce Merge branch 'master' into sharing
Conflicts:
	.gitignore
2011-08-11 17:42:37 -04:00
Frank Karlitschek aa582ec43a more work on encryption 2011-08-11 17:49:36 +02:00
Michael Gapczynski 1aa89b7cbb Merge branch 'master' into sharing
Conflicts:
	files/css/files.css
	lib/base.php
2011-08-07 15:56:26 -04:00
Frank Karlitschek a0b7b85c56 remove debug 2011-08-07 18:00:35 +02:00
Frank Karlitschek 58c2d29f8c report the right webserver user to simplify setup and debug 2011-08-07 17:58:56 +02:00
Frank Karlitschek b513a60540 nicer error report and streamlined setup 2011-08-06 23:19:00 +02:00
Michael Gapczynski 11d1627513 Merge branch 'master' into sharing. Integrate with changes in master, rename classes
Conflicts:
	lib/base.php
2011-07-30 19:40:19 -04:00
Jakob Sack bafd684eb6 Renaming classes :-) 2011-07-29 21:36:03 +02:00
Jakob Sack 2bfad189e7 Merge branch 'master' of git://anongit.kde.org/owncloud into autoload
Conflicts:
	lib/base.php
	lib/filestorage.php
2011-07-29 20:42:24 +02:00
Jakob Sack f5c0dbd947 Use autoload 2011-07-27 19:07:28 +02:00