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 pull request #7592 from owncloud/fixstoragefreespace	Vincent Petry	2014-03-06	1	-1/+1
\|\
\| *	Fixed upload issue when free space is not known	Vincent Petry	2014-03-06	1	-1/+1
* \|	Merge pull request #7182 from owncloud/imagerotate_and_loadbase64_fix	Vincent Petry	2014-03-06	1	-4/+3
\|\ \
\| * \|	Fix imagerotate and move loadFromBase64() one up.	kondou	2014-02-12	1	-4/+3
* \| \|	Merge pull request #7494 from owncloud/fix-7307	Vincent Petry	2014-03-06	2	-25/+0
\|\ \ \
\| * \ \	Merge branch 'master' into fix-7307	Thomas Müller	2014-03-06	15	-142/+192
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| * \| \|	Replace OC.Router.generate() with OC.generateUrl()	Thomas Müller	2014-03-02	2	-25/+0
* \| \| \|	fix merge conflicts	Georg Ehrke	2014-03-06	7	-8/+12
\|\ \ \ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	Merge pull request #7354 from pschmitt/master	Lukas Reschke	2014-03-05	4	-6/+6
\| \|\ \ \
\| \| * \| \|	Use 'command -v' to detect whether and where software is installed (instead o...	Philipp Schmitt	2014-02-21	4	-6/+6
\| * \| \| \|	Merge pull request #7531 from owncloud/dont_create_shared_folder	Björn Schießle	2014-03-05	2	-2/+5
\| \|\ \ \ \
\| \| * \| \| \|	don't allow to create a file or folder named 'Shared' in the root folder, als...	Bjoern Schiessle	2014-03-05	2	-2/+5
\| * \| \| \| \|	add fclose, fixes issue from bdb96b9af85256f9b3f8663ccf6d27b3d1330918	Georg Ehrke	2014-03-05	1	-0/+1
* \| \| \| \| \|	fix issue with Non-static method Imagick ../..; @ doesn't seem to work in thi...	Georg Ehrke	2014-03-05	3	-62/+80
\|/ / / / /
* \| \| \| \|	fix issue with spamming logging files when loading cached thumbnail	Georg Ehrke	2014-03-05	1	-1/+3
* \| \| \| \|	Merge pull request #7521 from owncloud/docstrings_2_kondou	Thomas Müller	2014-03-05	2	-2/+2
\|\ \ \ \ \
\| * \| \| \| \|	Fix some more docstrings	kondou	2014-03-03	2	-2/+2
* \| \| \| \| \|	Merge pull request #7251 from owncloud/fix-ocsapi-getuser	Tom Needham	2014-03-04	1	-2/+14
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Return 101 if user doesnt exist	tomneedham	2014-02-18	1	-2/+6
\| * \| \| \| \| \|	Add displayname for admins	tomneedham	2014-02-18	1	-2/+10
* \| \| \| \| \| \|	Merge pull request #7481 from tripflex/fix_downloadlink_spaces	Vincent Petry	2014-03-04	1	-0/+2
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	move replace to inside isset	Myles McNamara	2014-02-28	1	-2/+2
\| * \| \| \| \| \| \|	replace spaces in download link without encoding entire URL	Myles McNamara	2014-02-28	1	-0/+2
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #7453 from owncloud/preview-fileinfo	Vincent Petry	2014-03-03	1	-115/+126
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Cache the fileinfo in OC\Preview	Robin Appelman	2014-02-27	1	-115/+126
* \| \| \| \| \| \|	Merge pull request #7500 from owncloud/theme-mailtemplate	Frank Karlitschek	2014-03-03	1	-0/+14
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	make mail notification header color themable	Jan-Christoph Borchardt	2014-03-03	1	-0/+14
* \| \| \| \| \| \|	Allow XML entity loader for MDB2 schema loader	Vincent Petry	2014-03-03	1	-0/+2
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #7486 from owncloud/l10n_docstrings	Morris Jobke	2014-03-01	1	-13/+15
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Fix some docstrings in l10n.php	kondou	2014-03-01	1	-13/+15
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #7433 from owncloud/config_basic_auth	Thomas Tanghus	2014-03-01	1	-1/+2
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Config to disable basic_auth username chacking	kondou	2014-02-26	1	-1/+2
\| \|/ / / /
* \| \| \| \|	Merge pull request #7444 from owncloud/fix/7443	Thomas Müller	2014-02-28	2	-23/+9
\|\ \ \ \ \
\| * \| \| \| \|	add BMP mimetype for BMP previews	Morris Jobke	2014-02-27	1	-0/+1
\| * \| \| \| \|	remove unused code and fix wrong variable names - some PHPDoc updated	Thomas Müller	2014-02-26	1	-23/+8
\| \|/ / / /
* \| \| \| \|	Merge pull request #7471 from owncloud/fix-css-loading	Morris Jobke	2014-02-28	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	CSS is now loaded directly instead via PHP	Lukas Reschke	2014-02-28	1	-1/+1
* \| \| \| \| \|	Merge pull request #7455 from owncloud/rawlist-fileinfo	icewind1991	2014-02-28	1	-1/+1
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Update rawlist to work with new fileinfo object	Robin Appelman	2014-02-27	1	-1/+1
\| \|/ / / /
* / / / /	Also quote old column name during DB migration	Vincent Petry	2014-02-27	1	-0/+3
\|/ / / /
* \| \| \|	Merge pull request #3760 from IMM0rtalis/remove_logout_redirect_slash	Bart Visscher	2014-02-26	1	-1/+2
\|\ \ \ \
\| * \| \| \|	- add slash if webroot is an empty string	Florian Scholz	2013-06-25	1	-1/+2
\| * \| \| \|	- removed slash-adding for logout-header-redirect	Florian Scholz	2013-06-17	1	-1/+1
* \| \| \| \|	Merge pull request #7393 from owncloud/fix_path_in_sharing_results	Björn Schießle	2014-02-26	1	-1/+15
\|\ \ \ \ \
\| * \| \| \| \|	fix path in sharing results if it is a file in the Shared folder	Bjoern Schiessle	2014-02-25	1	-1/+15
* \| \| \| \| \|	Merge pull request #7279 from owncloud/folderid-reuse	icewind1991	2014-02-26	2	-2/+13
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Remove fileid parameter for getFolderContent	Robin Appelman	2014-02-21	1	-5/+2
\| * \| \| \| \| \|	Split getFolderContentById	Robin Appelman	2014-02-21	1	-0/+10
\| * \| \| \| \| \|	Merge branch 'master' into folderid-reuse	Robin Appelman	2014-02-21	72	-157/+514
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	Reuse the folder id in View->getFolderContents	Robin Appelman	2014-02-19	2	-4/+8