Björn Schießle 13017ce9e1 Merge branch 'master' into files_encryption_check_private_key ... Conflicts: settings/ajax/changepassword.php		2013-06-10 12:12:07 +02:00
..
ajax	port 22c8194cc8	2013-04-02 21:03:13 +02:00
css	Added input[type="url"] to styles.css	2013-06-04 16:04:29 +02:00
doc	rename to doc	2012-12-14 14:39:05 +01:00
img	Add shellscript for optimization.	2013-04-13 10:40:46 +02:00
js	Set default button in oc-dialogs	2013-06-03 03:31:33 +02:00
l10n	[tx-robot] updated from transifex	2013-06-08 02:13:41 +02:00
lostpassword	print a warning if a user wants to reset his password and encryption is enabled	2013-06-05 18:38:39 +02:00
templates	Merge pull request #3179 from pawl/patch-1	2013-05-28 05:18:43 -07:00
minimizer.php	adding space between) and {	2012-09-07 15:22:01 +02:00
routes.php	implemented a heartbeat request which is calls the server every 15 minutes to prevent a session timeout	2013-02-26 19:34:46 +01:00
setup.php	Suppress the notice from the nullbyte check	2013-04-09 21:11:44 +02:00
strings.php	remove superfluous ?> at the end of .php files (left out apps/*/templates)	2012-07-09 16:51:16 +02:00