Arthur Schiwon
|
1a020e0696
|
Resolve merge conflict
|
2013-09-27 13:34:15 +02:00 |
Jenkins for ownCloud
|
f31d31844e
|
[tx-robot] updated from transifex
|
2013-09-27 00:02:30 -04:00 |
|
Jenkins for ownCloud
|
28918d61d2
|
[tx-robot] updated from transifex
|
2013-09-22 12:58:42 -04:00 |
|
Jenkins for ownCloud
|
5b95e7aa0f
|
[tx-robot] updated from transifex
|
2013-09-20 10:50:14 -04:00 |
|
Jenkins for ownCloud
|
6b1843d91b
|
[tx-robot] updated from transifex
|
2013-09-18 11:50:02 -04:00 |
|
Jenkins for ownCloud
|
556bd1ef23
|
[tx-robot] updated from transifex
|
2013-09-13 21:49:24 -04:00 |
|
Jenkins for ownCloud
|
68015b2761
|
[tx-robot] updated from transifex
|
2013-09-11 06:50:06 -04:00 |
|
Jenkins for ownCloud
|
72689f643b
|
[tx-robot] updated from transifex
|
2013-09-10 10:42:16 -04:00 |
|
Jenkins for ownCloud
|
0527fb05ad
|
[tx-robot] updated from transifex
|
2013-09-05 07:37:32 -04:00 |
|
Jenkins for ownCloud
|
dbc78b1a58
|
[tx-robot] updated from transifex
|
2013-08-30 09:38:20 -04:00 |
|
Arthur Schiwon
|
321c514782
|
LDAP: case insensitive replace for more robustness
|
2013-08-27 22:23:48 +02:00 |
|
Jenkins for ownCloud
|
d5062b9e0e
|
[tx-robot] updated from transifex
|
2013-08-27 11:23:18 -04:00 |
|
Thomas Müller
|
c9123263ab
|
kill zh_CN.GB2312
|
2013-08-27 01:27:05 +02:00 |
|
Jenkins for ownCloud
|
d587146a5a
|
[tx-robot] updated from transifex
|
2013-08-25 19:21:52 -04:00 |
|
Jenkins for ownCloud
|
596ac40b7f
|
[tx-robot] updated from transifex
|
2013-08-23 20:17:08 -04:00 |
|
Jenkins for ownCloud
|
02b2b5a808
|
[tx-robot] updated from transifex
|
2013-08-22 10:37:23 -04:00 |
|
Arthur Schiwon
|
c482512e23
|
LDAP: fix wrong hook name
|
2013-08-22 00:00:33 +02:00 |
|
Jenkins for ownCloud
|
a89199cc7b
|
[tx-robot] updated from transifex
|
2013-08-21 08:14:27 -04:00 |
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 |