summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | Merge pull request #6071 from owncloud/db-documentationThomas Müller2013-11-271-0/+107
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix spacing.Andreas Fischer2013-11-261-0/+16
| * | | | | | | | | db-doc: privatedata descriptionAndreas Fischer2013-11-261-1/+6
| * | | | | | | | | db-doc: vcategory* descriptionsAndreas Fischer2013-11-261-2/+8
| * | | | | | | | | db-doc: users descriptionAndreas Fischer2013-11-261-1/+3
| * | | | | | | | | db-doc: jobs descriptionAndreas Fischer2013-11-261-1/+4
| * | | | | | | | | db-doc: share descriptionAndreas Fischer2013-11-261-1/+14
| * | | | | | | | | db-doc: properties descriptionAndreas Fischer2013-11-261-1/+4
| * | | | | | | | | db-doc: preferences descriptionAndreas Fischer2013-11-261-1/+6
| * | | | | | | | | db-doc: locks descriptionAndreas Fischer2013-11-261-1/+4
| * | | | | | | | | db-doc: groups descriptionAndreas Fischer2013-11-261-1/+3
| * | | | | | | | | db-doc: group_admin reduction noteAndreas Fischer2013-11-261-0/+3
| * | | | | | | | | db-doc: group_admin descriptionAndreas Fischer2013-11-261-1/+7
| * | | | | | | | | db-doc: group_user descriptionAndreas Fischer2013-11-261-1/+7
| * | | | | | | | | Remove the dbprefix from comments. It has no information.Andreas Fischer2013-11-261-6/+6
| * | | | | | | | | db-doc: permissions descriptionAndreas Fischer2013-11-261-1/+6
| * | | | | | | | | Prettier ASCII lists. ^^Andreas Fischer2013-11-261-9/+9
| * | | | | | | | | db-doc: filecache descriptionAndreas Fischer2013-11-261-1/+14
| * | | | | | | | | db-doc: mimetypes descriptionAndreas Fischer2013-11-261-1/+6
| * | | | | | | | | db-doc: storages descriptionAndreas Fischer2013-11-261-1/+7
| * | | | | | | | | db-doc: appconfig descriptionAndreas Fischer2013-11-261-0/+5
* | | | | | | | | | Merge pull request #6058 from owncloud/ldap2avatarblizzz2013-11-2614-19/+245
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | 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
| * | | | | | | | | Avatar: accept OC_Image as in setParameterArthur Schiwon2013-11-221-3/+7
| * | | | | | | | | LDAP: user proxy must support canChangeAvatar tooArthur Schiwon2013-11-221-0/+9
| * | | | | | | | | Enable user backends to provide avatar imagesArthur Schiwon2013-11-227-7/+137
| * | | | | | | | | LDAP: get user photo from LDAP and set it as avatar if availableArthur Schiwon2013-11-222-1/+65
* | | | | | | | | | Merge pull request #6060 from owncloud/fix-6050-oc6Björn Schießle2013-11-262-11/+29
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | fixing failing unit testThomas Müller2013-11-261-1/+1
| * | | | | | | | | fixes #6050Thomas Müller2013-11-262-11/+29
* | | | | | | | | | 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-26137-311/+734
* | | | | | | | | | | Merge pull request #6065 from owncloud/l10n-updateThomas Müller2013-11-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Translate reload message after updateMorris Jobke2013-11-261-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #6008 from owncloud/extstorage-smb-webdav-renamefixVincent Petry2013-11-263-3/+25
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Improved unit test for "overwrite on move"Vincent Petry2013-11-251-3/+5
| * | | | | | | | | | Added unit test for "overwrite file on rename/move"Vincent Petry2013-11-251-0/+6
| * | | | | | | | | | Fixed SMB rename function to overwrite target fileVincent Petry2013-11-252-2/+16
* | | | | | | | | | | Merge pull request #6059 from owncloud/occ-repairMorris Jobke2013-11-264-1/+68
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add a (currently) empty system for running common repair stepsRobin Appelman2013-11-264-1/+68
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #6053 from owncloud/remove_passwords_from_logMorris Jobke2013-11-261-0/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | remove passwords from logfileBjoern Schiessle2013-11-261-0/+2
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #6056 from owncloud/check_loginMorris Jobke2013-11-261-0/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | check if user is logged inBjoern Schiessle2013-11-261-0/+3
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #6054 from owncloud/extstorage-dropboxfixesMorris Jobke2013-11-262-12/+60
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fixed various Dropbox issues + unit testsVincent Petry2013-11-262-12/+60
| |/ / / / / / / / / /