| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-11-27 | 274 | -11244/+15279 |
| | | |||||
| * | Merge pull request #5977 from owncloud/encryption_enable_public_upload | Vincent Petry | 2013-11-27 | 8 | -22/+17 |
| |\ | | | | | Encryption enable public upload | ||||
| | * | Merge branch 'master' into encryption_enable_public_upload | Bjoern Schiessle | 2013-11-27 | 828 | -13068/+16529 |
| | |\ | |/ |/| | | | | | | | | | | | | | 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 | 731 | -11649/+12619 |
| | |\ \ | | | | | | | | | | | | | github.com:owncloud/core into encryption_work_with_public_gallery | ||||
| | | * \ | Merge branch 'master' into encryption_work_with_public_gallery | Thomas Mueller | 2013-11-24 | 731 | -11649/+12619 |
| | | |\ \ | |||||
| | * | | | | fix typo in comment | Bjoern Schiessle | 2013-11-25 | 1 | -1/+1 |
| | |/ / / | |||||
| * | | | | Merge pull request #6027 from owncloud/public-api-restful-routing-oc6 | Morris Jobke | 2013-11-27 | 3 | -2/+29 |
| |\ \ \ \ | | | | | | | | | | | fix appframework routing | ||||
| | * | | | | add PHPDoc for urlParams | Morris Jobke | 2013-11-27 | 1 | -0/+1 |
| | | | | | | |||||
| | * | | | | adding documentation for registerRoutes() | Thomas Müller | 2013-11-25 | 1 | -1/+13 |
| | | | | | | |||||
| | * | | | | fix appframework routing | Thomas Müller | 2013-11-25 | 3 | -2/+16 |
| | | | | | | |||||
| * | | | | | 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 #6075 from owncloud/ssl-warning | Thomas Müller | 2013-11-27 | 1 | -0/+14 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | add warning for HTTP connection | ||||
| | * | | | | | | fix wording | Morris Jobke | 2013-11-27 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | add warning for HTTP connection | Morris Jobke | 2013-11-27 | 1 | -0/+14 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #6071 from owncloud/db-documentation | Thomas Müller | 2013-11-27 | 1 | -0/+107 |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Add some documentation to db_structure.xml | ||||
| | * | | | | | | Fix spacing. | Andreas Fischer | 2013-11-26 | 1 | -0/+16 |
| | | | | | | | | |||||
| | * | | | | | | db-doc: privatedata description | Andreas Fischer | 2013-11-26 | 1 | -1/+6 |
| | | | | | | | | |||||
| | * | | | | | | db-doc: vcategory* descriptions | Andreas Fischer | 2013-11-26 | 1 | -2/+8 |
| | | | | | | | | |||||
| | * | | | | | | db-doc: users description | Andreas Fischer | 2013-11-26 | 1 | -1/+3 |
| | | | | | | | | |||||
| | * | | | | | | db-doc: jobs description | Andreas Fischer | 2013-11-26 | 1 | -1/+4 |
| | | | | | | | | |||||
| | * | | | | | | db-doc: share description | Andreas Fischer | 2013-11-26 | 1 | -1/+14 |
| | | | | | | | | |||||
| | * | | | | | | db-doc: properties description | Andreas Fischer | 2013-11-26 | 1 | -1/+4 |
| | | | | | | | | |||||
| | * | | | | | | db-doc: preferences description | Andreas Fischer | 2013-11-26 | 1 | -1/+6 |
| | | | | | | | | |||||
| | * | | | | | | db-doc: locks description | Andreas Fischer | 2013-11-26 | 1 | -1/+4 |
| | | | | | | | | |||||
| | * | | | | | | db-doc: groups description | Andreas Fischer | 2013-11-26 | 1 | -1/+3 |
| | | | | | | | | |||||
| | * | | | | | | db-doc: group_admin reduction note | Andreas Fischer | 2013-11-26 | 1 | -0/+3 |
| | | | | | | | | |||||
| | * | | | | | | db-doc: group_admin description | Andreas Fischer | 2013-11-26 | 1 | -1/+7 |
| | | | | | | | | |||||
| | * | | | | | | db-doc: group_user description | Andreas Fischer | 2013-11-26 | 1 | -1/+7 |
| | | | | | | | | |||||
| | * | | | | | | Remove the dbprefix from comments. It has no information. | Andreas Fischer | 2013-11-26 | 1 | -6/+6 |
| | | | | | | | | |||||
| | * | | | | | | db-doc: permissions description | Andreas Fischer | 2013-11-26 | 1 | -1/+6 |
| | | | | | | | | |||||
| | * | | | | | | Prettier ASCII lists. ^^ | Andreas Fischer | 2013-11-26 | 1 | -9/+9 |
| | | | | | | | | |||||
| | * | | | | | | db-doc: filecache description | Andreas Fischer | 2013-11-26 | 1 | -1/+14 |
| | | | | | | | | |||||
| | * | | | | | | db-doc: mimetypes description | Andreas Fischer | 2013-11-26 | 1 | -1/+6 |
| | | | | | | | | |||||
| | * | | | | | | db-doc: storages description | Andreas Fischer | 2013-11-26 | 1 | -1/+7 |
| | | | | | | | | |||||
| | * | | | | | | db-doc: appconfig description | Andreas Fischer | 2013-11-26 | 1 | -0/+5 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #6058 from owncloud/ldap2avatar | blizzz | 2013-11-26 | 14 | -19/+245 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | 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 |
| | | | | | | | | | |||||
| | * | | | | | | | Avatar: accept OC_Image as in setParameter | Arthur Schiwon | 2013-11-22 | 1 | -3/+7 |
| | | | | | | | | | |||||
| | * | | | | | | | LDAP: user proxy must support canChangeAvatar too | Arthur Schiwon | 2013-11-22 | 1 | -0/+9 |
| | | | | | | | | | |||||
| | * | | | | | | | Enable user backends to provide avatar images | Arthur Schiwon | 2013-11-22 | 7 | -7/+137 |
| | | | | | | | | | |||||
| | * | | | | | | | LDAP: get user photo from LDAP and set it as avatar if available | Arthur Schiwon | 2013-11-22 | 2 | -1/+65 |
| | | | | | | | | | |||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |