summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-02-0269-17/+267
* undelete -> restoreThomas Mueller2013-02-011-1/+1
* [tx-robot] updated from transifexJenkins for ownCloud2013-02-0162-2/+411
* Merge pull request #1351 from owncloud/navigationMichael Gapczynski2013-01-313-7/+10
|\
| * Merge branch 'master' into navigationJan-Christoph Borchardt2013-01-3172-242/+1335
| |\
| * \ Merge branch 'master' into navigationJan-Christoph Borchardt2013-01-31137-1069/+2641
| |\ \
| * \ \ Merge branch 'master' into navigationJan-Christoph Borchardt2013-01-3030-10/+172
| |\ \ \
| * \ \ \ merge stylesJan-Christoph Borchardt2013-01-28198-1214/+4814
| |\ \ \ \
| * \ \ \ \ merge changes in navigationJan-Christoph Borchardt2013-01-281-2/+1
| |\ \ \ \ \
| | * | | | | More Style Fixesraghunayyar2013-01-251-2/+1
| * | | | | | fix up content and content-wrapper merge ...Jan-Christoph Borchardt2013-01-1851-100/+117
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | merge master into navigationJan-Christoph Borchardt2013-01-15227-846/+1786
| |\ \ \ \ \ \
| * \ \ \ \ \ \ merge master into navigationJan-Christoph Borchardt2012-12-18249-1889/+3222
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into navigationJan-Christoph Borchardt2012-11-0252-51/+3
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into navigationJan-Christoph Borchardt2012-11-019-11/+52
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into navigationJan-Christoph Borchardt2012-10-3014-105/+103
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ merge breadcrumb root into navigationJan-Christoph Borchardt2012-10-285-121/+114
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | first version of breadcrumb 'root', still have a weird feeling about thisJan-Christoph Borchardt2012-10-283-7/+10
| * | | | | | | | | | | | Merge branch 'master' into navigationJan-Christoph Borchardt2012-10-2819-377/+597
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | first icon update. Next step: make sprited hover state (like for home already)Jan-Christoph Borchardt2012-10-271-1/+1
| * | | | | | | | | | | | | first base on navigation rework, less obtrusive, icons need to be updated, se...Jan-Christoph Borchardt2012-10-261-2/+2
* | | | | | | | | | | | | | Merge pull request #1099 from herbrechtsmeier/ssl-proxyThomas Müller2013-01-312-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | add multiple domains reverse proxy supportStefan Herbrechtsmeier2013-01-312-1/+3
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | spell checkThomas Mueller2013-01-311-1/+1
* | | | | | | | | | | | | | LDAP: implement getDisplayName and getDisplayNames also for UserProxy (multip...Arthur Schiwon2013-01-311-0/+27
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | 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
| * | | | | | | | | | | | | LDAP: implement deleteConfiguration featureArthur Schiwon2013-01-243-11/+73
| * | | | | | | | | | | | | LDAP: add missing new LDAP HelperArthur Schiwon2013-01-241-0/+66
| * | | | | | | | | | | | | LPAP: cleanup settings.php, it's already ajaxifiedArthur Schiwon2013-01-241-15/+0
| * | | | | | | | | | | | | LDAP: improve and cleanup settings JSArthur Schiwon2013-01-241-42/+53