Jan-Christoph Borchardt
|
3d5c7ca245
|
Merge branch 'master' into navigation
|
2013-01-31 19:28:25 +01:00 |
blizzz
|
411e8e5218
|
Merge pull request #1365 from owncloud/ldap_multiple_server
LDAP: support for multiple LDAP/AD servers
|
2013-01-31 09:24:45 -08:00 |
Arthur Schiwon
|
afacaf8bc2
|
string fragment was added by accident and does not belong here
|
2013-01-31 18:00:07 +01:00 |
Robin Appelman
|
5417e44b2a
|
Files: fix moving files by DnD
|
2013-01-31 17:56:44 +01:00 |
Thomas Mueller
|
19714151e2
|
spell check
|
2013-01-31 17:53:01 +01:00 |
Thomas Mueller
|
5862f3d140
|
spell check
|
2013-01-31 17:51:59 +01:00 |
Thomas Mueller
|
7f2d7cdbe1
|
spell check
|
2013-01-31 17:44:25 +01:00 |
Thomas Mueller
|
a17a7f5cdb
|
adding l10n support to user_ldap
|
2013-01-31 17:43:24 +01:00 |
Jenkins for ownCloud
|
209d599ec5
|
[tx-robot] updated from transifex
|
2013-01-31 17:05:21 +01:00 |
Thomas Mueller
|
4162ba4d41
|
adding l10n support to files_trashbin
|
2013-01-31 16:48:41 +01:00 |
Jan-Christoph Borchardt
|
ad044eb888
|
Merge branch 'master' into navigation
|
2013-01-31 15:35:20 +01:00 |
Björn Schießle
|
8dd9dedee8
|
Merge pull request #1266 from schiesbn/trash_bin
Trash bin
|
2013-01-31 06:18:22 -08:00 |
Robin Appelman
|
54d46fe43c
|
remove outdated line
|
2013-01-31 15:00:48 +01:00 |
Björn Schießle
|
c8a4878b77
|
is_writable() is now isUpdatable() with the new filesystem
|
2013-01-31 14:55:14 +01:00 |
Björn Schießle
|
dff5148f6d
|
debug output removed
|
2013-01-31 14:48:57 +01:00 |
Björn Schießle
|
54eeb8b8fc
|
fix merge conflict
|
2013-01-31 10:55:59 +01:00 |
Björn Schießle
|
9c83b307f6
|
keep mtime
|
2013-01-31 10:50:02 +01:00 |
Björn Schießle
|
2ddd40ed41
|
rename 'undelete' to 'restore'
|
2013-01-31 10:06:02 +01:00 |
Arthur Schiwon
|
2f11d7fe12
|
LDAP: adjust settings interface for custom search attributes
|
2013-01-31 02:10:13 +01:00 |
Arthur Schiwon
|
1a854454d6
|
LDAP: avoid attempts to save null as configvalue
|
2013-01-31 02:00:29 +01:00 |
Arthur Schiwon
|
0b98dc30b2
|
LDAP: remove unnecessary placeholders, fixes PHP warnings
|
2013-01-31 01:56:16 +01:00 |
Arthur Schiwon
|
b5ed8b2751
|
LDAP: fix wrong index
|
2013-01-31 01:46:54 +01:00 |
Arthur Schiwon
|
b3b0544e17
|
LDAP: make it possible to define attributes that should be considered on searches
|
2013-01-31 01:46:34 +01:00 |
Jenkins for ownCloud
|
00a30e6651
|
[tx-robot] updated from transifex
|
2013-01-31 00:31:28 +01:00 |
Robin Appelman
|
207aa22d12
|
merge master into filesystem
|
2013-01-30 19:24:24 +01:00 |
Robin Appelman
|
95352fbc15
|
Files: Dont get maxUploadSize if the filecache needs to be upgraded
|
2013-01-30 19:19:19 +01:00 |
Björn Schießle
|
9ca0a93847
|
make spinner title translatable
|
2013-01-30 16:20:13 +01:00 |
Björn Schießle
|
c62a38fcb1
|
add spinner for undelete operation for visualisation
|
2013-01-30 15:35:24 +01:00 |
Björn Schießle
|
1592764a60
|
show a spinner instead of the delete button while moving files to the trash bin
|
2013-01-30 14:32:20 +01:00 |
Jan-Christoph Borchardt
|
284e690737
|
Merge branch 'master' into navigation
|
2013-01-30 13:53:43 +01:00 |
Arthur Schiwon
|
8f388d9df4
|
LDAP: update link to online documentation
|
2013-01-30 13:48:59 +01:00 |
Jörn Friedrich Dreyer
|
81a398c22c
|
use $.trim() for IE8
|
2013-01-30 13:29:24 +01:00 |
Björn Schießle
|
e6f1544f51
|
fix OC_Log::ERROR call
|
2013-01-30 13:04:32 +01:00 |
Björn Schießle
|
a6e5f4b85c
|
some minor improvements
|
2013-01-30 13:01:53 +01:00 |
Jörn Friedrich Dreyer
|
99dfaee1f6
|
reset checkbox after getting selected files instead of ofter dragging, speed up revert
|
2013-01-30 12:59:35 +01:00 |
Jörn Friedrich Dreyer
|
1d0ee61f3a
|
use post instead of get
|
2013-01-30 12:59:35 +01:00 |
Jörn Friedrich Dreyer
|
0089b17749
|
add multselect dnd
|
2013-01-30 12:59:34 +01:00 |
Thomas Müller
|
5761bd771f
|
Merge pull request #1227 from owncloud/hideuploadprogresscancelinielt10
hide upload progress bar and cancel action in IE < 10
|
2013-01-30 02:48:12 -08:00 |
Björn Schießle
|
d6adab6734
|
improved message if trash bin is empty
|
2013-01-30 10:07:29 +01:00 |
Arthur Schiwon
|
8fd263ef63
|
LDAP: update quota on every uncached userExists, i.e. also on every isLoggedIn, fixes #1278
|
2013-01-30 03:57:46 +01:00 |
Arthur Schiwon
|
e8db1e884e
|
LDAP: some inline documentation
|
2013-01-30 03:44:11 +01:00 |
Arthur Schiwon
|
14bc6f8c6c
|
LDAP: working visual feedback on save. Save button will be highlighted green or red.
|
2013-01-30 03:34:51 +01:00 |
Arthur Schiwon
|
19867b1d08
|
LDAP: make sure app meta data is not deleted from database when deleting configuration with empty prefix
|
2013-01-30 02:39:44 +01:00 |
Arthur Schiwon
|
a557522037
|
LDAP: send back error message properly
|
2013-01-30 02:39:11 +01:00 |
Arthur Schiwon
|
9f7d780276
|
LDAP: use consolidated method for determining config prefix
|
2013-01-30 02:31:14 +01:00 |
Arthur Schiwon
|
a8ac4bdf79
|
LDAP: Always preset configuration prefix when no configuratin is stored or all remaining ones are deleted
|
2013-01-30 02:30:24 +01:00 |
Jenkins for ownCloud
|
68266e70f2
|
[tx-robot] updated from transifex
|
2013-01-30 00:25:41 +01:00 |
Lukas Reschke
|
250c565d2b
|
Merge pull request #1360 from owncloud/display_name
introduction of display names
|
2013-01-29 14:05:54 -08:00 |
Arthur Schiwon
|
f33b72677b
|
LDAP: implement support for ownCloud Display Names
|
2013-01-29 20:41:48 +01:00 |
Björn Schießle
|
0c8bcacdc8
|
added some additional error handling
|
2013-01-29 13:36:33 +01:00 |