summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* [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
| * | | | | | | Updated unit tests for SMBVincent Petry2013-11-261-0/+5
| * | | | | | | Return true when touch succeedsVincent Petry2013-11-261-0/+1
| |/ / / / / /
| * | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-11-264-0/+8
| * | | | | | Merge branch 'master' into calc_version_sizeBjoern Schiessle2013-11-2662-187/+489
| |\ \ \ \ \ \
| | * | | | | | Fixed FTP storage unit tests to use the correct classVincent Petry2013-11-251-4/+4
| | * | | | | | Merge pull request #5641 from owncloud/filestrash-emptytrashBjörn Schießle2013-11-255-26/+77
| | |\ \ \ \ \ \
| | | * | | | | | Deleting all files in trash now only sends a single flagVincent Petry2013-11-115-26/+77
| | * | | | | | | Fixed ext storage touch function to return true on successVincent Petry2013-11-253-3/+8
| | | |/ / / / / | | |/| | | | |
| | * | | | | | Merge pull request #5991 from owncloud/extstorage-mountpointvalidationMorris Jobke2013-11-252-0/+56
| | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | | * | | | | Now also preventing the user of "Shared" as mountpointVincent Petry2013-11-222-2/+4
| | | * | | | | Added unit test for root mount point validationVincent Petry2013-11-211-0/+49
| | | * | | | | Prevent using root as mount point for external storageVincent Petry2013-11-211-0/+5
| | * | | | | | Merge pull request #5995 from owncloud/extstorage-isreadablefixVincent Petry2013-11-247-52/+0
| | |\ \ \ \ \ \
| | | * | | | | | Moved default isReadable/isUpdatable impl into Common classVincent Petry2013-11-227-57/+0
| | | * | | | | | Return plausible isReadable() default impl for ext storageVincent Petry2013-11-221-2/+7
| | * | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-11-248-4/+25
| | |/ / / / / /
| | * | | / / / fixed documentationThomas Müller2013-11-221-1/+1
| | | |_|/ / / | | |/| | | |
| | * | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-11-215-1/+7
| | * | | | | Merge pull request #5970 from owncloud/extstorage-webdavdotdirfixVincent Petry2013-11-211-5/+3
| | |\ \ \ \ \
| | | * | | | | Fixed path normalization to prevent dot dirsVincent Petry2013-11-211-5/+3
| | * | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-11-2124-53/+170
| | * | | | | | Merge pull request #5715 from owncloud/quota-sharing-wrapotherusershomeVincent Petry2013-11-211-0/+15
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | | * | | | | Quota storage wrapper is now used for all users in sharing modeVincent Petry2013-11-211-0/+15
| | * | | | | | Merge pull request #5988 from owncloud/files-mobilequickfixMorris Jobke2013-11-211-0/+3
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |