Commit graph

7 commits

Author SHA1 Message Date
Björn Schießle
3fc5b34247 Merge branch 'master' into encryption_check_php_version
Conflicts:
	apps/files_encryption/files/error.php
2013-07-02 13:54:31 +02:00
Björn Schießle
29dd7eda2d improved error message 2013-07-02 10:11:42 +02:00
Thomas Müller
3b1018ec00 no ?> at the end of a file
missing .
2013-07-01 21:13:04 +02:00
Björn Schießle
be324fad1c tell the user what he can do to regain access to his files 2013-06-05 14:19:26 +02:00
Florin Peter
055c901091 improved error msg and removed duplicate string 2013-06-04 22:31:36 +02:00
Florin Peter
14ac4fab05 better handling for http post 2013-06-04 00:41:47 +02:00
Florin Peter
ef97481a0d changed redirect handling 2013-06-03 23:41:57 +02:00