summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-11-27274-11244/+15279
* Merge pull request #5977 from owncloud/encryption_enable_public_uploadVincent Petry2013-11-278-22/+17
|\
| * Merge branch 'master' into encryption_enable_public_uploadBjoern Schiessle2013-11-27828-13068/+16529
| |\ | |/ |/|
* | 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-25731-11649/+12619
| |\ \
| | * \ Merge branch 'master' into encryption_work_with_public_galleryThomas Mueller2013-11-24731-11649/+12619
| | |\ \
| * | | | fix typo in commentBjoern Schiessle2013-11-251-1/+1
| |/ / /
* | | | Merge pull request #6027 from owncloud/public-api-restful-routing-oc6Morris Jobke2013-11-273-2/+29
|\ \ \ \
| * | | | add PHPDoc for urlParamsMorris Jobke2013-11-271-0/+1
| * | | | adding documentation for registerRoutes()Thomas Müller2013-11-251-1/+13
| * | | | fix appframework routingThomas Müller2013-11-253-2/+16
* | | | | 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 #6075 from owncloud/ssl-warningThomas Müller2013-11-271-0/+14
|\ \ \ \ \ \
| * | | | | | fix wordingMorris Jobke2013-11-271-1/+1
| * | | | | | add warning for HTTP connectionMorris Jobke2013-11-271-0/+14
* | | | | | | 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