Björn Schießle
|
003ae7b916
|
use OC_Defaults directly from the template
|
2013-07-24 12:04:18 +02:00 |
|
Thomas Müller
|
9d91ceade4
|
fix php syntax
|
2013-07-24 10:49:33 +02:00 |
|
Thomas Müller
|
1a73e607bd
|
Merge branch 'master' into more-themable-strings
Conflicts:
lib/template.php
|
2013-07-24 09:35:33 +02:00 |
|
Jenkins for ownCloud
|
01f3f8e0cc
|
[tx-robot] updated from transifex
|
2013-07-22 02:03:23 -04:00 |
|
Arthur Schiwon
|
f6d133955e
|
LDAP: fix background job, resolves #3528
|
2013-07-19 18:41:29 +02:00 |
|
Jenkins for ownCloud
|
a8acbfdf7b
|
[tx-robot] updated from transifex
|
2013-07-16 02:06:21 -04:00 |
|
Jenkins for ownCloud
|
3fbf7ab189
|
[tx-robot] updated from transifex
|
2013-07-12 02:12:25 +02:00 |
|
Jan-Christoph Borchardt
|
83b2411b81
|
reword LDAP config and use themable strings, fix rest of #3791
|
2013-07-11 17:45:13 +02:00 |
|
Arthur Schiwon
|
5387e5c354
|
LDAP: even better check for emptiness, fixes #3815
|
2013-07-10 11:39:47 +02:00 |
|
Jenkins for ownCloud
|
3cb4a72960
|
[tx-robot] updated from transifex
|
2013-07-08 02:09:41 +02:00 |
|
Jenkins for ownCloud
|
096d7674fc
|
[tx-robot] updated from transifex
|
2013-07-07 02:06:06 +02:00 |
|
Jenkins for ownCloud
|
d2f50bc089
|
[tx-robot] updated from transifex
|
2013-06-29 02:09:10 +02:00 |
|
Bart Visscher
|
b1a2ddd149
|
Merge pull request #3799 from owncloud/fix_pdo_statement_wrapper_numrows_on_modification
Fix pdo statement wrapper numrows on modification
|
2013-06-28 07:15:38 -07:00 |
|
Jenkins for ownCloud
|
c3b8f2bf64
|
[tx-robot] updated from transifex
|
2013-06-25 02:13:40 +02:00 |
|
Jörn Friedrich Dreyer
|
88fc410c19
|
fix numRows usage in user_ldap
|
2013-06-24 16:29:58 +02:00 |
|
Jenkins for ownCloud
|
8c923a85de
|
[tx-robot] updated from transifex
|
2013-06-21 08:53:57 +02:00 |
|
Jenkins for ownCloud
|
01ab79d460
|
[tx-robot] updated from transifex
|
2013-06-20 02:43:39 +02:00 |
|
Jenkins for ownCloud
|
6c534c8165
|
[tx-robot] updated from transifex
|
2013-06-14 02:52:34 +02:00 |
|
Jenkins for ownCloud
|
4f0f537b42
|
[tx-robot] updated from transifex
|
2013-06-11 02:02:44 +02:00 |
|
Jenkins for ownCloud
|
3c79d89492
|
[tx-robot] updated from transifex
|
2013-06-08 02:13:41 +02:00 |
|
Jenkins for ownCloud
|
67c085417c
|
[tx-robot] updated from transifex
|
2013-06-07 02:17:50 +02:00 |
|
Jenkins for ownCloud
|
81b6cab94f
|
[tx-robot] updated from transifex
|
2013-06-06 02:21:31 +02:00 |
|
Jenkins for ownCloud
|
666a5c1cc7
|
[tx-robot] updated from transifex
|
2013-06-05 02:01:42 +02:00 |
|
Arthur Schiwon
|
4976f2e0d3
|
LDAP: append port when URL is passed in LDAP Host configuration, fixes #2600
|
2013-06-04 10:32:54 +02:00 |
|
Robin Appelman
|
251527c6e6
|
merge master into backgroundjob
|
2013-06-02 20:12:44 +02:00 |
|
Jenkins for ownCloud
|
cf71a54f5d
|
[tx-robot] updated from transifex
|
2013-06-02 02:07:21 +02:00 |
|
Jenkins for ownCloud
|
3013c02767
|
[tx-robot] updated from transifex
|
2013-06-01 02:03:53 +02:00 |
|
blizzz
|
1656cc2e7c
|
Merge pull request #3565 from owncloud/fix_ldap_sqlite_n_js
Fix ldap sqlite n js
|
2013-05-31 12:17:46 -07:00 |
|
blizzz
|
eafb241068
|
Merge pull request #3562 from owncloud/fix_ldap_offline_host_handling
Fix ldap offline host handling
|
2013-05-31 11:10:33 -07:00 |
|
Arthur Schiwon
|
2ff9677cd1
|
LDAP: sqlite compatibility for emptyiing tables
|
2013-05-31 20:07:13 +02:00 |
|
Arthur Schiwon
|
c49ee4d3e3
|
LDAP: fix setting value of checkbox after loading configuration
|
2013-05-31 20:06:40 +02:00 |
|
Arthur Schiwon
|
bd7771867b
|
LDAP: fix generation of alternate internal name on conflicts. Use also smaller number for better user experience on e.g. *DAV links
|
2013-05-30 16:55:21 +02:00 |
|
Jenkins for ownCloud
|
8e1d9261aa
|
[tx-robot] updated from transifex
|
2013-05-30 02:34:14 +02:00 |
|
Jenkins for ownCloud
|
0c621ff6a9
|
[tx-robot] updated from transifex
|
2013-05-26 02:03:54 +02:00 |
|
Arthur Schiwon
|
86d72b9a61
|
LDAP: fix possible recursion
|
2013-05-25 11:03:58 +02:00 |
|
Arthur Schiwon
|
bfa715768a
|
LDAP: fix handling when LDAP Host is offline
|
2013-05-25 11:02:51 +02:00 |
|
Jenkins for ownCloud
|
6a6c18dfab
|
[tx-robot] updated from transifex
|
2013-05-25 02:11:52 +02:00 |
|
Jenkins for ownCloud
|
b47729c5fc
|
[tx-robot] updated from transifex
|
2013-05-24 02:02:43 +02:00 |
|
Jenkins for ownCloud
|
698862519d
|
[tx-robot] updated from transifex
|
2013-05-23 02:00:27 +02:00 |
|
Jenkins for ownCloud
|
afdad5c74d
|
[tx-robot] updated from transifex
|
2013-05-21 02:04:52 +02:00 |
|
Jenkins for ownCloud
|
6609de28d8
|
[tx-robot] updated from transifex
|
2013-05-20 02:10:11 +02:00 |
|
Jenkins for ownCloud
|
694f42dfd5
|
[tx-robot] updated from transifex
|
2013-05-19 02:01:55 +02:00 |
|
Jenkins for ownCloud
|
9428d813ba
|
[tx-robot] updated from transifex
|
2013-05-18 02:03:28 +02:00 |
|
blizzz
|
2d51eefcb8
|
Merge pull request #3302 from owncloud/ldap_configurable_username_n_uuid
Ldap configurable username n uuid
|
2013-05-16 05:40:31 -07:00 |
|
Jenkins for ownCloud
|
966c2231e3
|
[tx-robot] updated from transifex
|
2013-05-16 02:01:37 +02:00 |
|
Arthur Schiwon
|
beaa10b823
|
Merge branch 'master' into ldap_configurable_username_n_uuid
|
2013-05-13 12:41:22 +02:00 |
|
Jenkins for ownCloud
|
e8c154f341
|
[tx-robot] updated from transifex
|
2013-05-13 02:10:20 +02:00 |
|
Jenkins for ownCloud
|
74f92d0c7f
|
[tx-robot] updated from transifex
|
2013-05-12 02:05:29 +02:00 |
|
Arthur Schiwon
|
d69579f773
|
LDAP: fix display of numerical display names
|
2013-05-08 17:54:38 +02:00 |
|
Arthur Schiwon
|
796ee8c4c0
|
LDAP: Implement clear mappings functionality
|
2013-05-08 17:47:07 +02:00 |
|