Christopher
|
90da518e3e
|
Merge pull request #4262 from owncloud/fix_jslint_kondou
Fix some JSLint warnings
|
2013-08-20 12:45:10 -07:00 |
Jenkins for ownCloud
|
e9644c2f52
|
[tx-robot] updated from transifex
|
2013-08-19 15:14:38 -04:00 |
|
Kondou
|
c7af26ec84
|
Merge pull request #4497 from owncloud/newlines_at_eof_kondou
Add newlines at the end of files
|
2013-08-18 07:16:15 -07:00 |
Bart Visscher
|
dda5eb2530
|
Merge pull request #4486 from owncloud/ldap_adjust_cache
LDAP: use memcache if available
|
2013-08-18 02:50:41 -07:00 |
|
kondou
|
9e8a6b704d
|
Add _many_ newlines at the end of files
|
2013-08-18 11:06:59 +02:00 |
Jan-Christoph Borchardt
|
ce9103d522
|
Merge pull request #4426 from owncloud/ldap_settings_design
Ldap settings design
|
2013-08-18 01:52:51 -07:00 |
|
kondou
|
edd92e4c09
|
Merge branch 'master' into fix_jslint_kondou
Conflicts:
apps/files/js/file-upload.js
|
2013-08-18 00:38:52 +02:00 |
Arthur Schiwon
|
f41c4312ff
|
LDAP: use memcache if available
|
2013-08-17 17:22:54 +02:00 |
|
Arthur Schiwon
|
c538ac3081
|
LDAP: only connect to LDAP once on login
|
2013-08-17 12:16:51 +02:00 |
|
Thomas Müller
|
de52157e76
|
remove ru_RU - fixes #3135
|
2013-08-17 11:43:37 +02:00 |
|
Arthur Schiwon
|
42fc2295e4
|
LDAP: Update Host in configuration chooser on Save
|
2013-08-15 16:10:49 +02:00 |
|
Arthur Schiwon
|
479f893f6d
|
LDAP: Show Host name in configuration drop down
|
2013-08-15 15:55:06 +02:00 |
|
Arthur Schiwon
|
cbfee81068
|
LDAP: slightly smaller input fields
|
2013-08-15 12:45:37 +02:00 |
|
Arthur Schiwon
|
7b17fd2f17
|
LDAP: move small info text strings into tooltips
|
2013-08-14 16:51:38 +02:00 |
|
Arthur Schiwon
|
a4fc9bbe8c
|
LDAP: right align labels on settings page
|
2013-08-14 16:38:25 +02:00 |
|
Jenkins for ownCloud
|
9492aeffe9
|
[tx-robot] updated from transifex
|
2013-08-13 09:13:11 -04:00 |
|
Jenkins for ownCloud
|
98f836363a
|
[tx-robot] updated from transifex
|
2013-08-09 08:06:31 -04:00 |
|
Jenkins for ownCloud
|
17fe748abc
|
[tx-robot] updated from transifex
|
2013-08-03 01:56:46 -04:00 |
|
Jenkins for ownCloud
|
b037f2dc6e
|
[tx-robot] updated from transifex
|
2013-08-01 01:57:04 -04:00 |
|
kondou
|
aaf0fec9f5
|
Fix some JSLint warnings
|
2013-07-31 21:21:02 +02:00 |
|
Jenkins for ownCloud
|
761f40328c
|
[tx-robot] updated from transifex
|
2013-07-31 02:01:45 -04:00 |
|
Jenkins for ownCloud
|
88e1ccbce3
|
[tx-robot] updated from transifex
|
2013-07-30 01:57:50 -04:00 |
|
Jenkins for ownCloud
|
0fde473cb7
|
[tx-robot] updated from transifex
|
2013-07-29 01:57:04 -04:00 |
|
Jenkins for ownCloud
|
48621115c1
|
[tx-robot] updated from transifex
|
2013-07-28 01:58:28 -04:00 |
|
Jenkins for ownCloud
|
fa35650e0a
|
[tx-robot] updated from transifex
|
2013-07-27 02:03:03 -04:00 |
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 |