Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-02 | 69 | -17/+267 |
* | undelete -> restore | Thomas Mueller | 2013-02-01 | 1 | -1/+1 |
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-01 | 62 | -2/+411 |
* | Merge pull request #1351 from owncloud/navigation | Michael Gapczynski | 2013-01-31 | 3 | -7/+10 |
|\ | |||||
| * | Merge branch 'master' into navigation | Jan-Christoph Borchardt | 2013-01-31 | 72 | -242/+1335 |
| |\ | |||||
| * \ | Merge branch 'master' into navigation | Jan-Christoph Borchardt | 2013-01-31 | 137 | -1069/+2641 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into navigation | Jan-Christoph Borchardt | 2013-01-30 | 30 | -10/+172 |
| |\ \ \ | |||||
| * \ \ \ | merge styles | Jan-Christoph Borchardt | 2013-01-28 | 198 | -1214/+4814 |
| |\ \ \ \ | |||||
| * \ \ \ \ | merge changes in navigation | Jan-Christoph Borchardt | 2013-01-28 | 1 | -2/+1 |
| |\ \ \ \ \ | |||||
| | * | | | | | More Style Fixes | raghunayyar | 2013-01-25 | 1 | -2/+1 |
| * | | | | | | fix up content and content-wrapper merge ... | Jan-Christoph Borchardt | 2013-01-18 | 51 | -100/+117 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | merge master into navigation | Jan-Christoph Borchardt | 2013-01-15 | 227 | -846/+1786 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | merge master into navigation | Jan-Christoph Borchardt | 2012-12-18 | 249 | -1889/+3222 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into navigation | Jan-Christoph Borchardt | 2012-11-02 | 52 | -51/+3 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' into navigation | Jan-Christoph Borchardt | 2012-11-01 | 9 | -11/+52 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into navigation | Jan-Christoph Borchardt | 2012-10-30 | 14 | -105/+103 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | merge breadcrumb root into navigation | Jan-Christoph Borchardt | 2012-10-28 | 5 | -121/+114 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | first version of breadcrumb 'root', still have a weird feeling about this | Jan-Christoph Borchardt | 2012-10-28 | 3 | -7/+10 |
| * | | | | | | | | | | | | Merge branch 'master' into navigation | Jan-Christoph Borchardt | 2012-10-28 | 19 | -377/+597 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | first icon update. Next step: make sprited hover state (like for home already) | Jan-Christoph Borchardt | 2012-10-27 | 1 | -1/+1 |
| * | | | | | | | | | | | | | first base on navigation rework, less obtrusive, icons need to be updated, se... | Jan-Christoph Borchardt | 2012-10-26 | 1 | -2/+2 |
* | | | | | | | | | | | | | | Merge pull request #1099 from herbrechtsmeier/ssl-proxy | Thomas Müller | 2013-01-31 | 2 | -1/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | add multiple domains reverse proxy support | Stefan Herbrechtsmeier | 2013-01-31 | 2 | -1/+3 |
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | spell check | Thomas Mueller | 2013-01-31 | 1 | -1/+1 |
* | | | | | | | | | | | | | | LDAP: implement getDisplayName and getDisplayNames also for UserProxy (multip... | Arthur Schiwon | 2013-01-31 | 1 | -0/+27 |
|/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Merge pull request #1365 from owncloud/ldap_multiple_server | blizzz | 2013-01-31 | 19 | -140/+1241 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | string fragment was added by accident and does not belong here | Arthur Schiwon | 2013-01-31 | 1 | -1/+0 |
| * | | | | | | | | | | | | | spell check | Thomas Mueller | 2013-01-31 | 1 | -2/+2 |
| * | | | | | | | | | | | | | spell check | Thomas Mueller | 2013-01-31 | 1 | -3/+3 |
| * | | | | | | | | | | | | | spell check | Thomas Mueller | 2013-01-31 | 1 | -2/+2 |
| * | | | | | | | | | | | | | adding l10n support to user_ldap | Thomas Mueller | 2013-01-31 | 2 | -4/+7 |
| * | | | | | | | | | | | | | LDAP: adjust settings interface for custom search attributes | Arthur Schiwon | 2013-01-31 | 1 | -0/+2 |
| * | | | | | | | | | | | | | LDAP: avoid attempts to save null as configvalue | Arthur Schiwon | 2013-01-31 | 1 | -4/+3 |
| * | | | | | | | | | | | | | LDAP: remove unnecessary placeholders, fixes PHP warnings | Arthur Schiwon | 2013-01-31 | 1 | -23/+23 |
| * | | | | | | | | | | | | | LDAP: fix wrong index | Arthur Schiwon | 2013-01-31 | 1 | -1/+1 |
| * | | | | | | | | | | | | | LDAP: make it possible to define attributes that should be considered on sear... | Arthur Schiwon | 2013-01-31 | 4 | -10/+70 |
| * | | | | | | | | | | | | | LDAP: update link to online documentation | Arthur Schiwon | 2013-01-30 | 1 | -1/+1 |
| * | | | | | | | | | | | | | LDAP: some inline documentation | Arthur Schiwon | 2013-01-30 | 2 | -0/+12 |
| * | | | | | | | | | | | | | LDAP: working visual feedback on save. Save button will be highlighted green ... | Arthur Schiwon | 2013-01-30 | 1 | -2/+12 |
| * | | | | | | | | | | | | | LDAP: make sure app meta data is not deleted from database when deleting conf... | Arthur Schiwon | 2013-01-30 | 1 | -1/+2 |
| * | | | | | | | | | | | | | LDAP: send back error message properly | Arthur Schiwon | 2013-01-30 | 1 | -1/+1 |
| * | | | | | | | | | | | | | LDAP: use consolidated method for determining config prefix | Arthur Schiwon | 2013-01-30 | 1 | -6/+1 |
| * | | | | | | | | | | | | | LDAP: Always preset configuration prefix when no configuratin is stored or al... | Arthur Schiwon | 2013-01-30 | 2 | -24/+39 |
| * | | | | | | | | | | | | | LDAP: make settings strings in JS translatable | Arthur Schiwon | 2013-01-24 | 1 | -8/+8 |
| * | | | | | | | | | | | | | LDAP: make it possible to enable/disable server configurations | Arthur Schiwon | 2013-01-24 | 6 | -14/+52 |
| * | | | | | | | | | | | | | LDAP: forgotten file for deleteConfig feature | Arthur Schiwon | 2013-01-24 | 1 | -0/+34 |
| * | | | | | | | | | | | | | LDAP: implement deleteConfiguration feature | Arthur Schiwon | 2013-01-24 | 3 | -11/+73 |
| * | | | | | | | | | | | | | LDAP: add missing new LDAP Helper | Arthur Schiwon | 2013-01-24 | 1 | -0/+66 |
| * | | | | | | | | | | | | | LPAP: cleanup settings.php, it's already ajaxified | Arthur Schiwon | 2013-01-24 | 1 | -15/+0 |
| * | | | | | | | | | | | | | LDAP: improve and cleanup settings JS | Arthur Schiwon | 2013-01-24 | 1 | -42/+53 |