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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'master' into appframework-master	Thomas Müller	2013-09-04	3	-1/+54
\|\
\| *	Merge branch 'master' into clean_up_util	kondou	2013-09-02	3	-6/+63
\| \|\
\| \| *	fixing this obvious typo directly	Frank Karlitschek	2013-09-01	1	-1/+1
\| \| *	Merge branch 'master' into oc_preview	Georg Ehrke	2013-08-23	1	-6/+10
\| \| \|\
\| \| * \	Merge master into oc_preview	Georg Ehrke	2013-08-19	3	-2/+10
\| \| \|\ \
\| \| * \ \	fix merge conflicts	Georg Ehrke	2013-08-05	1	-2/+23
\| \| \|\ \ \
\| \| * \ \ \	Merge branch 'master' into oc_preview	Thomas Müller	2013-07-30	6	-17/+71
\| \| \|\ \ \ \
\| \| * \| \| \| \|	add class='preview-icon' to rows in file app that make use of previews	Georg Ehrke	2013-07-29	1	-27/+11
\| \| * \| \| \| \|	implement use of previews in sharing app	Georg Ehrke	2013-07-11	1	-0/+10
\| \| * \| \| \| \|	merge conflicts ...	Georg Ehrke	2013-07-10	3	-3/+189
\| \| \|\ \ \ \ \
\| \| * \| \| \| \| \|	implement server side use of previews	Georg Ehrke	2013-06-26	1	-0/+9
\| \| * \| \| \| \| \|	Merge branch 'master' into oc_preview	Georg Ehrke	2013-06-17	1	-12/+12
\| \| \|\ \ \ \ \ \
\| \| * \ \ \ \ \ \	Merge branch 'master' into oc_preview	Georg Ehrke	2013-06-06	2	-95/+160
\| \| \|\ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \	Merge branch 'master' into oc_preview	Georg Ehrke	2013-05-25	1	-1/+141
\| \| \|\ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \	Merge branch 'master' into oc_preview	Georg Ehrke	2013-05-17	1	-1/+4
\| \| \|\ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \	Merge branch 'master' into oc_preview	Georg Ehrke	2013-04-22	13	-259/+950
\| \| \|\ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \|	first version of the new previewer lib. It currently only created previews/th...	Frank Karlitschek	2012-11-13	1	-0/+50
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into clean_up_util	kondou	2013-08-20	3	-2/+10
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Clean up \OC\Util	kondou	2013-08-15	1	-1/+1
\| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	move new interfaces into lib/public and OCP	Thomas Müller	2013-08-31	5	-10/+10
* \| \| \| \| \| \| \| \| \| \| \|	PHPDoc added to existing interfaces	Thomas Müller	2013-08-31	3	-2/+44
* \| \| \| \| \| \| \| \| \| \| \|	fixing file header	Thomas Müller	2013-08-31	5	-5/+98
* \| \| \| \| \| \| \| \| \| \| \|	fixing typo	Thomas Müller	2013-08-29	1	-1/+1
* \| \| \| \| \| \| \| \| \| \| \|	as a quick example the public contacts API has been ported over as a service ...	Thomas Müller	2013-08-26	3	-39/+170
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into appframework-master	Thomas Müller	2013-08-26	4	-8/+20
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Sharing: only determine path root if owner is available	Arthur Schiwon	2013-08-22	1	-6/+10
\| \| \|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge pull request #4239 from owncloud/decrypt_files_again	Björn Schießle	2013-08-18	1	-0/+8
\| \|\ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \|	Merge branch 'master' into decrypt_files_again	Bjoern Schiessle	2013-08-17	1	-2/+23
\| \| \|\\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	check if some encrypted files are left after the app was disabled and warn th...	Bjoern Schiessle	2013-08-12	1	-0/+8
\| \| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add _many_ newlines at the end of files	kondou	2013-08-18	2	-2/+2
\| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	introducing OCP\AppFramework\App	Thomas Müller	2013-08-21	3	-0/+324
* \| \| \| \| \| \| \| \| \|	moving response classes over to OCP	Thomas Müller	2013-08-21	4	-0/+458
* \| \| \| \| \| \| \| \| \|	typo	Thomas Müller	2013-08-21	1	-1/+1
* \| \| \| \| \| \| \| \| \|	initial setup of the server container	Thomas Müller	2013-08-21	1	-0/+14
* \| \| \| \| \| \| \| \| \|	Introducing IRequest	Thomas Müller	2013-08-20	1	-0/+88
* \| \| \| \| \| \| \| \| \|	Introducing IContainer into public api	Thomas Müller	2013-08-20	1	-0/+19
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	cancel sharing if some users doesn't have a working encryption set-up.	Bjoern Schiessle	2013-08-01	1	-2/+20
* \| \| \| \| \| \| \| \|	fixes #4026	Thomas Müller	2013-07-30	1	-0/+3
\|/ / / / / / / /
* \| \| \| \| \| \| \|	functions in OCP should be static	Robin Appelman	2013-07-25	1	-1/+1
* \| \| \| \| \| \| \|	need to use \OC_Image to escape OCP namespace	Jörn Friedrich Dreyer	2013-07-22	1	-1/+1
* \| \| \| \| \| \| \|	return result from getL10N	Robin Appelman	2013-07-22	1	-1/+1
* \| \| \| \| \| \| \|	Merge pull request #3880 from owncloud/code-checker	Bart Visscher	2013-07-21	3	-8/+46
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Correct casing of OC_User and pass through the params to getUsers	Bart Visscher	2013-07-19	1	-8/+8
\| * \| \| \| \| \| \| \|	Add OC_L10N to public api	Bart Visscher	2013-07-19	1	-0/+9
\| * \| \| \| \| \| \| \|	Add OC_Image to public api	Bart Visscher	2013-07-19	1	-0/+29
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	add proper deprecated tag	Morris Jobke	2013-07-21	1	-0/+1
* \| \| \| \| \| \| \|	add back public API function, but mark as deprecated	Jan-Christoph Borchardt	2013-07-20	1	-0/+10
* \| \| \| \| \| \| \|	finally remove the file size obfuscation as it had more disadvantages. I was ...	Jan-Christoph Borchardt	2013-07-18	1	-10/+0
* \| \| \| \| \| \| \|	Merge pull request #3270 from owncloud/convert-oc_config	icewind1991	2013-07-11	1	-6/+21
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'master' into convert-oc_config	Bart Visscher	2013-07-08	1	-1/+24
\| \|\ \ \ \ \ \ \