Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | merge master into navigation | Jan-Christoph Borchardt | 2012-12-18 | 1044 | -25260/+46122 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into navigation | Jan-Christoph Borchardt | 2012-11-02 | 127 | -2536/+2491 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into navigation | Jan-Christoph Borchardt | 2012-11-01 | 53 | -391/+664 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'navigation' of github.com:owncloud/core into navigation | Jan-Christoph Borchardt | 2012-10-31 | 1 | -0/+30 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | added old functions again to not break apps, but show a deprecation warning | Bernhard Posselt | 2012-10-29 | 1 | -0/+30 | |
| * | | | | | | | | | | | | | | | | | Merge branch 'master' into navigation | Jan-Christoph Borchardt | 2012-10-30 | 138 | -3584/+3682 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | enable hover state, now that needs to be added to the other icons | Jan-Christoph Borchardt | 2012-10-28 | 2 | -8/+31 | |
| * | | | | | | | | | | | | | | | | | merge breadcrumb root into navigation | Jan-Christoph Borchardt | 2012-10-28 | 15 | -193/+2029 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | first version of breadcrumb 'root', still have a weird feeling about this | Jan-Christoph Borchardt | 2012-10-28 | 8 | -31/+1853 | |
| * | | | | | | | | | | | | | | | | | | Merge branch 'navigation' of github.com:owncloud/core into navigation | Jan-Christoph Borchardt | 2012-10-28 | 2 | -37/+8 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | dont resize content div with javascript but use css box-sizing to do it | Bernhard Posselt | 2012-10-27 | 2 | -37/+8 | |
| * | | | | | | | | | | | | | | | | | | | improve user menu | Jan-Christoph Borchardt | 2012-10-28 | 2 | -6/+5 | |
| * | | | | | | | | | | | | | | | | | | | Merge branch 'master' into navigation | Jan-Christoph Borchardt | 2012-10-28 | 798 | -194492/+4030 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | first move of settings to top right | Jan-Christoph Borchardt | 2012-10-27 | 4 | -24/+147 | |
| * | | | | | | | | | | | | | | | | | | | first icon update. Next step: make sprited hover state (like for home already) | Jan-Christoph Borchardt | 2012-10-27 | 9 | -5023/+142 | |
| * | | | | | | | | | | | | | | | | | | | first base on navigation rework, less obtrusive, icons need to be updated, se... | Jan-Christoph Borchardt | 2012-10-26 | 7 | -89/+66 | |
* | | | | | | | | | | | | | | | | | | | | Merge pull request #1099 from herbrechtsmeier/ssl-proxy | Thomas Müller | 2013-01-31 | 10 | -9/+130 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | add SSL proxy support | herbrechtsmeier | 2013-01-31 | 2 | -4/+16 | |
| * | | | | | | | | | | | | | | | | | | | | add multiple domains reverse proxy support | Stefan Herbrechtsmeier | 2013-01-31 | 10 | -7/+116 | |
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #1398 from owncloud/appname-overlap | Thomas Müller | 2013-01-31 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | remove z-index from app labels which caused overlap with top bar | Jan-Christoph Borchardt | 2013-01-31 | 1 | -2/+2 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #1399 from owncloud/fix_ldap_proxy_display_names | Thomas Müller | 2013-01-31 | 1 | -0/+27 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | 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 | |
| |/ / / / / / / / / / / / / / / / / / / / | ||||||
* / / / / / / / / / / / / / / / / / / / / | Case insensitive Lang Detection fix #1328 | Brice Maron | 2013-01-31 | 1 | -1/+1 | |
|/ / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | Merge pull request #1396 from owncloud/apps_sorting | Jan-Christoph Borchardt | 2013-01-31 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | Sort internal apps above 3rdparty apps | Robin Appelman | 2013-01-31 | 1 | -0/+4 | |
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #1393 from owncloud/adding-index.html-with-redirect-master | blizzz | 2013-01-31 | 1 | -0/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | some web servers by default don't recognize index.php as default page - IIS f... | Thomas Mueller | 2013-01-31 | 1 | -0/+6 | |
* | | | | | | | | | | | | | | | | | | | | | 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 |