summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | merge master into navigationJan-Christoph Borchardt2012-12-181044-25260/+46122
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into navigationJan-Christoph Borchardt2012-11-02127-2536/+2491
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into navigationJan-Christoph Borchardt2012-11-0153-391/+664
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'navigation' of github.com:owncloud/core into navigationJan-Christoph Borchardt2012-10-311-0/+30
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | added old functions again to not break apps, but show a deprecation warningBernhard Posselt2012-10-291-0/+30
| * | | | | | | | | | | | | | | | | Merge branch 'master' into navigationJan-Christoph Borchardt2012-10-30138-3584/+3682
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | enable hover state, now that needs to be added to the other iconsJan-Christoph Borchardt2012-10-282-8/+31
| * | | | | | | | | | | | | | | | | merge breadcrumb root into navigationJan-Christoph Borchardt2012-10-2815-193/+2029
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | first version of breadcrumb 'root', still have a weird feeling about thisJan-Christoph Borchardt2012-10-288-31/+1853
| * | | | | | | | | | | | | | | | | | Merge branch 'navigation' of github.com:owncloud/core into navigationJan-Christoph Borchardt2012-10-282-37/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | dont resize content div with javascript but use css box-sizing to do itBernhard Posselt2012-10-272-37/+8
| * | | | | | | | | | | | | | | | | | | improve user menuJan-Christoph Borchardt2012-10-282-6/+5
| * | | | | | | | | | | | | | | | | | | Merge branch 'master' into navigationJan-Christoph Borchardt2012-10-28798-194492/+4030
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | first move of settings to top rightJan-Christoph Borchardt2012-10-274-24/+147
| * | | | | | | | | | | | | | | | | | | first icon update. Next step: make sprited hover state (like for home already)Jan-Christoph Borchardt2012-10-279-5023/+142
| * | | | | | | | | | | | | | | | | | | first base on navigation rework, less obtrusive, icons need to be updated, se...Jan-Christoph Borchardt2012-10-267-89/+66
* | | | | | | | | | | | | | | | | | | | Merge pull request #1099 from herbrechtsmeier/ssl-proxyThomas Müller2013-01-3110-9/+130
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | add SSL proxy supportherbrechtsmeier2013-01-312-4/+16
| * | | | | | | | | | | | | | | | | | | | add multiple domains reverse proxy supportStefan Herbrechtsmeier2013-01-3110-7/+116
* | | | | | | | | | | | | | | | | | | | | Merge pull request #1398 from owncloud/appname-overlapThomas Müller2013-01-311-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | remove z-index from app labels which caused overlap with top barJan-Christoph Borchardt2013-01-311-2/+2
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge pull request #1399 from owncloud/fix_ldap_proxy_display_namesThomas Müller2013-01-311-0/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | spell checkThomas Mueller2013-01-311-1/+1
| * | | | | | | | | | | | | | | | | | | | | LDAP: implement getDisplayName and getDisplayNames also for UserProxy (multip...Arthur Schiwon2013-01-311-0/+27
| |/ / / / / / / / / / / / / / / / / / / /
* / / / / / / / / / / / / / / / / / / / / Case insensitive Lang Detection fix #1328Brice Maron2013-01-311-1/+1
|/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Merge pull request #1396 from owncloud/apps_sortingJan-Christoph Borchardt2013-01-311-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Sort internal apps above 3rdparty appsRobin Appelman2013-01-311-0/+4
* | | | | | | | | | | | | | | | | | | | | Merge pull request #1393 from owncloud/adding-index.html-with-redirect-masterblizzz2013-01-311-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | some web servers by default don't recognize index.php as default page - IIS f...Thomas Mueller2013-01-311-0/+6
* | | | | | | | | | | | | | | | | | | | | Merge pull request #1365 from owncloud/ldap_multiple_serverblizzz2013-01-3119-140/+1241
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | string fragment was added by accident and does not belong hereArthur Schiwon2013-01-311-1/+0
| * | | | | | | | | | | | | | | | | | | | | spell checkThomas Mueller2013-01-311-2/+2
| * | | | | | | | | | | | | | | | | | | | | spell checkThomas Mueller2013-01-311-3/+3
| * | | | | | | | | | | | | | | | | | | | | spell checkThomas Mueller2013-01-311-2/+2
| * | | | | | | | | | | | | | | | | | | | | adding l10n support to user_ldapThomas Mueller2013-01-312-4/+7
| * | | | | | | | | | | | | | | | | | | | | LDAP: adjust settings interface for custom search attributesArthur Schiwon2013-01-311-0/+2
| * | | | | | | | | | | | | | | | | | | | | LDAP: avoid attempts to save null as configvalueArthur Schiwon2013-01-311-4/+3
| * | | | | | | | | | | | | | | | | | | | | LDAP: remove unnecessary placeholders, fixes PHP warningsArthur Schiwon2013-01-311-23/+23
| * | | | | | | | | | | | | | | | | | | | | LDAP: fix wrong indexArthur Schiwon2013-01-311-1/+1
| * | | | | | | | | | | | | | | | | | | | | LDAP: make it possible to define attributes that should be considered on sear...Arthur Schiwon2013-01-314-10/+70
| * | | | | | | | | | | | | | | | | | | | | LDAP: update link to online documentationArthur Schiwon2013-01-301-1/+1
| * | | | | | | | | | | | | | | | | | | | | LDAP: some inline documentationArthur Schiwon2013-01-302-0/+12
| * | | | | | | | | | | | | | | | | | | | | LDAP: working visual feedback on save. Save button will be highlighted green ...Arthur Schiwon2013-01-301-2/+12
| * | | | | | | | | | | | | | | | | | | | | LDAP: make sure app meta data is not deleted from database when deleting conf...Arthur Schiwon2013-01-301-1/+2
| * | | | | | | | | | | | | | | | | | | | | LDAP: send back error message properlyArthur Schiwon2013-01-301-1/+1
| * | | | | | | | | | | | | | | | | | | | | LDAP: use consolidated method for determining config prefixArthur Schiwon2013-01-301-6/+1
| * | | | | | | | | | | | | | | | | | | | | LDAP: Always preset configuration prefix when no configuratin is stored or al...Arthur Schiwon2013-01-302-24/+39
| * | | | | | | | | | | | | | | | | | | | | LDAP: make settings strings in JS translatableArthur Schiwon2013-01-241-8/+8
| * | | | | | | | | | | | | | | | | | | | | LDAP: make it possible to enable/disable server configurationsArthur Schiwon2013-01-246-14/+52
| * | | | | | | | | | | | | | | | | | | | | LDAP: forgotten file for deleteConfig featureArthur Schiwon2013-01-241-0/+34