summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* detect mimetype from the original filename, without the versioning timestampBjoern Schiessle2013-11-281-2/+3
* detect mimetype from the original filename, without the delete timestampBjoern Schiessle2013-11-281-2/+9
* Merge pull request #6094 from owncloud/enc_fix_resharesVincent Petry2013-11-281-2/+2
|\
| * fix path reconstruction for resharesBjoern Schiessle2013-11-271-2/+2
* | Merge pull request #6048 from owncloud/encryption_initial_enc_indicatorMorris Jobke2013-11-274-16/+75
|\ \
| * | improve encryption messageMorris Jobke2013-11-271-1/+1
| * | some small js fixesBjoern Schiessle2013-11-271-2/+2
| * | add spinner to the template so that it can be loaded in timeBjoern Schiessle2013-11-271-1/+1
| * | switch to large spinnerBjoern Schiessle2013-11-271-2/+2
| * | switch from "name" attribute to "id"Bjoern Schiessle2013-11-271-2/+2
| * | Merge branch 'master' into encryption_initial_enc_indicatorBjoern Schiessle2013-11-2720-144/+426
| |\|
| * | with the latest changes in master $this-userID is always the correct ID, so w...Bjoern Schiessle2013-11-272-25/+21
| * | Merge branch 'master' into encryption_initial_enc_indicatorBjoern Schiessle2013-11-2615-27/+118
| |\ \
| * | | added a small version of the dark loading gif, looks nicer on the blue backgr...Bjoern Schiessle2013-11-261-1/+1
| * | | use POST instead of GETBjoern Schiessle2013-11-262-3/+3
| * | | fix typo in var nameBjoern Schiessle2013-11-261-1/+1
| * | | remove debug outputBjoern Schiessle2013-11-251-1/+0
| * | | show a message at the log-in screen if inital encryption take placeBjoern Schiessle2013-11-254-6/+70
* | | | Merge pull request #6088 from owncloud/fix_public_previewsBjörn Schießle2013-11-271-3/+7
|\ \ \ \
| * | | | fix public preview creation if a user ios logged inBjoern Schiessle2013-11-271-3/+7
| | |_|/ | |/| |
* | | | Merge pull request #6039 from owncloud/trashbin_move_file_to_owners_trashBjörn Schießle2013-11-274-39/+116
|\ \ \ \
| * | | | Fixed sharing hook to not remove the share before the trashbinVincent Petry2013-11-272-1/+7
| * | | | only create complete share key if we know the exact pathBjoern Schiessle2013-11-261-1/+3
| * | | | move files to owners trashBjoern Schiessle2013-11-252-41/+110
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-11-2750-70/+39
| |/ / / |/| | |
* | | | Merge branch 'master' into encryption_enable_public_uploadBjoern Schiessle2013-11-2784-243/+815
|\ \ \ \
| * \ \ \ Merge pull request #5976 from owncloud/encryption_work_with_public_galleryThomas Müller2013-11-277-93/+123
| |\ \ \ \
| | * | | | typo fixedBjoern Schiessle2013-11-271-1/+1
| | * | | | some small changes according to the review commentsBjoern Schiessle2013-11-277-18/+19
| | * | | | Merge branch 'encryption_work_with_public_gallery' of github.com:owncloud/cor...Bjoern Schiessle2013-11-2547-119/+235
| | |\ \ \ \
| | | * \ \ \ Merge branch 'master' into encryption_work_with_public_galleryThomas Mueller2013-11-2447-119/+235
| | | |\ \ \ \
| | * | | | | | fix typo in commentBjoern Schiessle2013-11-251-1/+1
| | |/ / / / /
| * | | | | | Merge pull request #5955 from owncloud/fix5863blizzz2013-11-276-30/+195
| |\ \ \ \ \ \
| | * | | | | | LDAP Wizard: clear the cache on save so changes have immediate effectArthur Schiwon2013-11-201-0/+3
| | * | | | | | LDAP Wizard: proper behaviour for raw filter input. remember the editing mode...Arthur Schiwon2013-11-194-27/+163
| | * | | | | | LDAP Wizard: move raw login filter field from advanced tab to login filter ta...Arthur Schiwon2013-11-143-3/+29
| * | | | | | | Merge pull request #6058 from owncloud/ldap2avatarblizzz2013-11-266-9/+101
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Make sure Avatar is set from LDAP upon first login, not later, but also not b...Arthur Schiwon2013-11-261-2/+14
| | * | | | | | LDAP: username2dn should only return DNs that belong to the current LDAP ser...Arthur Schiwon2013-11-251-1/+3
| | * | | | | | LDAP: proxy: configurable return to determine when to try the next LDAP serve...Arthur Schiwon2013-11-253-8/+12
| | * | | | | | LDAP: last avatar lookup must be stored per user. Someone had a blackout, eh?Arthur Schiwon2013-11-221-5/+6
| | * | | | | | LDAP: user proxy must support canChangeAvatar tooArthur Schiwon2013-11-221-0/+9
| | * | | | | | LDAP: get user photo from LDAP and set it as avatar if availableArthur Schiwon2013-11-222-1/+65
| * | | | | | | Merge pull request #6066 from owncloud/extstorage-sftp-overwriteonrenameVincent Petry2013-11-261-0/+3
| |\ \ \ \ \ \ \
| | * | | | | | | Fixed SFTP storage to overwrite on renameVincent Petry2013-11-261-0/+3
| * | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-11-264-1/+14
| |/ / / / / / /
| * | | | | | | Merge pull request #6008 from owncloud/extstorage-smb-webdav-renamefixVincent Petry2013-11-262-2/+16
| |\ \ \ \ \ \ \
| | * | | | | | | Fixed SMB rename function to overwrite target fileVincent Petry2013-11-252-2/+16
| | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Merge pull request #6054 from owncloud/extstorage-dropboxfixesMorris Jobke2013-11-262-12/+60
| |\ \ \ \ \ \ \
| | * | | | | | | Fixed various Dropbox issues + unit testsVincent Petry2013-11-262-12/+60