nextcloud-server.git - Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server

	Commit message (Collapse)	Author	Age	Files	Lines
...
*	Merge branch 'master' of git.kde.org:owncloud	Côme BERNIGAUD	2011-08-27	1	-6/+6
\|\
\| *	fixed installer failing due to htaccess. Thanks to Elias Probst	Jan-Christoph Borchardt	2011-08-27	1	-6/+6
\| \|
* \|	Added db4app lib, and apps test_db that shows how it works.	Côme BERNIGAUD	2011-08-27	2	-1/+118
\|/ \| \| \|	Also fixed a typo in db.php
*	fix issue with login being case insensitve	Robin Appelman	2011-08-25	2	-13/+17
\|
*	allow apps to register form for the settings and admin pages	Robin Appelman	2011-08-23	1	-1/+7
\|
*	fix .htaccess file crashing apache+php-cgi	Robin Appelman	2011-08-22	1	-5/+7
\|
*	fix installing shipped apps	Robin Appelman	2011-08-22	2	-12/+23
\|
*	add some todos	Frank Karlitschek	2011-08-20	1	-5/+6
\|
*	more valid HTML, alt attributes, refactored pagenavi etc.	Jan-Christoph Borchardt	2011-08-20	1	-2/+2
\|
*	Merge branch 'sharing'	Jan-Christoph Borchardt	2011-08-17	2	-2/+7
\|\
\| *	This should actually make the 'Shared' directory automatically everytime	Michael Gapczynski	2011-08-15	1	-1/+1
\| \|
\| *	Automatic creation of 'Shared' directory, bug fixes for an empty 'Shared' ↵	Michael Gapczynski	2011-08-15	1	-2/+2
\| \| \| \| \| \| \| \|	directory
\| *	Merge branch 'master' into sharing	Michael Gapczynski	2011-08-15	7	-236/+263
\| \|\
\| * \	resolved merge conflict	Jan-Christoph Borchardt	2011-08-14	2	-17/+17
\| \|\ \
\| * \ \	Merge branch 'master' into sharing	Michael Gapczynski	2011-08-12	4	-5/+13
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: files/css/files.css
\| * \| \| \|	Add missing parameter to usersInGroup()	Michael Gapczynski	2011-08-12	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Merge branch 'master' into sharing	Michael Gapczynski	2011-08-11	7	-32/+70
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: .gitignore
\| * \ \ \ \	merged master into sharing	Jan-Christoph Borchardt	2011-08-11	5	-9/+46
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge branch 'master' into sharing	Michael Gapczynski	2011-08-10	8	-197/+104
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: files/templates/index.php
\| * \ \ \ \ \ \	Merge branch 'master' into sharing	Michael Gapczynski	2011-08-09	4	-220/+117
\| \|\ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge branch 'master' into sharing	Michael Gapczynski	2011-08-07	11	-25/+505
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: files/css/files.css lib/base.php
\| * \| \| \| \| \| \| \| \|	Move registering shared storage out of base	Michael Gapczynski	2011-08-01	1	-2/+0
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'master' into sharing	Michael Gapczynski	2011-07-31	3	-11/+25
\| \|\ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \	Merge branch 'master' into sharing	Michael Gapczynski	2011-07-30	2	-7/+10
\| \|\ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into sharing. Integrate with changes in master, rename ↵	Michael Gapczynski	2011-07-30	43	-1424/+1356
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	classes Conflicts: lib/base.php
\| * \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into sharing	Michael Gapczynski	2011-07-29	1	-20/+28
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: core/templates/layout.user.php
\| * \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into sharing	Michael Gapczynski	2011-07-29	7	-120/+98
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: files/templates/index.php
\| * \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into sharing	Michael Gapczynski	2011-07-26	3	-4/+20
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into sharing	Michael Gapczynski	2011-07-24	6	-757/+570
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into sharing	Michael Gapczynski	2011-07-21	2	-1/+7
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change all occurences of ['user_id'] to OC_USER::getUser()	Michael Gapczynski	2011-07-20	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update database.xml to current database fields, remove hard coded MTGap when ↵	Michael Gapczynski	2011-07-20	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	mounting shared storage provider
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into sharing	Michael Gapczynski	2011-07-20	4	-66/+107
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add missing argument for fromTmpFile() inside of rename()	Michael Gapczynski	2011-07-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into sharing	Michael Gapczynski	2011-07-12	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into sharing	Michael Gapczynski	2011-07-12	1	-2/+2
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix bug in opendir() and remove getStorageMountPoint(), now using datadir ↵	Michael Gapczynski	2011-07-12	2	-10/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	argument instead
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into sharing	Michael Gapczynski	2011-07-06	1	-0/+8
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix bugs in getSource() and implement new target path standard	Michael Gapczynski	2011-07-05	1	-0/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix conflicts with master in lib/base.php	Michael Gapczynski	2011-07-04	1	-3/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into sharing	Michael Gapczynski	2011-07-04	27	-416/+5194
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: .gitignore lib/base.php
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into sharing	Michael Gapczynski	2011-06-23	2	-3/+10
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changed mount point to 'Share', fixed is_dir()	Michael Gapczynski	2011-06-22	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	OC_FILESTOAGE_SHARED now works with hard coded values for files	Michael Gapczynski	2011-06-18	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	First version of shared storage provider - not functional	Michael Gapczynski	2011-06-16	2	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	make the help section working and pretty. knowledge base entries are fetched ↵	Frank Karlitschek	2011-08-17	1	-3/+8
\| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	via OCS from a different server. cool stuff
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	some filesystem fixes	Robin Appelman	2011-08-15	3	-42/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	a bit of refactoring for oc_filesystem and implement user quota	Robin Appelman	2011-08-15	4	-194/+258
\| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	better error messages for installation, still need to be inline	Jan-Christoph Borchardt	2011-08-13	1	-12/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	merged admin, help and settings to settings	Jan-Christoph Borchardt	2011-08-13	1	-5/+5
\| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|