summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | remove debug codeBjoern Schiessle2013-10-241-4/+0
| * | | | | resolvePath() needs to resolve the path for the owner, otherwise it doesn't w...Bjoern Schiessle2013-10-241-13/+22
| * | | | | return -1 if file is empty otherwise we run into infinite loopsBjoern Schiessle2013-10-241-1/+5
* | | | | | Merge pull request #5465 from owncloud/create-custom-logfile-stable5Thomas Müller2013-10-271-1/+11
|\ \ \ \ \ \
| * | | | | | Try to create custom log file before falling back to default.Andreas Fischer2013-10-221-1/+11
* | | | | | | Fixed group management dropdown in IE9Vincent Petry2013-10-271-3/+3
* | | | | | | Merge pull request #5425 from buczek/fix-ldap-loginblizzz2013-10-251-1/+3
|\ \ \ \ \ \ \
| * | | | | | | make sure the shared ldap connection is rebound to the configured user after ...Donald Buczek2013-10-181-1/+3
* | | | | | | | Merge pull request #5457 from owncloud/fix5438Thomas Müller2013-10-231-4/+11
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | LDAP: cookies from Paged Search must only be used once, as stated in RFC 2696...Arthur Schiwon2013-10-211-4/+11
* | | | | | | | Merge pull request #5416 from owncloud/sharing_fix_infinite_loopBjörn Schießle2013-10-231-1/+3
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'stable5' into sharing_fix_infinite_loopBjoern Schiessle2013-10-2311-45/+1208
| |\ \ \ \ \ \ \ \
| * | | | | | | | | run first getUsersItemShared() with the ownerBjoern Schiessle2013-10-181-1/+1
| * | | | | | | | | update etags for user we haven't checked yetBjoern Schiessle2013-10-181-1/+1
| * | | | | | | | | keep a list of users we already checked to avoid loopsBjoern Schiessle2013-10-181-3/+3
| * | | | | | | | | fix infinite loop while updating etags, fix for #4365Bjoern Schiessle2013-10-181-2/+4
* | | | | | | | | | Merge pull request #5145 from guruz/files_encryption_511_fix_chunk_calcBjörn Schießle2013-10-232-2/+37
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | files_encryption: Fix getFileSize()Markus Goetz2013-10-212-2/+37
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge pull request #5485 from owncloud/fixing-oci-stable5Andreas Fischer2013-10-231-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | adding backticks to satisfy OracleThomas Müller2013-10-231-1/+1
|/ / / / / / / / /
* | | | | | | | | fix array keyBjoern Schiessle2013-10-221-1/+1
* | | | | | | | | try to fix unencrypted file size if it doesn't look plausibleBjoern Schiessle2013-10-221-2/+19
| |_|_|_|/ / / / |/| | | | | | |
* | | | | | | | backport of https://github.com/owncloud/core/pull/5247Bjoern Schiessle2013-10-211-1/+4
|/ / / / / / /
* | | | | | | fix recursive delete for smbRobin Appelman2013-10-201-0/+8
* | | | | | | fix using touch to create a file for smbRobin Appelman2013-10-201-12/+16
* | | | | | | Merge pull request #5420 from owncloud/fix5081blizzz2013-10-181-1/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | LDAP: Fix base-comparison with multibyte characters, fixes #5081. Thanks to @...Arthur Schiwon2013-10-181-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #5414 from owncloud/ocs_share_api_stable5Björn Schießle2013-10-185-0/+1157
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | mail_send doesn't exists in stable5Bjoern Schiessle2013-10-181-1/+1
| * | | | | enable files sharing testsBjoern Schiessle2013-10-181-0/+1
| * | | | | Merge branch 'stable5' into ocs_share_api_stable5Bjoern Schiessle2013-10-181-28/+1
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | don't cache if the encryption is enabled, this can lead to problems during un...Bjoern Schiessle2013-10-181-28/+1
| * | | | | Merge branch 'stable5' into ocs_share_api_stable5Bjoern Schiessle2013-10-183-6/+10
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #5415 from owncloud/fix_4884Morris Jobke2013-10-181-0/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Use display name from magic cookie, fixes #4884Arthur Schiwon2013-10-181-0/+1
|/ / / / /
* | | | | fix check if app is enabledBjoern Schiessle2013-10-181-3/+3
* | | | | check if key exists before reading itBjoern Schiessle2013-10-181-2/+5
* | | | | check if encryption app is enabled before trying to calculate file sizeBjoern Schiessle2013-10-181-1/+1
| * | | | ocs share api backport to stable5Bjoern Schiessle2013-10-184-0/+1156
|/ / / /
* | | | Disable versions app JS in public modeVincent Petry2013-10-171-0/+8
* | | | Added isPublic flag in files_sharing templateVincent Petry2013-10-171-0/+1
* | | | Fixed sharing status update for new/uploaded filesVincent Petry2013-10-175-49/+86
* | | | Fixed upload permissions distinction between public and logged in uploadVincent Petry2013-10-171-1/+6
* | | | Update file actions for newly created filesVincent Petry2013-10-171-0/+1
* | | | Merge pull request #5229 from owncloud/more-link-expiration-stable5Thomas Müller2013-10-162-1/+60
|\ \ \ \
| * | | | Perform expiration date checking before returning share data for token.Andreas Fischer2013-10-091-1/+12
| * | | | Tests whether expired/valid link share is still accessible.Andreas Fischer2013-10-091-0/+48
* | | | | Merge pull request #5185 from owncloud/Update-feedThomas Müller2013-10-161-2/+1
|\ \ \ \ \
| * | | | | Improve empty data checkVictor Dubiniuk2013-10-101-1/+1
| * | | | | Do not write current time before checking if cache is expiredVictor Dubiniuk2013-10-071-1/+0