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 #7310 from owncloud/no-css-js-delivery-via-php	Morris Jobke	2014-02-21	14	-234/+95
\|\
\| *	update 3rdparty submodule to current master	Morris Jobke	2014-02-21	1	-0/+0
\| *	Merge branch 'master' into no-css-js-delivery-via-php	Thomas Müller	2014-02-21	12	-31/+94
\| \|\
\| * \	Merge branch 'master' into no-css-js-delivery-via-php	Thomas Müller	2014-02-21	33	-150/+428
\| \|\ \
\| * \| \|	kill $coreStyles and $coreScripts	Thomas Müller	2014-02-20	3	-17/+0
\| * \| \|	revert wrong change to .htaccess	Thomas Müller	2014-02-20	1	-0/+1
\| * \| \|	remove unused functions - have been introduced with the old minimizer approach	Thomas Müller	2014-02-20	1	-27/+0
\| * \| \|	Indentation	Lukas Reschke	2014-02-20	1	-2/+2
\| * \| \|	Merge branch 'master' into no-css-js-delivery-via-php	Thomas Müller	2014-02-20	304	-3344/+2174
\| \|\ \ \
\| * \| \| \|	integrate assetic for asset pipeline-ing	Thomas Müller	2014-02-20	2	-25/+91
\| * \| \| \|	enable static delivery of css files	Thomas Müller	2014-02-20	1	-1/+1
\| * \| \| \|	reference 3rdparty branch add-assetic	Thomas Müller	2014-02-20	1	-0/+0
\| * \| \| \|	kill references to core.js and core.css	Thomas Müller	2014-02-20	2	-17/+0
\| * \| \| \|	kill old minimizer code	Thomas Müller	2014-02-20	6	-149/+4
\| * \| \| \|	fixing js syntax error	Thomas Müller	2014-02-20	1	-3/+3
* \| \| \| \|	Merge pull request #7358 from owncloud/xmlfix-3rdparty	Vincent Petry	2014-02-21	1	-0/+0
\|\ \ \ \ \
\| * \| \| \| \|	Updated submodule to include XML processing fixes	Vincent Petry	2014-02-21	1	-0/+0
* \| \| \| \| \|	Merge pull request #7355 from owncloud/new-menu-svg	icewind1991	2014-02-21	3	-13/+34
\|\ \ \ \ \ \
\| * \| \| \| \| \|	fix too much distance between text and icon	Jan-Christoph Borchardt	2014-02-21	1	-1/+1
\| * \| \| \| \| \|	use SVG icons from icons.css for New file menu	Jan-Christoph Borchardt	2014-02-21	3	-13/+34
\| \|/ / / / /
* \| \| \| \| \|	Merge pull request #7088 from owncloud/sharing-userspathbug	icewind1991	2014-02-21	2	-19/+130
\|\ \ \ \ \ \
\| * \ \ \ \ \	Merge branch 'master' into sharing-userspathbug	Robin Appelman	2014-02-21	8	-15/+59
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	fix test so that it doesn't depend on the array order	Bjoern Schiessle	2014-02-21	1	-14/+25
\| * \| \| \| \| \| \|	fix usersPath and add unit tests	Bjoern Schiessle	2014-02-21	2	-10/+110
* \| \| \| \| \| \| \|	Merge pull request #7351 from owncloud/fix_thumbnails_for_conflicts_in_subdirs	Morris Jobke	2014-02-21	1	-1/+1
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	use directory from original instead of current dir	Jörn Friedrich Dreyer	2014-02-21	1	-1/+1
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #7336 from owncloud/IE-wipho-viewport	icewind1991	2014-02-21	1	-0/+11
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	fix viewport size on windows phone	Robin Appelman	2014-02-20	1	-0/+11
* \| \| \| \| \| \| \| \|	Merge pull request #7292 from owncloud/sharing_tests	Björn Schießle	2014-02-21	2	-7/+7
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	fix sharing unit tests	Bjoern Schiessle	2014-02-21	2	-7/+7
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #7350 from owncloud/config-gitignore	Thomas Müller	2014-02-21	1	-0/+1
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	ignore optional additional config files	Morris Jobke	2014-02-21	1	-0/+1
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #7337 from owncloud/test_for_6935	Björn Schießle	2014-02-21	1	-0/+34
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	add unit test for \OC\URLGenerator::getAbsoluteURL to verify #6935	Bjoern Schiessle	2014-02-20	1	-0/+34
* \| \| \| \| \| \|	Merge pull request #7309 from owncloud/mobile-header	Morris Jobke	2014-02-21	8	-15/+59
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'master' into mobile-header	Robin Appelman	2014-02-21	47	-267/+779
\| \|\ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #7347 from owncloud/patch-headers-already-sent	Morris Jobke	2014-02-21	2	-1/+1
\|\ \ \ \ \ \ \
\| * \ \ \ \ \ \	Merge branch 'master' into patch-headers-already-sent	Robin Appelman	2014-02-21	1	-15/+0
\| \|\ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #7348 from owncloud/remove-problematic-test	icewind1991	2014-02-21	1	-15/+0
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Remove unit tests which causes the filesystem tests to fail	Robin Appelman	2014-02-21	1	-15/+0
\|/ / / / / / /
\| * \| \| \| \| \|	Remove `session_id_regenerate` from here	Lukas Reschke	2014-02-21	1	-1/+0
\| * \| \| \| \| \|	Move session_regenerate_id to `login()`	Lukas Reschke	2014-02-21	1	-0/+1
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #7312 from owncloud/ldap_fix_add_test	Thomas Müller	2014-02-21	2	-3/+169
\|\ \ \ \ \ \
\| * \| \| \| \| \|	LDAP: fix and extend tests	Arthur Schiwon	2014-02-20	2	-3/+169
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #7291 from owncloud/adminess-raghu	Lukas Reschke	2014-02-20	5	-26/+3
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \|
\| * \| \| \| \|	Fix typo	Lukas Reschke	2014-02-20	1	-1/+1
\| * \| \| \| \|	Variable value is expected and not an echoed output	Lukas Reschke	2014-02-20	1	-1/+1
\| * \| \| \| \|	Move oc_isadmin to the config JS script	Lukas Reschke	2014-02-20	3	-2/+2
\| * \| \| \| \|	Move isadmin to template and rename it to oc_isadmin	Lukas Reschke	2014-02-19	6	-27/+4
* \| \| \| \| \|	Merge pull request #7332 from owncloud/IE10-viewport	Morris Jobke	2014-02-20	1	-0/+5
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \|