summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | 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
* | | | | | | | Merge pull request #5343 from owncloud/backport-5340-stable5Andreas Fischer2013-10-152-3/+37
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | streamCopy() should return proper structure.Thomas Müller2013-10-142-3/+37
|/ / / / / / /
* | | | | / / File actions are now updated after create/upload fileVincent Petry2013-10-141-0/+1
| |_|_|_|/ / |/| | | | |
* | | | | | Merge pull request #5218 from owncloud/no_passwordsBjörn Schießle2013-10-111-0/+2
|\ \ \ \ \ \
| * | | | | | remove username/passswords from URLs before writing the to the log fileBjoern Schiessle2013-10-081-0/+2
* | | | | | | let admin specify timezone for log file entriesBjoern Schiessle2013-10-112-3/+14
* | | | | | | make sure that we only find file/folder sharesBjoern Schiessle2013-10-111-4/+4
* | | | | | | only encrypt file to users with encryption keysBjoern Schiessle2013-10-112-3/+2
* | | | | | | the path need to be normalized before putting it into resolvePath()Thomas Müller2013-10-102-1/+37
* | | | | | | Merge pull request #5208 from owncloud/fix_5126_stable5Björn Schießle2013-10-092-4/+18
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | / / / | | |_|/ / / | |/| | | |
| * | | | | Backport of https://github.com/owncloud/core/pull/5193/Bjoern Schiessle2013-10-082-4/+18
| | |/ / / | |/| | |
* | | | | Merge pull request #5190 from owncloud/stable5-numRows-no-limitAndreas Fischer2013-10-091-1/+1
|\ \ \ \ \
| * | | | | Do not pass PDO::FETCH_NUM (integer 3) as limit parameter to OC_DB::prepare().Andreas Fischer2013-10-081-1/+1
| |/ / / /
* | | | | Merge pull request #5212 from owncloud/fixing-5201Andreas Fischer2013-10-081-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | OC_DB::executeAudited is not availabe in 5.0Victor Dubiniuk2013-10-081-1/+1
* | | | | Merge branch 'stable5' of github.com:owncloud/core into stable5Bjoern Schiessle2013-10-081-1/+1
|\| | | |
| * | | | Merge pull request #5211 from owncloud/sharing_search_users_fix-stable5Björn Schießle2013-10-081-1/+1
| |\ \ \ \
| | * | | | find users which are in the same groupBjoern Schiessle2013-10-081-1/+1
| |/ / / /
* / / / / revert backport from here: https://github.com/owncloud/core/pull/5088Bjoern Schiessle2013-10-081-1/+3
|/ / / /
* | | | Merge pull request #5206 from owncloud/cleanup_share_tableBjörn Schießle2013-10-082-3/+3
|\ \ \ \
| * | | | fix escapingMorris Jobke2013-10-081-1/+1
| * | | | make sure that we only remove file/folder sharesBjoern Schiessle2013-10-082-3/+3
| |/ / /
* | | | Merge pull request #5112 from owncloud/backport-4969-stable5Thomas Müller2013-10-081-0/+11
|\ \ \ \ | |/ / / |/| | |
| * | | adding privilege check on move and rename operationsThomas Müller2013-10-041-0/+11
* | | | Merge branch 'stable5' of github.com:owncloud/core into stable5Bjoern Schiessle2013-10-071-2/+4
|\ \ \ \
| * \ \ \ Merge pull request #5164 from owncloud/share-autofocusMorris Jobke2013-10-071-2/+4
| |\ \ \ \
| | * | | | Fix autofocusMorris Jobke2013-10-071-2/+4
| |/ / / /
* / / / / trash bin button needs to be an input fieldBjoern Schiessle2013-10-071-3/+1
|/ / / /
* | | | catch exception if db query execution failsBjoern Schiessle2013-10-071-1/+5
* | | | clean up oc_share table from files which are no longer existsBjoern Schiessle2013-10-072-7/+17