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 pull request #11982 from owncloud/bower-underscore	Vincent Petry	2014-11-06	1	-1/+1
\|\ \| \| \| \|	bower underscore
\| *	bower underscore	Morris Jobke	2014-11-05	1	-1/+1
\| \|
* \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2014-11-06	2	-0/+2
\|/
*	Merge pull request #11936 from owncloud/bower-jquery	Lukas Reschke	2014-11-05	1	-2/+2
\|\ \| \| \| \|	Bower jquery
\| *	migrate jQuery to bower	Morris Jobke	2014-11-04	1	-2/+2
\| \|
* \|	Merge pull request #11965 from owncloud/fix-jsonresponse	Thomas Müller	2014-11-05	1	-1/+1
\|\ \ \| \| \| \| \| \|	fix typo in content type for JSONResponse
\| * \|	fix typo in content type	Bernhard Posselt	2014-11-05	1	-1/+1
\| \| \|
* \| \|	Merge pull request #11928 from owncloud/support-HTML-in-logo	Thomas Müller	2014-11-05	2	-0/+20
\|\ \ \ \| \|/ / \|/\| \|	Support HTML in logo
\| * \|	Support HTML in logo claim	Lukas Reschke	2014-11-03	2	-0/+20
\| \| \|
* \| \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2014-11-05	2	-0/+2
\| \| \|
* \| \|	fix shortcuts - underline instead of camelCase	Morris Jobke	2014-11-04	1	-2/+2
\| \|/ \|/\|
* \|	Merge pull request #11916 from owncloud/introduce-bower	Morris Jobke	2014-11-04	3	-17/+75
\|\ \ \| \| \| \| \| \|	Introduce bower dependency managment for frontend libraries
\| * \|	replace moment.js with bower version	Morris Jobke	2014-11-03	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	* fix JS unit tests
\| * \|	ability to add bower resources	Morris Jobke	2014-11-03	2	-16/+74
\| \|/ \| \| \| \| \| \| \| \| \| \|	* add addVendorScript & addVendorStyle * refactoring of addScript and addStyle * add shortcuts vendorScript and vendorStyle
* \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2014-11-04	2	-2/+2
\| \|
* \|	Merge pull request #11924 from owncloud/firstCheckIfItIsDefaultConfig	Morris Jobke	2014-11-03	1	-1/+1
\|\ \ \| \|/ \|/\|	First check whether it is the default config before touching
\| *	First check whether it is the default config before touchign	Lukas Reschke	2014-11-03	1	-1/+1
\| \| \| \| \| \| \| \|	Potentially fixes https://github.com/owncloud/core/issues/11678
* \|	Update Pimple to V3.0	Thomas Müller	2014-11-03	3	-15/+17
\| \|
* \|	Update Symfony/Console to 2.5 & Update Symfony/Routing to 2.5	Thomas Müller	2014-11-03	1	-2/+0
\|/
*	fix odd behaviour	Morris Jobke	2014-10-31	1	-4/+8
\|
*	Merge pull request #9044 from owncloud/add-missing-email-principal	Vincent Petry	2014-10-31	1	-0/+12
\|\ \| \| \| \|	adding missing email address for principal
\| *	adding missing email address for principal	libasys	2014-10-24	1	-0/+12
\| \| \| \| \| \| \| \| \| \|	* fix #8515 * add mail only if it exists
* \|	Merge pull request #11539 from owncloud/mount-setup-once	Vincent Petry	2014-10-31	1	-1/+6
\|\ \ \| \| \| \| \| \|	Only mount the storages for the user once
\| * \|	Reset the users setup after clearing mounts	Robin Appelman	2014-10-28	1	-0/+1
\| \| \|
\| * \|	Only mount the storages for the user once	Robin Appelman	2014-10-27	1	-1/+5
\| \| \|
* \| \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2014-10-31	2	-2/+14
\| \| \|
* \| \|	Merge pull request #11877 from owncloud/fix-11875-master	Morris Jobke	2014-10-30	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \|	prevent PHP notice
\| * \| \|	prevent PHP notice	Thomas Müller	2014-10-30	1	-1/+1
\| \| \| \|
* \| \| \|	Merge pull request #11080 from owncloud/addheader-text-2	Vincent Petry	2014-10-30	3	-11/+28
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Fix the addHeader tag attributes text methods to not ignore the text parameter
\| * \| \| \|	Fix the "addHeader($tag, $attributes, $text)" methods to not ignore the ↵	Lukas Reschke	2014-10-28	3	-11/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	$text parameter Also support closing tags with no text content given Conflicts: lib/private/template.php
* \| \| \| \|	Merge pull request #11740 from owncloud/update-archive-tar	Thomas Müller	2014-10-30	1	-2/+0
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Update pear/archive_tar to 1.3.13
\| * \| \| \| \|	Update pear/archive_tar to 1.3.13	Thomas Müller	2014-10-30	1	-2/+0
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #11864 from owncloud/clear-session-after-logout	Lukas Reschke	2014-10-30	1	-0/+1
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \|	Clear session after logout
\| * \| \| \| \|	Clear session after logout	Lukas Reschke	2014-10-30	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes https://github.com/owncloud/core/issues/8420
* \| \| \| \| \|	Merge pull request #11858 from owncloud/fix-11064	Morris Jobke	2014-10-30	1	-1/+2
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|	Allow any outgoing XHR connections
\| * \| \| \| \|	Allow any outgoing XHR connections	Lukas Reschke	2014-10-30	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Quickfix for https://github.com/owncloud/core/issues/11064
* \| \| \| \| \|	Merge pull request #11860 from owncloud/fix-stupid-error-because-im-a-moro	Thomas Müller	2014-10-30	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix stupid copy paste fail
\| * \| \| \| \| \|	Fix stupid copy paste fail	Lukas Reschke	2014-10-30	1	-1/+1
\| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \|	...
* \| \| \| \| \|	Merge pull request #11821 from owncloud/generic-response	Morris Jobke	2014-10-30	4	-5/+107
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|	Add a generic data response
\| * \| \| \| \|	add dataresponse	Bernhard Posselt	2014-10-29	4	-5/+107
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix docstrings adjust copyright date another copyright date update another header update implement third headers argument, fix indention, fix docstrings fix docstrings
* \| \| \| \| \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2014-10-30	20	-10/+298
\| \|/ / / / \|/\| \| \| \|
* \| \| \| \|	Merge pull request #11409 from owncloud/watcher-reuse	Vincent Petry	2014-10-29	2	-22/+32
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Pass the cached data to the filesystem watcher
\| * \| \| \| \|	Better reuse of cache data for getFolderContents	Robin Appelman	2014-10-24	1	-6/+11
\| \| \| \| \| \|
\| * \| \| \| \|	Pass the cached data to the filesystem watcher	Robin Appelman	2014-10-24	2	-16/+21
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	Merge pull request #11638 from owncloud/oc8-translations	Thomas Müller	2014-10-29	357	-5645/+11051
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	[OC8] Load javascript translations using standard web technologies
\| * \| \| \| \|	Fix implementation of translation short cut	Thomas Müller	2014-10-29	1	-9/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Fix language file detection	Vincent Petry	2014-10-29	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	update all translation files to js and json	Thomas Müller	2014-10-29	351	-5599/+10972
\| \| \| \| \| \|
\| * \| \| \| \|	adding console command to generate javascript translation files based on ↵	Thomas Müller	2014-10-29	1	-31/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	existing php translation files read server side translations from json files
\| * \| \| \| \|	Include core translations	Vincent Petry	2014-10-29	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moved search result type translations to search.js Load JS translations earlier Translations need to be loaded earlier to make sure that some JS files like search.js get access to translations at this time. This requires the template initialization to be moved to after session initialization, because only after the session we have access to the current language.