Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update authenticate.php | runky | 2013-07-05 | 1 | -1/+1 |
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-05 | 64 | -42/+115 |
* | Merge pull request #3932 from owncloud/fix_label_position | Morris Jobke | 2013-07-04 | 1 | -1/+5 |
|\ | |||||
| * | fix position of 'user shared the folder foldername with you' label | Georg Ehrke | 2013-07-04 | 1 | -1/+5 |
* | | Merge pull request #3899 from owncloud/encryption_check_php_version | VicDeo | 2013-07-04 | 4 | -10/+24 |
|\ \ | |||||
| * | | more verbose error message | Björn Schießle | 2013-07-04 | 1 | -1/+1 |
| * | | Merge branch 'master' into encryption_check_php_version | Björn Schießle | 2013-07-02 | 3 | -37/+37 |
| |\ \ | |||||
| * \ \ | Merge branch 'encryption_check_php_version' of github.com:owncloud/core into ... | Björn Schießle | 2013-07-02 | 2 | -5/+4 |
| |\ \ \ | |||||
| | * | | | no ?> at the end of a file | Thomas Müller | 2013-07-01 | 1 | -2/+1 |
| | * | | | typo | Thomas Müller | 2013-07-01 | 1 | -3/+3 |
| * | | | | improved error message | Björn Schießle | 2013-07-02 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | cast result to bool | Björn Schießle | 2013-07-01 | 1 | -1/+1 |
| * | | | fix error string | Björn Schießle | 2013-07-01 | 1 | -1/+1 |
| * | | | add correct php version | Björn Schießle | 2013-07-01 | 1 | -1/+1 |
| * | | | check php version, the encryption app needs php >= 5.3.3 | Björn Schießle | 2013-07-01 | 3 | -7/+22 |
* | | | | Merge pull request #3914 from owncloud/wrong-pw_for_share-with-pw | Kondou | 2013-07-04 | 2 | -1/+4 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Use better wording. | kondou | 2013-07-03 | 1 | -1/+1 |
| * | | | Add a "Wrong password." message, if the password | kondou | 2013-07-02 | 2 | -1/+4 |
* | | | | add public api | Björn Schießle | 2013-07-04 | 1 | -1/+1 |
* | | | | move to non-static OC_Defaults | Björn Schießle | 2013-07-04 | 1 | -3/+3 |
* | | | | Add init funtion to OC_Defaults to be able to wrap translatable strings | Björn Schießle | 2013-07-04 | 1 | -0/+2 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-04 | 14 | -2/+45 |
* | | | | Merge pull request #3915 from owncloud/summary_as_last_filelist_entry | Morris Jobke | 2013-07-03 | 2 | -2/+47 |
|\ \ \ \ | |||||
| * | | | | Don't escape filesize (can contain a '<') | kondou | 2013-07-02 | 1 | -1/+1 |
| * | | | | Show a summary as the last filelist entry | kondou | 2013-07-02 | 2 | -2/+47 |
| |/ / / | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-03 | 5 | -0/+5 |
* | | | | Merge pull request #3858 from owncloud/more_ssl_error_messages | Björn Schießle | 2013-07-02 | 1 | -6/+5 |
|\ \ \ \ | |||||
| * | | | | add openssl_error_string() output to the owncloud.log | Björn Schießle | 2013-06-26 | 1 | -6/+5 |
* | | | | | Merge pull request #3870 from owncloud/reset_migration_status | Björn Schießle | 2013-07-02 | 3 | -0/+25 |
|\ \ \ \ \ | |||||
| * | | | | | fix function documentation | Björn Schießle | 2013-06-27 | 1 | -1/+1 |
| * | | | | | introduce pre-disable-app hook and use it for the encryption app to reset mig... | Björn Schießle | 2013-06-27 | 3 | -0/+25 |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-02 | 68 | -65/+67 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | improved error message | Björn Schießle | 2013-07-02 | 1 | -1/+1 |
| |_|/ / |/| | | | |||||
* | | | | Merge pull request #3903 from owncloud/nonpublic-uploading | Thomas Müller | 2013-07-01 | 2 | -36/+36 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | fix detection of public upload in filelist.js | Robin Appelman | 2013-07-01 | 1 | -1/+1 |
| * | | | fix uploading when ['dirtoken'] is not set | Robin Appelman | 2013-07-01 | 1 | -1/+1 |
| * | | | code style | Robin Appelman | 2013-07-01 | 1 | -34/+34 |
* | | | | add logo claim to defaults.php | Björn Schießle | 2013-07-01 | 1 | -3/+1 |
* | | | | logo claim added | Björn Schießle | 2013-07-01 | 1 | -0/+3 |
* | | | | construct the foother in defaults.php so that we use always the same footer | Björn Schießle | 2013-07-01 | 1 | -3/+2 |
* | | | | Merge pull request #3223 from owncloud/fix-2820 | Morris Jobke | 2013-07-01 | 3 | -7/+38 |
|\ \ \ \ | |||||
| * | | | | if rename of file fails, the rename is undone in the view - #fix 2820 | Morris Jobke | 2013-06-15 | 3 | -7/+38 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-01 | 2 | -22/+26 |
| |/ / / |/| | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-30 | 62 | -9/+129 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-29 | 66 | -356/+403 |
* | | | | Merge pull request #3886 from owncloud/disable-public-upload-if-encryption-en... | Thomas Müller | 2013-06-28 | 1 | -1/+5 |
|\ \ \ \ | |||||
| * | | | | for now we disable public upload in case encryption is enabled | Thomas Mueller | 2013-06-28 | 1 | -1/+5 |
* | | | | | Merge pull request #1044 from owncloud/fix_extra_slash | Bart Visscher | 2013-06-28 | 1 | -1/+5 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | update to !== | Bart Visscher | 2013-06-28 | 1 | -1/+1 |
| * | | | | only encodeURIComponent once | Jörn Friedrich Dreyer | 2013-02-09 | 1 | -2/+2 |