Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | Merge branch 'stable5' into ocs_share_api_stable5 | Bjoern Schiessle | 2013-10-18 | 1 | -28/+1 | |
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
* | | | | | | | | don't cache if the encryption is enabled, this can lead to problems during un... | Bjoern Schiessle | 2013-10-18 | 1 | -28/+1 | |
| * | | | | | | | Merge branch 'stable5' into ocs_share_api_stable5 | Bjoern Schiessle | 2013-10-18 | 3 | -6/+10 | |
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
* | | | | | | | | Merge pull request #5415 from owncloud/fix_4884 | Morris Jobke | 2013-10-18 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Use display name from magic cookie, fixes #4884 | Arthur Schiwon | 2013-10-18 | 1 | -0/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | fix check if app is enabled | Bjoern Schiessle | 2013-10-18 | 1 | -3/+3 | |
* | | | | | | | check if key exists before reading it | Bjoern Schiessle | 2013-10-18 | 1 | -2/+5 | |
* | | | | | | | check if encryption app is enabled before trying to calculate file size | Bjoern Schiessle | 2013-10-18 | 1 | -1/+1 | |
| * | | | | | | ocs share api backport to stable5 | Bjoern Schiessle | 2013-10-18 | 4 | -0/+1156 | |
|/ / / / / / | ||||||
* | | | | | | Disable versions app JS in public mode | Vincent Petry | 2013-10-17 | 1 | -0/+8 | |
* | | | | | | Added isPublic flag in files_sharing template | Vincent Petry | 2013-10-17 | 1 | -0/+1 | |
* | | | | | | Fixed sharing status update for new/uploaded files | Vincent Petry | 2013-10-17 | 5 | -49/+86 | |
* | | | | | | Fixed upload permissions distinction between public and logged in upload | Vincent Petry | 2013-10-17 | 1 | -1/+6 | |
* | | | | | | Update file actions for newly created files | Vincent Petry | 2013-10-17 | 1 | -0/+1 | |
* | | | | | | Merge pull request #5229 from owncloud/more-link-expiration-stable5 | Thomas Müller | 2013-10-16 | 2 | -1/+60 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Perform expiration date checking before returning share data for token. | Andreas Fischer | 2013-10-09 | 1 | -1/+12 | |
| * | | | | | | Tests whether expired/valid link share is still accessible. | Andreas Fischer | 2013-10-09 | 1 | -0/+48 | |
* | | | | | | | Merge pull request #5185 from owncloud/Update-feed | Thomas Müller | 2013-10-16 | 1 | -2/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Improve empty data check | Victor Dubiniuk | 2013-10-10 | 1 | -1/+1 | |
| * | | | | | | | Do not write current time before checking if cache is expired | Victor Dubiniuk | 2013-10-07 | 1 | -1/+0 | |
* | | | | | | | | Merge pull request #5343 from owncloud/backport-5340-stable5 | Andreas Fischer | 2013-10-15 | 2 | -3/+37 | |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | ||||||
| * | | | | | | | streamCopy() should return proper structure. | Thomas Müller | 2013-10-14 | 2 | -3/+37 | |
|/ / / / / / / | ||||||
* | | | | / / | File actions are now updated after create/upload file | Vincent Petry | 2013-10-14 | 1 | -0/+1 | |
| |_|_|_|/ / |/| | | | | | ||||||
* | | | | | | Merge pull request #5218 from owncloud/no_passwords | Björn Schießle | 2013-10-11 | 1 | -0/+2 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | remove username/passswords from URLs before writing the to the log file | Bjoern Schiessle | 2013-10-08 | 1 | -0/+2 | |
* | | | | | | | let admin specify timezone for log file entries | Bjoern Schiessle | 2013-10-11 | 2 | -3/+14 | |
* | | | | | | | make sure that we only find file/folder shares | Bjoern Schiessle | 2013-10-11 | 1 | -4/+4 | |
* | | | | | | | only encrypt file to users with encryption keys | Bjoern Schiessle | 2013-10-11 | 2 | -3/+2 | |
* | | | | | | | the path need to be normalized before putting it into resolvePath() | Thomas Müller | 2013-10-10 | 2 | -1/+37 | |
* | | | | | | | Merge pull request #5208 from owncloud/fix_5126_stable5 | Björn Schießle | 2013-10-09 | 2 | -4/+18 | |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | / / / | | |_|/ / / | |/| | | | | ||||||
| * | | | | | Backport of https://github.com/owncloud/core/pull/5193/ | Bjoern Schiessle | 2013-10-08 | 2 | -4/+18 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Merge pull request #5190 from owncloud/stable5-numRows-no-limit | Andreas Fischer | 2013-10-09 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | Do not pass PDO::FETCH_NUM (integer 3) as limit parameter to OC_DB::prepare(). | Andreas Fischer | 2013-10-08 | 1 | -1/+1 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #5212 from owncloud/fixing-5201 | Andreas Fischer | 2013-10-08 | 1 | -1/+1 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | OC_DB::executeAudited is not availabe in 5.0 | Victor Dubiniuk | 2013-10-08 | 1 | -1/+1 | |
* | | | | | Merge branch 'stable5' of github.com:owncloud/core into stable5 | Bjoern Schiessle | 2013-10-08 | 1 | -1/+1 | |
|\| | | | | ||||||
| * | | | | Merge pull request #5211 from owncloud/sharing_search_users_fix-stable5 | Björn Schießle | 2013-10-08 | 1 | -1/+1 | |
| |\ \ \ \ | ||||||
| | * | | | | find users which are in the same group | Bjoern Schiessle | 2013-10-08 | 1 | -1/+1 | |
| |/ / / / | ||||||
* / / / / | revert backport from here: https://github.com/owncloud/core/pull/5088 | Bjoern Schiessle | 2013-10-08 | 1 | -1/+3 | |
|/ / / / | ||||||
* | | | | Merge pull request #5206 from owncloud/cleanup_share_table | Björn Schießle | 2013-10-08 | 2 | -3/+3 | |
|\ \ \ \ | ||||||
| * | | | | fix escaping | Morris Jobke | 2013-10-08 | 1 | -1/+1 | |
| * | | | | make sure that we only remove file/folder shares | Bjoern Schiessle | 2013-10-08 | 2 | -3/+3 | |
| |/ / / | ||||||
* | | | | Merge pull request #5112 from owncloud/backport-4969-stable5 | Thomas Müller | 2013-10-08 | 1 | -0/+11 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | adding privilege check on move and rename operations | Thomas Müller | 2013-10-04 | 1 | -0/+11 | |
* | | | | Merge branch 'stable5' of github.com:owncloud/core into stable5 | Bjoern Schiessle | 2013-10-07 | 1 | -2/+4 | |
|\ \ \ \ | ||||||
| * \ \ \ | Merge pull request #5164 from owncloud/share-autofocus | Morris Jobke | 2013-10-07 | 1 | -2/+4 | |
| |\ \ \ \ | ||||||
| | * | | | | Fix autofocus | Morris Jobke | 2013-10-07 | 1 | -2/+4 | |
| |/ / / / | ||||||
* / / / / | trash bin button needs to be an input field | Bjoern Schiessle | 2013-10-07 | 1 | -3/+1 | |
|/ / / / | ||||||
* | | | | catch exception if db query execution fails | Bjoern Schiessle | 2013-10-07 | 1 | -1/+5 | |
* | | | | clean up oc_share table from files which are no longer exists | Bjoern Schiessle | 2013-10-07 | 2 | -7/+17 |