summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* LDAP: Always preset configuration prefix when no configuratin is stored or ↵Arthur Schiwon2013-01-302-24/+39
| | | | all remaining ones are deleted
* 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
|
* LDAP: clean up, save configuration is now handled by AjaxArthur Schiwon2013-01-241-31/+0
|
* LDAP: Clear cache on saving settingsArthur Schiwon2013-01-241-0/+1
|
* LDAP: consolidate config prefix determination, autofill combo box in settingsArthur Schiwon2013-01-243-17/+15
|
* LDAP: fix defaultArthur Schiwon2013-01-231-1/+1
|
* LDAP settings: read configuration when another server config is chosenArthur Schiwon2013-01-232-3/+65
|
* make sure that Configuration is read when getConfiguration is called. And ↵Arthur Schiwon2013-01-231-4/+14
| | | | give back the appropriate result.
* fix more config keys for save settings handlingArthur Schiwon2013-01-201-2/+2
|
* fix continue in switch, add another key to skipArthur Schiwon2013-01-201-1/+2
|
* Ajaxifiy Settings SaveArthur Schiwon2013-01-204-5/+95
|
* fix mixed key and valueArthur Schiwon2013-01-181-1/+9
|
* LDAP: pass defaults to settings form, and restore them on creating a new ↵Arthur Schiwon2013-01-183-27/+46
| | | | configuration if wanted
* LDAP: gather defaults in one place, simplify readConfigurationArthur Schiwon2013-01-181-28/+91
|
* coding styleArthur Schiwon2013-01-181-12/+22
|
* LDAP: first basics for multiserver config uiArthur Schiwon2013-01-184-0/+78
|
* make sure port is used as backup port if not specified. documentation. ↵Arthur Schiwon2013-01-171-1/+9
| | | | determine connection error earlier.
* fix undeclared variableArthur Schiwon2013-01-171-0/+2
|
* LDAP: add support for backup/replica serversArthur Schiwon2013-01-173-9/+36
|
* LDAP: enable support for multiple LDAP/AD serversArthur Schiwon2013-01-161-5/+21
|
* LDAP: fix read configuration, remove unnecessary debug outputArthur Schiwon2013-01-161-7/+6
|
* LDAP: fix parameter passed not as expectedArthur Schiwon2013-01-161-1/+1
|
* add LDAP User and Group proxies to suppoer multiple serversArthur Schiwon2013-01-113-0/+441
|
* documentation for the Connection constructorArthur Schiwon2013-01-101-0/+5
|
* introduce configPrefix to allow settings for multiple LDAP serversArthur Schiwon2013-01-103-31/+33
|
* dechex not necessary, do not waste time with itArthur Schiwon2013-01-081-1/+1
|
* Code styleArthur Schiwon2013-01-081-6/+10
|
* support LDAP search using multiple base DNs also with paged results, ↵Arthur Schiwon2013-01-041-33/+50
| | | | implements #395
* support multiple base DNsArthur Schiwon2013-01-031-5/+42
|
* Base DNs will be used as array, now, to support usage of multiple DNsArthur Schiwon2013-01-031-3/+3
|
* Switch to textarea to enable configuration of multiple DNsArthur Schiwon2013-01-032-4/+6
|
* LDAP: fix spellingArthur Schiwon2013-01-031-1/+1
|
* fixing indentThomas Mueller2013-01-031-94/+94
|
* [tx-robot] updated from transifexJenkins for ownCloud2013-01-0340-286/+2271
|
* Merge pull request #1041 from owncloud/fixing-856-masterThomas Müller2013-01-022-5/+7
|\ | | | | Fixing #856 master
| * only show the max possible upload of 2GB on a 32 bit system.Thomas Mueller2012-12-282-1/+6
| | | | | | | | | | | | | | | | for a 64 bit system we have no such limitation refs #856 Conflicts: apps/files/templates/admin.php
| * Revert "fixed max possible upload size for files app in admin screen"Thomas Mueller2012-12-281-4/+1
| | | | | | | | | | | | | | This reverts commit 7f2208b9a11f608e7d726bf426fe4c2a672e058a. Conflicts: apps/files/admin.php
* | Merge pull request #975 from irgsmirx/patch-1Thomas Müller2013-01-021-8/+21
|\ \ | | | | | | Update lib/util.php
| * | Update lib/util.phpirgsmirx2012-12-201-8/+21
| | | | | | | | | getUrlContent should take proxy setting into consideration when not using curl, as well
* | | Merge pull request #1062 from owncloud/fix-1048-masterJörn Friedrich Dreyer2013-01-022-6/+11
|\ \ \ | | | | | | | | add smtp port configuration option
| * | | add smtp port configuration optionThomas Mueller2013-01-022-6/+11
|/ / /
* | | Merge pull request #945 from owncloud/fix_app_management_in_ie8Jörn Friedrich Dreyer2013-01-022-4/+4
|\ \ \ | | | | | | | | since @tanghus and @DeepDiver1975 gave me their :+1: I'll merge this now: Fix app management in ie8
| * | | combine ie8 fix with debug checkJörn Friedrich Dreyer2013-01-021-10/+4
| | | |
| * | | omit type attribute in script tag to use fallback (text/javascript)Jörn Friedrich Dreyer2013-01-021-1/+1
| | | |