summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Update authenticate.phprunky2013-07-051-1/+1
* [tx-robot] updated from transifexJenkins for ownCloud2013-07-0564-42/+115
* Merge pull request #3932 from owncloud/fix_label_positionMorris Jobke2013-07-041-1/+5
|\
| * fix position of 'user shared the folder foldername with you' labelGeorg Ehrke2013-07-041-1/+5
* | Merge pull request #3899 from owncloud/encryption_check_php_versionVicDeo2013-07-044-10/+24
|\ \
| * | more verbose error messageBjörn Schießle2013-07-041-1/+1
| * | Merge branch 'master' into encryption_check_php_versionBjörn Schießle2013-07-023-37/+37
| |\ \
| * \ \ Merge branch 'encryption_check_php_version' of github.com:owncloud/core into ...Björn Schießle2013-07-022-5/+4
| |\ \ \
| | * | | no ?> at the end of a fileThomas Müller2013-07-011-2/+1
| | * | | typoThomas Müller2013-07-011-3/+3
| * | | | improved error messageBjörn Schießle2013-07-021-1/+1
| |/ / /
| * | | cast result to boolBjörn Schießle2013-07-011-1/+1
| * | | fix error stringBjörn Schießle2013-07-011-1/+1
| * | | add correct php versionBjörn Schießle2013-07-011-1/+1
| * | | check php version, the encryption app needs php >= 5.3.3Björn Schießle2013-07-013-7/+22
* | | | Merge pull request #3914 from owncloud/wrong-pw_for_share-with-pwKondou2013-07-042-1/+4
|\ \ \ \ | |_|_|/ |/| | |
| * | | Use better wording.kondou2013-07-031-1/+1
| * | | Add a "Wrong password." message, if the passwordkondou2013-07-022-1/+4
* | | | add public apiBjörn Schießle2013-07-041-1/+1
* | | | move to non-static OC_DefaultsBjörn Schießle2013-07-041-3/+3
* | | | Add init funtion to OC_Defaults to be able to wrap translatable stringsBjörn Schießle2013-07-041-0/+2
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-0414-2/+45
* | | | Merge pull request #3915 from owncloud/summary_as_last_filelist_entryMorris Jobke2013-07-032-2/+47
|\ \ \ \
| * | | | Don't escape filesize (can contain a '<')kondou2013-07-021-1/+1
| * | | | Show a summary as the last filelist entrykondou2013-07-022-2/+47
| |/ / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-035-0/+5
* | | | Merge pull request #3858 from owncloud/more_ssl_error_messagesBjörn Schießle2013-07-021-6/+5
|\ \ \ \
| * | | | add openssl_error_string() output to the owncloud.logBjörn Schießle2013-06-261-6/+5
* | | | | Merge pull request #3870 from owncloud/reset_migration_statusBjörn Schießle2013-07-023-0/+25
|\ \ \ \ \
| * | | | | fix function documentationBjörn Schießle2013-06-271-1/+1
| * | | | | introduce pre-disable-app hook and use it for the encryption app to reset mig...Björn Schießle2013-06-273-0/+25
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-0268-65/+67
| |_|_|_|/ |/| | | |
* | | | | improved error messageBjörn Schießle2013-07-021-1/+1
| |_|/ / |/| | |
* | | | Merge pull request #3903 from owncloud/nonpublic-uploadingThomas Müller2013-07-012-36/+36
|\ \ \ \ | |_|_|/ |/| | |
| * | | fix detection of public upload in filelist.jsRobin Appelman2013-07-011-1/+1
| * | | fix uploading when ['dirtoken'] is not setRobin Appelman2013-07-011-1/+1
| * | | code styleRobin Appelman2013-07-011-34/+34
* | | | add logo claim to defaults.phpBjörn Schießle2013-07-011-3/+1
* | | | logo claim addedBjörn Schießle2013-07-011-0/+3
* | | | construct the foother in defaults.php so that we use always the same footerBjörn Schießle2013-07-011-3/+2
* | | | Merge pull request #3223 from owncloud/fix-2820Morris Jobke2013-07-013-7/+38
|\ \ \ \
| * | | | if rename of file fails, the rename is undone in the view - #fix 2820Morris Jobke2013-06-153-7/+38
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-012-22/+26
| |/ / / |/| | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-3062-9/+129
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-2966-356/+403
* | | | Merge pull request #3886 from owncloud/disable-public-upload-if-encryption-en...Thomas Müller2013-06-281-1/+5
|\ \ \ \
| * | | | for now we disable public upload in case encryption is enabledThomas Mueller2013-06-281-1/+5
* | | | | Merge pull request #1044 from owncloud/fix_extra_slashBart Visscher2013-06-281-1/+5
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | update to !==Bart Visscher2013-06-281-1/+1
| * | | | only encodeURIComponent onceJörn Friedrich Dreyer2013-02-091-2/+2