| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | detect mimetype from the original filename, without the versioning timestamp | Bjoern Schiessle | 2013-11-28 | 1 | -2/+3 |
| | | |||||
| * | detect mimetype from the original filename, without the delete timestamp | Bjoern Schiessle | 2013-11-28 | 1 | -2/+9 |
| | | |||||
| * | Merge pull request #6094 from owncloud/enc_fix_reshares | Vincent Petry | 2013-11-28 | 1 | -2/+2 |
| |\ | | | | | fix path reconstruction for reshares | ||||
| | * | fix path reconstruction for reshares | Bjoern Schiessle | 2013-11-27 | 1 | -2/+2 |
| | | | |||||
| * | | Merge pull request #6048 from owncloud/encryption_initial_enc_indicator | Morris Jobke | 2013-11-27 | 4 | -16/+75 |
| |\ \ | | | | | | | show a message at the log-in screen if inital encryption take place | ||||
| | * | | improve encryption message | Morris Jobke | 2013-11-27 | 1 | -1/+1 |
| | | | | |||||
| | * | | some small js fixes | Bjoern Schiessle | 2013-11-27 | 1 | -2/+2 |
| | | | | |||||
| | * | | add spinner to the template so that it can be loaded in time | Bjoern Schiessle | 2013-11-27 | 1 | -1/+1 |
| | | | | |||||
| | * | | switch to large spinner | Bjoern Schiessle | 2013-11-27 | 1 | -2/+2 |
| | | | | |||||
| | * | | switch from "name" attribute to "id" | Bjoern Schiessle | 2013-11-27 | 1 | -2/+2 |
| | | | | |||||
| | * | | Merge branch 'master' into encryption_initial_enc_indicator | Bjoern Schiessle | 2013-11-27 | 20 | -144/+426 |
| | |\| | |||||
| | * | | with the latest changes in master $this-userID is always the correct ID, so ↵ | Bjoern Schiessle | 2013-11-27 | 2 | -25/+21 |
| | | | | | | | | | | | | | we no longer need the extra parameter | ||||
| | * | | Merge branch 'master' into encryption_initial_enc_indicator | Bjoern Schiessle | 2013-11-26 | 15 | -27/+118 |
| | |\ \ | |||||
| | * | | | added a small version of the dark loading gif, looks nicer on the blue ↵ | Bjoern Schiessle | 2013-11-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | background | ||||
| | * | | | use POST instead of GET | Bjoern Schiessle | 2013-11-26 | 2 | -3/+3 |
| | | | | | |||||
| | * | | | fix typo in var name | Bjoern Schiessle | 2013-11-26 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | remove debug output | Bjoern Schiessle | 2013-11-25 | 1 | -1/+0 |
| | | | | | |||||
| | * | | | show a message at the log-in screen if inital encryption take place | Bjoern Schiessle | 2013-11-25 | 4 | -6/+70 |
| | | | | | |||||
| * | | | | Merge pull request #6088 from owncloud/fix_public_previews | Björn Schießle | 2013-11-27 | 1 | -3/+7 |
| |\ \ \ \ | | | | | | | | | | | fix public preview creation if a user is logged in | ||||
| | * | | | | fix public preview creation if a user ios logged in | Bjoern Schiessle | 2013-11-27 | 1 | -3/+7 |
| | | |_|/ | |/| | | |||||
| * | | | | Merge pull request #6039 from owncloud/trashbin_move_file_to_owners_trash | Björn Schießle | 2013-11-27 | 4 | -39/+116 |
| |\ \ \ \ | | | | | | | | | | | move files to owners trash | ||||
| | * | | | | Fixed sharing hook to not remove the share before the trashbin | Vincent Petry | 2013-11-27 | 2 | -1/+7 |
| | | | | | | | | | | | | | | | | | | | | | Fixed the hook order between sharing app and trashbin | ||||
| | * | | | | only create complete share key if we know the exact path | Bjoern Schiessle | 2013-11-26 | 1 | -1/+3 |
| | | | | | | |||||
| | * | | | | move files to owners trash | Bjoern Schiessle | 2013-11-25 | 2 | -41/+110 |
| | | | | | | |||||
| * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-11-27 | 50 | -70/+39 |
| | |/ / / |/| | | | |||||
| * | | | | Merge branch 'master' into encryption_enable_public_upload | Bjoern Schiessle | 2013-11-27 | 84 | -243/+815 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/lib/helper.php apps/files_encryption/lib/keymanager.php apps/files_encryption/lib/stream.php apps/files_encryption/lib/util.php apps/files_encryption/tests/keymanager.php | ||||
| | * \ \ \ | Merge pull request #5976 from owncloud/encryption_work_with_public_gallery | Thomas Müller | 2013-11-27 | 7 | -93/+123 |
| | |\ \ \ \ | | | | | | | | | | | | | Encryption work with public gallery | ||||
| | | * | | | | typo fixed | Bjoern Schiessle | 2013-11-27 | 1 | -1/+1 |
| | | | | | | | |||||
| | | * | | | | some small changes according to the review comments | Bjoern Schiessle | 2013-11-27 | 7 | -18/+19 |
| | | | | | | | |||||
| | | * | | | | Merge branch 'encryption_work_with_public_gallery' of ↵ | Bjoern Schiessle | 2013-11-25 | 47 | -119/+235 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | github.com:owncloud/core into encryption_work_with_public_gallery | ||||
| | | | * \ \ \ | Merge branch 'master' into encryption_work_with_public_gallery | Thomas Mueller | 2013-11-24 | 47 | -119/+235 |
| | | | |\ \ \ \ | |||||
| | | * | | | | | | fix typo in comment | Bjoern Schiessle | 2013-11-25 | 1 | -1/+1 |
| | | |/ / / / / | |||||
| | * | | | | | | Merge pull request #5955 from owncloud/fix5863 | blizzz | 2013-11-27 | 6 | -30/+195 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | LDAP Wizard: Add raw login filter to corresponding tab for consistency, fix behaviour on raw filter input | ||||
| | | * | | | | | | LDAP Wizard: clear the cache on save so changes have immediate effect | Arthur Schiwon | 2013-11-20 | 1 | -0/+3 |
| | | | | | | | | | |||||
| | | * | | | | | | LDAP Wizard: proper behaviour for raw filter input. remember the editing ↵ | Arthur Schiwon | 2013-11-19 | 4 | -27/+163 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mode and compose filter only when desired. | ||||
| | | * | | | | | | LDAP Wizard: move raw login filter field from advanced tab to login filter ↵ | Arthur Schiwon | 2013-11-14 | 3 | -3/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tab for consistency | ||||
| | * | | | | | | | Merge pull request #6058 from owncloud/ldap2avatar | blizzz | 2013-11-26 | 6 | -9/+101 |
| | |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | Set Avatar for LDAP users automatically (if a picture is available) | ||||
| | | * | | | | | | Make sure Avatar is set from LDAP upon first login, not later, but also not ↵ | Arthur Schiwon | 2013-11-26 | 1 | -2/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | before due to missing user folder | ||||
| | | * | | | | | | LDAP: username2dn should only return DNs that belong to the current LDAP ↵ | Arthur Schiwon | 2013-11-25 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | server. Might be not perfect. Easy perfect solution would increase communication with LDAP server. Let's see if it is good enough | ||||
| | | * | | | | | | LDAP: proxy: configurable return to determine when to try the next LDAP ↵ | Arthur Schiwon | 2013-11-25 | 3 | -8/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | server and when to return (multi server setup) | ||||
| | | * | | | | | | LDAP: last avatar lookup must be stored per user. Someone had a blackout, eh? | Arthur Schiwon | 2013-11-22 | 1 | -5/+6 |
| | | | | | | | | | |||||
| | | * | | | | | | LDAP: user proxy must support canChangeAvatar too | Arthur Schiwon | 2013-11-22 | 1 | -0/+9 |
| | | | | | | | | | |||||
| | | * | | | | | | LDAP: get user photo from LDAP and set it as avatar if available | Arthur Schiwon | 2013-11-22 | 2 | -1/+65 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge pull request #6066 from owncloud/extstorage-sftp-overwriteonrename | Vincent Petry | 2013-11-26 | 1 | -0/+3 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fixed SFTP storage to overwrite on rename | ||||
| | | * | | | | | | | Fixed SFTP storage to overwrite on rename | Vincent Petry | 2013-11-26 | 1 | -0/+3 |
| | | | | | | | | | | |||||
| | * | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-11-26 | 4 | -1/+14 |
| | |/ / / / / / / | |||||
| | * | | | | | | | Merge pull request #6008 from owncloud/extstorage-smb-webdav-renamefix | Vincent Petry | 2013-11-26 | 2 | -2/+16 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fixed SMB rename function to overwrite target file | ||||
| | | * | | | | | | | Fixed SMB rename function to overwrite target file | Vincent Petry | 2013-11-25 | 2 | -2/+16 |
| | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When uploading files through WebDAV, a part file is created and a rename operation is performed with the expectation that the part file overwrites an existing file, if any. This fix makes the SMB external storage delete the target file before renaming, as smbclient doesn't support overwrite on move/rename. Fixes #5348 | ||||
| | * | | | | | | | Merge pull request #6054 from owncloud/extstorage-dropboxfixes | Morris Jobke | 2013-11-26 | 2 | -12/+60 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fixed various Dropbox issues + unit tests | ||||
| | | * | | | | | | | Fixed various Dropbox issues + unit tests | Vincent Petry | 2013-11-26 | 2 | -12/+60 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fixed touch function to return true on success - fixed local metadata cache to remove deleted files/directories - fixed getMetaData() to ignore files reported as deleted by Dropbox - fixed "file not found" case to not log as exception - fixed "overwrite on rename" case - fixed unit tests to exclude unsupported cases - added unit test for touch return value - unit tests for Dropbox should all run correctly now | ||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |