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

	Commit message (Collapse)	Author	Age	Files	Lines
*	some error handling in case the recovery password is wrong	Björn Schießle	2013-05-16	2	-2/+9
\|
*	allow admin to recover users files in case of password lost	Björn Schießle	2013-05-16	11	-30/+159
\|
*	improved tests for touch	Florin Peter	2013-05-16	1	-1/+22
\|
*	added tests for put content, get content, touch and fopen	Florin Peter	2013-05-16	3	-3/+76
\|
*	fix for re-share and removed check if file exists because we are sometime ↵	Florin Peter	2013-05-16	2	-14/+22
\| \| \| \|	into a pre_put_contents hook
*	fix if file is not yet created	Florin Peter	2013-05-16	1	-2/+7
\|
*	added test for share with group	Florin Peter	2013-05-16	1	-0/+74
\|
*	added test for rename folder	Florin Peter	2013-05-15	1	-2/+34
\|
*	removed unused code	Florin Peter	2013-05-15	2	-40/+1
\|
*	added test for password change	Florin Peter	2013-05-15	1	-0/+34
\|
*	Merge branch 'files_encryption' of github.com:owncloud/core into ↵	Björn Schießle	2013-05-15	1	-25/+28
\|\ \| \| \| \| \| \|	files_encryption
\| *	fix for SQLite3Result::fetchArray(): The SQLite3Result object has not been ↵	Florin Peter	2013-05-15	1	-25/+28
\| \| \| \| \| \| \| \|	correctly initialised in post_addToGroup
* \|	add recovery key to all files if the user enabled the feature and removes ↵	Björn Schießle	2013-05-15	3	-1/+42
\|/ \| \| \|	them again on disable
*	added missing file to enable the admin to change the recovery key password	Björn Schießle	2013-05-15	1	-0/+52
\|
*	Merge branch 'files_encryption' of github.com:owncloud/core into ↵	Björn Schießle	2013-05-15	2	-33/+25
\|\ \| \| \| \| \| \|	files_encryption
\| *	fix for broken tests	Florin Peter	2013-05-15	1	-13/+4
\| \|
\| *	fix for previous workaround	Florin Peter	2013-05-15	1	-20/+21
\| \|
* \|	enable admin to change the recovery password	Björn Schießle	2013-05-15	5	-28/+118
\|/
*	check if the user knows the correct recovery password before changing the ↵	Björn Schießle	2013-05-15	5	-20/+63
\| \| \| \|	recovery key settings
*	Merge branch 'files_encryption' of github.com:owncloud/core into ↵	Björn Schießle	2013-05-15	1203	-18129/+22711
\|\ \| \| \| \| \| \|	files_encryption
\| *	workaround for blank page need an other solution	Florin Peter	2013-05-15	1	-20/+20
\| \|
\| *	improved files_encryption tests	Florin Peter	2013-05-15	4	-4/+4
\| \|
\| *	removed FileProxy from test	Florin Peter	2013-05-15	1	-5/+6
\| \|
\| *	merge changes for files_encryption	Florin Peter	2013-05-15	1	-40/+42
\| \|
\| *	fix for losing mount point "/"	Florin Peter	2013-05-15	1	-1/+4
\| \|
\| *	Merge branch 'files_encryption' of https://github.com/owncloud/core into ↵	Florin Peter	2013-05-15	49	-832/+2464
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	files_encryption Conflicts: apps/files/l10n/ar.php apps/files/l10n/bn_BD.php apps/files/l10n/de.php apps/files/l10n/de_DE.php apps/files/l10n/el.php apps/files/l10n/es.php apps/files/l10n/fa.php apps/files/l10n/fr.php apps/files/l10n/gl.php apps/files/l10n/id.php apps/files/l10n/ko.php apps/files/l10n/nl.php apps/files/l10n/nn_NO.php apps/files/l10n/pl.php apps/files/l10n/pt_BR.php apps/files/l10n/pt_PT.php apps/files/l10n/ro.php apps/files/l10n/ru.php apps/files/l10n/sl.php apps/files/l10n/uk.php apps/files/l10n/vi.php apps/files_encryption/l10n/ca.php apps/files_sharing/lib/cache.php apps/files_sharing/lib/sharedstorage.php apps/user_ldap/l10n/tr.php core/l10n/cs_CZ.php core/l10n/de.php core/l10n/de_DE.php core/l10n/ru.php core/l10n/sk_SK.php core/l10n/tr.php core/l10n/vi.php core/l10n/zh_CN.php l10n/af_ZA/files.po l10n/ar/files.po l10n/be/files.po l10n/bg_BG/files.po l10n/bn_BD/files.po l10n/ca/files.po l10n/ca/files_encryption.po l10n/cs_CZ/core.po l10n/cs_CZ/files.po l10n/da/files.po l10n/da/settings.po l10n/de/core.po l10n/de/files.po l10n/de/files_encryption.po l10n/de/files_external.po l10n/de/files_sharing.po l10n/de/files_trashbin.po l10n/de/files_versions.po l10n/de/lib.po l10n/de/settings.po l10n/de/user_ldap.po l10n/de_DE/files.po l10n/de_DE/files_encryption.po l10n/de_DE/files_external.po l10n/de_DE/files_sharing.po l10n/de_DE/files_trashbin.po l10n/de_DE/lib.po l10n/de_DE/settings.po l10n/de_DE/user_ldap.po l10n/el/files.po l10n/eo/files.po l10n/es/files.po l10n/es/lib.po l10n/es/settings.po l10n/es_AR/files.po l10n/eu/files.po l10n/fa/files.po l10n/fi/files.po l10n/fi_FI/files.po l10n/fr/core.po l10n/fr/files.po l10n/gl/files.po l10n/gl/settings.po l10n/he/core.po l10n/he/files.po l10n/he/user_ldap.po l10n/hi/files.po l10n/hr/files.po l10n/hu_HU/core.po l10n/hu_HU/files.po l10n/hu_HU/files_external.po l10n/hu_HU/settings.po l10n/hy/files.po l10n/ia/core.po l10n/ia/files.po l10n/ia/files_trashbin.po l10n/ia/settings.po l10n/id/files.po l10n/is/files.po l10n/it/files.po l10n/ja_JP/files.po l10n/ja_JP/user_ldap.po l10n/ka/files.po l10n/ka_GE/files.po l10n/kn/files.po l10n/ko/files.po l10n/ko/files_trashbin.po l10n/ko/settings.po l10n/ku_IQ/files.po l10n/lb/files.po l10n/lt_LT/core.po l10n/lt_LT/files.po l10n/lv/files.po l10n/mk/files.po l10n/ms_MY/files.po l10n/my_MM/files.po l10n/nb_NO/files.po l10n/ne/files.po l10n/nl/core.po l10n/nl/files.po l10n/nn_NO/files.po l10n/oc/files.po l10n/pl/files.po l10n/pl_PL/files.po l10n/pt_BR/files.po l10n/pt_PT/core.po l10n/pt_PT/files.po l10n/pt_PT/files_external.po l10n/pt_PT/settings.po l10n/ro/files.po l10n/ru/core.po l10n/ru/files.po l10n/si_LK/files.po l10n/sk/files.po l10n/sk_SK/core.po l10n/sk_SK/files.po l10n/sl/core.po l10n/sl/files.po l10n/sq/files.po l10n/sr/files.po l10n/sr@latin/files.po l10n/sv/files.po l10n/sw_KE/files.po l10n/ta_LK/files.po l10n/te/files.po l10n/th_TH/files.po l10n/tr/core.po l10n/tr/files.po l10n/tr/lib.po l10n/tr/settings.po l10n/tr/user_ldap.po l10n/uk/files.po l10n/ur_PK/files.po l10n/vi/core.po l10n/vi/files.po l10n/vi/files_external.po l10n/zh_CN.GB2312/files.po l10n/zh_CN/core.po l10n/zh_CN/files.po l10n/zh_CN/settings.po l10n/zh_HK/files.po l10n/zh_TW/core.po l10n/zh_TW/files.po l10n/zh_TW/files_versions.po l10n/zh_TW/settings.po l10n/zh_TW/user_ldap.po lib/base.php lib/files/filesystem.php lib/files/view.php lib/public/share.php settings/l10n/es.php settings/l10n/pt_PT.php settings/l10n/tr.php settings/l10n/zh_CN.php settings/personal.php
\| * \	Merge branch 'master' into files_encryption	Florin Peter	2013-05-15	1242	-19019/+23988
\| \|\ \
\| \| * \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2013-05-15	133	-2828/+3136
\| \| \| \|
\| \| * \|	Merge pull request #2821 from owncloud/fix-2159-rename-to-shared	Thomas Müller	2013-05-14	3	-19/+230
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \|	fix allowed rename of folder in root directory to reserved name "Shared"
\| \| \| * \|	[files] add private declaration of $view	Morris Jobke	2013-05-14	1	-0/+1
\| \| \| \| \|
\| \| \| * \|	[files] fix mock creation and remove hardcoded 'require' statement	Morris Jobke	2013-05-12	2	-7/+2
\| \| \| \| \|
\| \| \| * \|	[files] rename lib to "App"	Morris Jobke	2013-05-12	3	-7/+7
\| \| \| \| \|
\| \| \| * \|	[files] ownCloud typo	Morris Jobke	2013-05-12	1	-1/+1
\| \| \| \| \|
\| \| \| * \|	[files] rename test class and add rename test	Morris Jobke	2013-05-12	1	-1/+22
\| \| \| \| \|
\| \| \| * \|	[files] remove realpath in test	Morris Jobke	2013-05-12	1	-1/+1
\| \| \| \| \|
\| \| \| * \|	[files] rename tests	Morris Jobke	2013-05-12	1	-0/+99
\| \| \| \| \|
\| \| \| * \|	[files] remove normalizePath on rename and dependency injection	Morris Jobke	2013-05-12	2	-7/+8
\| \| \| \| \|
\| \| \| * \|	[files] kill stripslashes	Morris Jobke	2013-05-12	1	-3/+3
\| \| \| \| \|
\| \| \| * \|	[files] fix typos	Morris Jobke	2013-05-12	1	-5/+5
\| \| \| \| \|
\| \| \| * \|	[files] refactoring	Morris Jobke	2013-05-12	2	-19/+111
\| \| \| \| \|
\| \| \| * \|	string comparision	Morris Jobke	2013-05-12	1	-1/+1
\| \| \| \| \|
\| \| \| * \|	wrong root dir name	Morris Jobke	2013-05-12	1	-2/+2
\| \| \| \| \|
\| \| \| * \|	fix allowed rename of folder in root directory to reserved name "Shared"	Morris Jobke	2013-05-12	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	refs #2159
\| \| * \| \|	fix history template, print_unescaped() needs to include closing tags	Björn Schießle	2013-05-14	1	-4/+4
\| \| \| \| \|
\| \| * \| \|	Merge pull request #3338 from owncloud/button_color_fix	Raghu Nayyar	2013-05-14	1	-2/+4
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Keeping Font Colors Consistant on the headers.
\| \| \| * \| \|	color change to crumb elements as well.	raghunayyar	2013-05-14	1	-1/+1
\| \| \| \| \| \|
\| \| \| * \| \|	Keeping Font Colors Consistant on the headers.	raghunayyar	2013-05-13	1	-1/+3
\| \| \| \| \| \|
\| \| * \| \| \|	Merge pull request #3330 from owncloud/preselect_filename_on_rename	Morris Jobke	2013-05-14	2	-0/+27
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	peselect filename without extension on rename
\| \| \| * \| \| \|	peselect filename without extension on rename	Jörn Friedrich Dreyer	2013-05-13	2	-0/+27
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2013-05-14	11	-11/+11
\| \| \| \|/ / / \| \| \|/\| \| \|