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 #16099 from labkode/prevent-preview-hooks	Joas Schilling	2015-05-06	1	-1/+3
\|\
\| *	Do not trigger preview hooks if enable_previews is false	Hugo Gonzalez Labrador	2015-05-06	1	-10/+10
\| *	Do not trigger preview hooks if enable_previews is false	Hugo Gonzalez Labrador	2015-05-06	1	-7/+9
* \|	Merge pull request #16116 from owncloud/encryption-l10n-settings	Morris Jobke	2015-05-06	1	-9/+5
\|\ \
\| * \|	kill new lines in l10n strings	Morris Jobke	2015-05-06	1	-6/+2
\| * \|	Add l10n support to encryption settings	Morris Jobke	2015-05-06	1	-5/+5
* \| \|	Merge pull request #15880 from owncloud/check_if_encryption_is_enabled	Björn Schießle	2015-05-06	3	-75/+111
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	unit tests	Bjoern Schiessle	2015-05-06	2	-42/+69
\| * \|	check if encryption is enbaled before we start moving keys	Bjoern Schiessle	2015-05-06	2	-34/+43
* \| \|	Merge pull request #16098 from owncloud/remove-phpmailer	Lukas Reschke	2015-05-06	1	-0/+0
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Remove phpmailer from 3rdparty	Joas Schilling	2015-05-06	1	-0/+0
* \| \|	Merge pull request #16067 from owncloud/verbosity-in-app-code-check	Lukas Reschke	2015-05-06	2	-7/+18
\|\ \ \
\| * \| \|	Add verbosity option to app:check-code	Morris Jobke	2015-05-05	2	-7/+18
* \| \| \|	Merge pull request #16070 from owncloud/enc_update_file_cache_on_copy	Morris Jobke	2015-05-06	2	-11/+45
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|
\| * \| \|	make sure that we keep the correct encrypted-flag and the (unencrypted)size i...	Bjoern Schiessle	2015-05-05	2	-11/+45
\| \|/ /
* \| \|	Merge pull request #16072 from owncloud/phpdoc-cache	Morris Jobke	2015-05-06	4	-30/+139
\|\ \ \
\| * \| \|	improve phpdoc of cache classes	Robin Appelman	2015-05-05	4	-30/+139
\| \|/ /
* \| \|	Merge pull request #16017 from owncloud/proper-update-notification	Morris Jobke	2015-05-06	3	-4/+36
\|\ \ \
\| * \| \|	Use OC.Notification for update notifications	Morris Jobke	2015-05-03	3	-4/+36
* \| \| \|	Merge pull request #16050 from owncloud/add-workaround-for-populate-raw-post-...	Jörn Friedrich Dreyer	2015-05-06	2	-24/+3
\|\ \ \ \
\| * \| \| \|	Don't depend on always_populate_raw_post_data	Lukas Reschke	2015-05-05	1	-19/+0
\| * \| \| \|	Don't display errors and log them	Lukas Reschke	2015-05-05	1	-5/+3
\| \| \|/ / \| \|/\| \|
* \| \| \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2015-05-06	42	-38/+176
* \| \| \|	Merge pull request #16037 from owncloud/enc_dont_disable_encryption	Jan-Christoph Borchardt	2015-05-05	4	-16/+29
\|\ \ \ \
\| * \| \| \|	Don't highlight disabled labels on hover	Morris Jobke	2015-05-05	1	-0/+4
\| * \| \| \|	fix label reference	Morris Jobke	2015-05-05	1	-1/+1
\| * \| \| \|	adjust wording and add button to confirm encryption	Bjoern Schiessle	2015-05-05	2	-15/+15
\| * \| \| \|	don't let the the user disable encryption once it was activated	Bjoern Schiessle	2015-05-04	3	-1/+10
* \| \| \| \|	Merge pull request #16069 from owncloud/fix-15933	blizzz	2015-05-05	3	-2/+1
\|\ \ \ \ \
\| * \| \| \| \|	cleanup	Arthur Schiwon	2015-05-05	2	-2/+0
\| * \| \| \| \|	not only send them back but also apply defaults to a new configuration. Fixes...	Arthur Schiwon	2015-05-05	1	-0/+1
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge pull request #16064 from owncloud/fix-empty-mail-address	Jan-Christoph Borchardt	2015-05-05	3	-5/+81
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \|
\| * \| \| \|	Add test for setEmailAddress	Joas Schilling	2015-05-05	1	-0/+70
\| * \| \| \|	Allow user to set an empty email address	Morris Jobke	2015-05-05	2	-5/+11
* \| \| \| \|	Merge pull request #16065 from owncloud/check-binaryops-in-code-checker	Morris Jobke	2015-05-05	6	-2/+76
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|
\| * \| \| \|	add positive tests for operator in code checker	Morris Jobke	2015-05-05	2	-0/+30
\| * \| \| \|	Check usage of != and == - refs #16054	Thomas Müller	2015-05-05	5	-2/+46
\|/ / / /
* \| \| \|	Merge pull request #16045 from owncloud/reduce-autotest-hhvm	Thomas Müller	2015-05-05	2	-219/+23
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Combine autotest-hhvm.sh with autotest.sh	Andreas Fischer	2015-05-04	2	-219/+23
* \| \| \|	Merge pull request #16058 from owncloud/fix-app-check-code-parameter-description	Morris Jobke	2015-05-05	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Fix the "app-id" parameter description of app:check-code	Joas Schilling	2015-05-05	1	-1/+1
* \| \| \| \|	Merge pull request #16052 from owncloud/fix-phpdoc-sharecontroller	Joas Schilling	2015-05-05	1	-0/+1
\|\ \ \ \ \
\| * \| \| \| \|	Fix PHPDoc for the ext. share controller	Lukas Reschke	2015-05-04	1	-0/+1
* \| \| \| \| \|	Merge pull request #15938 from owncloud/enc_update_recovery_share_key	Björn Schießle	2015-05-05	8	-44/+92
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Allow setting protected properties	Joas Schilling	2015-04-30	1	-0/+4
\| * \| \| \| \| \|	check recovery setting for the right user	Bjoern Schiessle	2015-04-30	8	-44/+92
* \| \| \| \| \| \|	Merge pull request #16031 from owncloud/fix-15953-master	Jan-Christoph Borchardt	2015-05-05	1	-9/+9
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	fix l10n strings	Thomas Müller	2015-05-04	1	-8/+2
\| * \| \| \| \| \|	no link if there is no detailpage property set - fixes #15953	Thomas Müller	2015-05-04	1	-1/+7
\| \| \|_\|_\|/ / \| \|/\| \| \| \|
* \| \| \| \| \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2015-05-05	196	-474/+420