summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \
| * | | | always have a defined return valueBjörn Schießle2013-06-191-4/+4
| * | | | some more error messagesBjörn Schießle2013-06-191-5/+3
| * | | | add some more error messages, in case something went wrongBjörn Schießle2013-06-192-24/+28
* | | | | Merge pull request #3784 from owncloud/rescan-allThomas Müller2013-06-202-15/+45
|\ \ \ \ \
| * | | | | use json to encode user listRobin Appelman2013-06-192-2/+2
| * | | | | allow scanning files for multiple usersRobin Appelman2013-06-192-15/+45
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-208-17/+36
| |_|/ / / |/| | | |
* | | | | Merge pull request #3764 from owncloud/scanfolder-existingicewind19912013-06-191-1/+1
|\| | | | | |/ / / |/| | |
| * | | reuse etag when doing a forced rescanRobin Appelman2013-06-141-1/+1
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-184-0/+24
* | | | Merge branch 'master' into fix_glob_escapingBjörn Schießle2013-06-1756-52/+121
|\ \ \ \
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-174-0/+8
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-1611-0/+54
| * | | | Merge pull request #3301 from bastho/fix_filestrashbin_missing-sub-folderMorris Jobke2013-06-151-2/+9
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | duplicate verificationBastien Ho2013-05-101-3/+0
| | * | | Fix inexisting trashbin's sub-foldersBastien Ho2013-05-101-2/+12
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-1548-48/+42
| * | | | Merge pull request #3473 from opensaucesystems/masterThomas Müller2013-06-142-3/+9
| |\ \ \ \ | | |_|/ / | |/| | |