summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* [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
| * | | | Check if extra / is necessary for the folder URLMichael Gapczynski2013-02-091-1/+5
* | | | | Merge pull request #3838 from rgeber/masterJörn Friedrich Dreyer2013-06-2810-168/+543
|\ \ \ \ \
| * | | | | Added file-upload to GIT repoRoman Geber2013-06-262-8/+351
| * | | | | Public upload featureRoman Geber2013-06-259-167/+199
* | | | | | Merge pull request #3799 from owncloud/fix_pdo_statement_wrapper_numrows_on_m...Bart Visscher2013-06-283-22/+8
|\ \ \ \ \ \
| * | | | | | fix numRows usage in files_encryptionJörn Friedrich Dreyer2013-06-241-15/+3
| * | | | | | fix numRows usage in user_ldapJörn Friedrich Dreyer2013-06-242-7/+5
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-281-1/+11
| |_|_|_|/ / |/| | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-274-6/+35
| |_|_|_|/ |/| | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-266-1/+58
| |/ / / |/| | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-258-2/+41
|/ / /
* | | Add a CLI script for manually triggering checking a folder for updatesRobin Appelman2013-06-231-0/+22
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-233-2/+23
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-2224-101/+1
* | | Merge pull request #3810 from owncloud/improve_webdavauthThomas Müller2013-06-211-4/+4
|\ \ \
| * | | improve error handling of webdavauthGeorg Ehrke2013-06-211-4/+4
* | | | fix some strings in the admin settings, it's not a 'recovery account' but a '...Björn Schießle2013-06-211-5/+5
* | | | encryption is LDAP compatibleBjörn Schießle2013-06-211-1/+1
* | | | Squashed commit of the following:Björn Schießle2013-06-212-9/+18
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-216-0/+47
* | | | Merge pull request #3788 from owncloud/more_error_messagesBjörn Schießle2013-06-202-26/+28
|\ \ \ \