summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | |
| * | | fix broken console.log in ie8Jörn Friedrich Dreyer2013-01-021-1/+7
| | | |
* | | | phpdoc fixes for public apiRobin Appelman2013-01-023-71/+71
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-0224-37/+1778
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-0124-375/+466
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-3166-728/+1155
| | |
* | | Merge pull request #1043 from owncloud/fix_breadcrumb_slashesLukas Reschke2012-12-301-2/+3
|\ \ \ | | | | | | | | Replace %2F with / in breadcrumbs
| * | | Replace %2F with / in breadcrumbsMichael Gapczynski2012-12-281-2/+3
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-30144-1189/+1704
| | | |
* | | | Merge pull request #902 from owncloud/storage-wordingThomas Müller2012-12-283-18/+43
|\ \ \ \ | |/ / / |/| | | Storage wording
| * | | Change old variable name $default_quota to $defaultQuotaMichael Gapczynski2012-12-281-1/+1
| | | |
| * | | moving logic from template to the 'controller'Thomas Müller2012-12-212-13/+22
| | | | | | | | | | | | | | | | THX @VicDeo
| * | | remove unused codeThomas Müller2012-12-201-5/+0
| | | |
| * | | enable translations for quota sizes 'none' and 'default'Thomas Müller2012-12-202-7/+28
| | | |
| * | | dim Default Storage label color a bitJan-Christoph Borchardt2012-12-141-1/+1
| | | |
| * | | change storage space 'none' to 'Unlimited' and capitalize DefaultJan-Christoph Borchardt2012-12-141-3/+3
| | | |
| * | | change technical expression 'Quota' to simpler 'Storage'Jan-Christoph Borchardt2012-12-141-3/+3
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-2922-72/+117
| |_|/ |/| |
* | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-2848-420/+614
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-2728-123/+174
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-2622-111/+165
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-2516-69/+93
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-2438-376/+528
| | |
* | | Merge pull request #845 from owncloud/sqlite_errorFrank Karlitschek2012-12-221-2/+1
|\ \ \ | | | | | | | | Try to fix #836
| * | | Try to fix #836Frank Karlitschek2012-12-121-2/+1
| | | | | | | | | | | | | | | | https://github.com/owncloud/core/issues/836
* | | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-2342-147/+188
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-2246-269/+371
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-21138-355/+496
| | | |
* | | | fixing variable nameThomas Müller2012-12-211-2/+2
| | | |
* | | | Merge pull request #978 from owncloud/logout-iconMichael Gapczynski2012-12-202-18/+100
|\ \ \ \ | | | | | | | | | | fix logout icon, hopefully also #969
| * | | | fix logout icon, hopefully also #969Jan-Christoph Borchardt2012-12-202-18/+100
| | | | |