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

	Commit message (Collapse)	Author	Age	Files	Lines
*	[tx-robot] updated from transifex	Jenkins for ownCloud	2014-03-27	176	-1740/+1781
\|
*	Merge pull request #7893 from owncloud/no-routed-link-for-css-files	Thomas Müller	2014-03-26	1	-1/+1
\|\ \| \| \| \|	css files are not to be routed through index.php anymore
\| *	css files are not to be routed through index.php anymore	Thomas Müller	2014-03-26	1	-1/+1
\| \|
* \|	Merge pull request #7896 from Xenopathic/misc_text_fixes	Thomas Müller	2014-03-26	4	-5/+5
\|\ \ \| \| \| \| \| \|	Miscellaneous text fixes for core apps
\| * \|	Miscellaneous text fixes for core apps	Robin McCorkell	2014-03-26	4	-5/+5
\| \|/
* \|	Merge pull request #7889 from owncloud/routing-warning	Vincent Petry	2014-03-26	1	-1/+1
\|\ \ \| \|/ \|/\|	Fix undefined index warning in router
\| *	fix undefined index warning in router	Robin Appelman	2014-03-26	1	-1/+1
\| \|
* \|	Merge pull request #7888 from owncloud/extstorage-multiplemountpointconfig	Vincent Petry	2014-03-26	3	-51/+242
\|\ \ \| \| \| \| \| \|	Fix merging of external storage configurations
\| * \|	Fix merging of external storage configurations	Vincent Petry	2014-03-26	3	-51/+242
\| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merging of configurations is whenever the same config is available for multiple users/groups, in which case the config is considered as a single one by the UI, and shows multiple users/groups selected. Fixed merging logic to make sure that class, mount point and options are the same before merging them. Fixed merging to work correctly when the same mount point path is used for separate users and configs. These are now correctly shows in the UI as separate entries.
* \|	Merge pull request #7885 from owncloud/extstorage-prettyprintjson	Vincent Petry	2014-03-26	1	-1/+6
\|\ \ \| \|/ \|/\|	Pretty print mount.json when possible
\| *	Pretty print mount.json when possible	Vincent Petry	2014-03-26	1	-1/+6
\|/
*	[tx-robot] updated from transifex	Jenkins for ownCloud	2014-03-26	125	-5946/+10973
\|
*	Merge pull request #7748 from owncloud/postgresversionwarning	Thomas Müller	2014-03-25	1	-0/+35
\|\ \| \| \| \|	Added PostgreSQL version warning on upgrade
\| *	fixing code style	Thomas Müller	2014-03-25	1	-2/+1
\| \|
\| *	Log exception when PostgreSQL version check failed	Vincent Petry	2014-03-24	1	-1/+3
\| \|
\| *	Added PostgreSQL version warning on upgrade	Vincent Petry	2014-03-17	1	-0/+34
\| \|
* \|	Merge pull request #7864 from owncloud/routing-performance	Thomas Müller	2014-03-25	6	-27/+106
\|\ \ \| \| \| \| \| \|	Routing performance
\| * \|	update type hint in PHPDoc	Thomas Müller	2014-03-25	2	-2/+3
\| \| \|
\| * \|	Fix routes getting lost when loading app routes twice	Robin Appelman	2014-03-25	1	-7/+9
\| \| \|
\| * \|	fix incorect array	Robin Appelman	2014-03-25	1	-1/+1
\| \| \|
\| * \|	Only load core routes for ocs and settings	Robin Appelman	2014-03-25	1	-1/+2
\| \| \|
\| * \|	Only load core routes when matching a core route	Robin Appelman	2014-03-24	1	-3/+5
\| \| \|
\| * \|	Cache generated urls for routes	Robin Appelman	2014-03-24	1	-0/+43
\| \| \|
\| * \|	Only load routes from the apps we need	Robin Appelman	2014-03-24	2	-14/+38
\| \| \|
\| * \|	Load the routes when matching or generating a route instead of when creating ↵	Robin Appelman	2014-03-24	3	-7/+13
\| \| \| \| \| \| \| \| \| \| \| \|	the router
* \| \|	Merge pull request #7325 from owncloud/recursive-mkdir-local	Thomas Müller	2014-03-25	2	-2/+2
\|\ \ \ \| \| \| \| \| \| \| \|	Recursive mkdir fixes #7047
\| * \ \	Merge branch 'master' into recursive-mkdir-local	Robin Appelman	2014-02-21	43	-184/+523
\| \|\ \ \
\| * \| \| \|	Also make "regular" local storage's mkdir recursive	Robin Appelman	2014-02-20	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Recursive mkdir fixes #7047	Joshua Medeiros	2014-02-20	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge pull request #7420 from owncloud/cachehooks-first	Thomas Müller	2014-03-25	4	-14/+28
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Manually triger the filecache update hooks before any other hook
\| * \ \ \ \	Merge branch 'master' into cachehooks-first	Robin Appelman	2014-03-13	1568	-49537/+81566
\| \|\ \ \ \ \
\| * \| \| \| \| \|	Fix check if fileinfo is valid	Robin Appelman	2014-03-06	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix updater when getFileInfo fails	Robin Appelman	2014-03-03	1	-1/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Also send explicit cache hooks when calling file_put_contents with a resource	Robin Appelman	2014-02-28	1	-0/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Manually triger the filecache update hooks before any other hook	Robin Appelman	2014-02-26	3	-12/+20
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #7477 from owncloud/foldersize-reuse	Thomas Müller	2014-03-25	6	-16/+29
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow re-using already known fileinfo when calculating folder sizes
\| * \ \ \ \ \ \	Merge branch 'master' into foldersize-reuse	Robin Appelman	2014-03-11	1480	-49207/+79239
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: lib/private/files/cache/homecache.php
\| * \| \| \| \| \| \| \|	Check if fields we need are actually set to prevent errors	Robin Appelman	2014-03-03	2	-3/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Remove assert since the root size of the home storage is no longer calculated	Robin Appelman	2014-03-03	1	-1/+0
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Allow re-using already known fileinfo when calculating folder sizes	Robin Appelman	2014-02-28	5	-13/+27
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #7772 from owncloud/filter_more_jsconsole	VicDeo	2014-03-25	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also replace console.time/timeEnd when not in DEBUG mode
\| * \| \| \| \| \| \| \| \|	Replace console.time/timeEnd	Thomas Tanghus	2014-03-17	1	-1/+1
\| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #7689 from owncloud/last_cron_log	Vincent Petry	2014-03-25	6	-8/+47
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Log last cron execution
\| * \| \| \| \| \| \| \| \|	Move success/error squircles to settings	kondou	2014-03-21	2	-7/+9
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'master' of https://github.com/owncloud/core into last_cron_log	kondou	2014-03-21	592	-6594/+7409
\| \|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Use OC_Util::formatDate()	kondou	2014-03-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Move cron status to the right of the heading	kondou	2014-03-12	2	-18/+22
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Log last cron execution	kondou	2014-03-12	5	-0/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #2012
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #7867 from owncloud/upload-dontclosesessionforencryption	Thomas Müller	2014-03-25	1	-1/+4
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix public upload to not close session when encryption is on
\| * \| \| \| \| \| \| \| \| \| \|	Fix public upload to not close session when encryption is on	Vincent Petry	2014-03-24	1	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The encryption app needs to create keys when uploading files, so the session needs to be kept open in such case.