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 |
Thomas Mueller
|
3af09f2acf
|
l10n support for the error dialog added
|
2013-01-31 10:43:59 +01:00 |
Thomas Mueller
|
8a662a6c74
|
Cleanup string - easier for translators
|
2013-01-31 10:34:54 +01:00 |
Thomas Mueller
|
e8b423f666
|
style fixes
|
2013-01-31 10:30:13 +01:00 |
Thomas Mueller
|
665bb41c1f
|
style fixes
|
2013-01-31 10:27:02 +01:00 |
Björn Schießle
|
2ddd40ed41
|
rename 'undelete' to 'restore'
|
2013-01-31 10:06:02 +01:00 |
Frank Karlitschek
|
5112dac102
|
remove spaces
|
2013-01-31 10:00:42 +01:00 |
Björn Schießle
|
170cf20298
|
addapt the css to adjust the change display name filed to the set password field
|
2013-01-31 09:57:16 +01:00 |
raghunayyar
|
b978cc8b28
|
Shorter, Cleaner JS in apps.js
|
2013-01-31 11:52:56 +05:30 |
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
|
5d0c5c854b
|
Cache: use greaterEquals in tests cases to prevent failures due to race conditions
|
2013-01-30 23:15:45 +01:00 |
Robin Appelman
|
057920b165
|
Still load js files in maintance mode
|
2013-01-30 23:05:44 +01:00 |
Robin Appelman
|
f452d2d0c4
|
Check for upgrade/maintance mode before trying to load an app
|
2013-01-30 22:55:33 +01:00 |
icewind1991
|
0cde86ac55
|
Merge pull request #673 from owncloud/filesystem
Filecache rewrite
|
2013-01-30 13:22:33 -08:00 |
Sam Tuke
|
c7b1bdf00e
|
Fixed handling of keyfile subdir creation
Improved keyfile subdir deletion (1 bug remains here)
|
2013-01-30 18:52:02 +00:00 |
Robin Appelman
|
6043789394
|
Bumb version number for displayname db upgrade
|
2013-01-30 19:37:02 +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 |
Robin Appelman
|
af3b0e30ed
|
Cache: don't insert duplicated during upgrade
|
2013-01-30 19:19:19 +01:00 |
Jan-Christoph Borchardt
|
228a181d48
|
use new user function to display real name if available, username still fallback
|
2013-01-30 18:35:53 +01:00 |
Sam Tuke
|
61b23ce6cc
|
Working on support for deleting directories (removing all keyfiles)
|
2013-01-30 17:25:17 +00:00 |
Thomas Mueller
|
8ded07dd5c
|
first style fixes - @samtuke: I added some TODO regarding undefined variables and unreachable code - please review
|
2013-01-30 17:49:05 +01:00 |
Jörn Friedrich Dreyer
|
de00111c1f
|
use on instead of live in users.js
|
2013-01-30 17:49:02 +01:00 |
Jörn Friedrich Dreyer
|
d7823adb07
|
attach to filelist which is present on .ready()
|
2013-01-30 17:46:33 +01:00 |
Thomas Müller
|
2fbf3d4090
|
Merge pull request #1381 from schiesbn/make_strings_translatable
make strings translatable
|
2013-01-30 08:11:18 -08:00 |
Jörn Friedrich Dreyer
|
263c3f3a42
|
attach on to filelist instead of individual td elements for file link behaviour
|
2013-01-30 17:10:40 +01:00 |
Jörn Friedrich Dreyer
|
22812c5f0d
|
replace live() with on() in core js
|
2013-01-30 17:00:54 +01:00 |
Björn Schießle
|
92921ceefd
|
make strings translatable
|
2013-01-30 16:28:41 +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 |
Frank Karlitschek
|
ea5861ed8c
|
remove leftover code
|
2013-01-30 15:27:20 +01:00 |
Frank Karlitschek
|
5e422dea61
|
fix typo
|
2013-01-30 14:52:35 +01:00 |
raghunayyar
|
0dfbd53a6e
|
Reduced Styling and Image loads as from src and not backgorund.
|
2013-01-30 19:12:51 +05:30 |
Thomas Müller
|
4786327901
|
Merge pull request #1225 from owncloud/add_multiselect_dnd
add multselect dnd
|
2013-01-30 05:41:01 -08:00 |
Lukas Reschke
|
bb48e0bbba
|
Merge pull request #1377 from irgsmirx/patch-3
Update lib/base.php
|
2013-01-30 05:37:52 -08:00 |
Frank Karlitschek
|
66cab77b6d
|
merge master
Merge branch 'master' into improved_appsmanagement
Conflicts:
settings/apps.php
settings/templates/apps.php
|
2013-01-30 14:36:17 +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 |
irgsmirx
|
0bce22966c
|
Update lib/base.php
Correction of typo "locate" -> "locale".
|
2013-01-30 14:27:08 +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 |
Frank Karlitschek
|
389c4e8415
|
mark recommended apps. server part not yet fully implemented
|
2013-01-30 13:39:53 +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 |