dda7129a24
Merge branch 'master' of https://github.com/owncloud/core into last_cron_log
2014-03-21 20:23:31 +01:00
66c4fc04b8
use https as submodule url
...
git:// domains might not be allowed in all environments, while cloning
https through a proxy is fine. -> Make checkout in restrictive
environments possible.
2014-03-21 19:38:22 +01:00
4be0b3f6cc
Merge pull request #7844 from owncloud/fix_7803_blizzz
...
LDAP: create a new instance of Configuration on clone, fixes #7803
2014-03-21 18:02:10 +01:00
905aabf5d4
mobile: document min-width value
2014-03-21 16:43:40 +01:00
89ee551158
mobile: adjust breakpoint in JS as well
2014-03-21 16:43:04 +01:00
9b9b6ec31e
mobile: set a width for navigation popover to it's always 3 columns
2014-03-21 16:40:39 +01:00
f2566e649f
mobile: adjust break to 768, also fix min-widths
2014-03-21 16:36:45 +01:00
422ccf4cdb
add test for cloning and keeping configuration seperate
2014-03-21 15:31:30 +01:00
86d479cb28
Use array_key_exists instead of isset, because the latter returns false if the assigned value is null
2014-03-21 15:29:49 +01:00
c6aefada71
do not show Deleted Files on mobile, not optimized yet and button too long
2014-03-21 15:29:37 +01:00
055a09e487
On clone create a new instance of the Configuration
...
To avide effects on the original instance of Connection when the clone
is modified, for instance on authentication checks.
2014-03-21 15:27:51 +01:00
43313d120d
Merge pull request #7820 from owncloud/core-macwarning
...
Added warning for Mac OS on setup page
2014-03-21 15:06:11 +01:00
96e6cb3db4
all authentication apps are loaded at first - everything else relies on these apps
2014-03-21 15:00:25 +01:00
c4e7d7989a
Enable the use of 'optional' on password fields (JavaScript part)
...
See ed0c10a10b
2014-03-21 13:51:45 +00:00
40c20b2eeb
mobile: remove shift for multiselect bar to account for missing navigation
2014-03-21 14:34:05 +01:00
ecf52e05fb
mobile: adjust width of app title, fix overlap
2014-03-21 14:30:11 +01:00
6ff96b34ad
Merge branch 'master' into load-apps-proper-master
...
Conflicts:
apps/files/ajax/rawlist.php
cron.php
ocs/v1.php
2014-03-21 14:05:08 +01:00
7a8f1389fe
fix temporary file based common hash
2014-03-21 13:23:14 +01:00
37af74efb3
Merge pull request #7655 from owncloud/shared-unencryptedsize
...
Fixed warning when browsing Shared folder
2014-03-21 12:28:27 +01:00
a52bc333a2
Merge pull request #7611 from owncloud/fix-updater
...
Use $installedVersion instead of $currentVersion
2014-03-21 12:16:51 +01:00
c9d97d2ef2
add top:45px to position:fixed controls, fixes alignment on android 4.0.4 browser
2014-03-21 11:56:47 +01:00
3f95f9325f
Merge pull request #7823 from owncloud/fix_7796
...
Add FreeIPA UUID compatibility, fixes #7796
2014-03-21 11:27:18 +01:00
bcf388d3c5
[tx-robot] updated from transifex
2014-03-21 01:55:35 -04:00
7c3da27bf6
Fix duplicate ipauniqueid
2014-03-20 20:38:06 +00:00
7a0eccfc63
Correct field modifier checking
...
Existing code checks for the existence of a modifier ('&', '!', '#', '*')
anywhere in the field name, but strips the first character regardless. This
change makes it so that only modifiers at the beginning of the string are
counted.
2014-03-20 18:28:42 +00:00
ed0c10a10b
Enable the use of 'optional' on password fields
...
The logic has been changed, in that 'class="optional"' is applied to both
password and text types if the field begins with the optional market, '&'.
2014-03-20 18:27:40 +00:00
2c561c9c50
Merge pull request #7794 from owncloud/extstorage-obfuscatepasswords
...
Obfuscate passwords in ext storage config
2014-03-20 16:31:12 +01:00
fffe330bbc
Fix parameter order for Storage\Local::hash
2014-03-20 15:32:12 +01:00
316a22b463
Merge pull request #7808 from owncloud/quota-usequotaevenwhenfreespaceunknown
...
Still return quota value when free space is unknown
2014-03-20 15:29:14 +01:00
d95fde3924
Removed comment
2014-03-20 15:24:05 +01:00
5747e0e3f9
remove executable flag for file-upload.js
2014-03-20 13:26:21 +01:00
95a13e2690
Merge pull request #7814 from oskholl/master
...
Fix: 'Upload button tooltip doesn't disappear'
2014-03-20 13:25:21 +01:00
1e4e0cfcd5
Lazy load phpseclib in ext storage config
2014-03-20 13:21:34 +01:00
6de9033d86
Added warning for Mac OS on setup page
2014-03-20 12:57:55 +01:00
cf23defa52
Fix typo in mount loading
2014-03-20 12:52:09 +01:00
36c0f08ec0
Merge pull request #7732 from owncloud/datafolderexistence
...
Added .ocdata file to check for data folder validity
2014-03-20 11:31:28 +01:00
970878b581
Merge pull request #7818 from owncloud/logException_undefined_variable
...
Fix 'Undefined variable: message' in OCP\Util::logException
2014-03-20 11:14:30 +01:00
8a81df0f2c
Merge pull request #7651 from owncloud/close-session-faster-master
...
Close session faster
2014-03-20 11:07:21 +01:00
51fe3b8ccd
Fix 'Undefined variable: message' in OCP\Util::logException
2014-03-20 10:23:40 +01:00
59d1ee565e
Makes #app-navigation a part of app management.
2014-03-20 13:34:50 +05:30
3aa8647634
[tx-robot] updated from transifex
2014-03-20 01:56:42 -04:00
d76fd16abc
Merge pull request #7804 from jbtbnl/master
...
Remove cursor:pointer CSS from li element
2014-03-19 23:56:58 +01:00
90839b784f
Comment moved to prevent 'Line is too long' warning.
2014-03-19 23:05:03 +01:00
fa28c089fa
Fix: 'Upload button tooltip doesn't disappear'
...
Fixes issue #7461 . Tipsy tooltip must be hidden when the upload starts. Otherwise it covers the progress bar and stays in DOM.
2014-03-19 22:09:09 +01:00
ca595611f5
Add FreeIPA UUID compatibility, fixes #7796
...
Ability to use ipauniqueid for the UUID of a user
2014-03-19 20:30:24 +00:00
66bc0f0848
Still return quota value when free space is unknown
...
Fixed the quota storage wrapper to correctly return the quota value when
the free space is not known (which usually happens when the disk_free_space
function is disabled)
2014-03-19 19:07:11 +01:00
01e9e40d83
Merge pull request #7806 from owncloud/add-matroska-video
...
Add mimetype for MKV videos
2014-03-19 18:32:53 +01:00
9116c39a82
Fixed ext storage password field order issue
...
The old password field is now preserved in the JSON structure to make
sure that the order is preserved.
This is a quick fix until the UI is fixed to not rely on the PHP array
key order.
2014-03-19 17:56:36 +01:00
5b6c36347b
Fixed ext storage unit test for groups
...
Now creating real users and groups for testing external storage mounts
2014-03-19 17:55:34 +01:00
9abe6b7f87
Add mimetype for MKV videos
...
This will make oC create previews for MKVs.
Test file: http://www.auby.no/files/video_tests/h264_720p_hp_5.1_3mbps_vorbis_styled_and_unstyled_subs_suzumiya.mkv
To test this just apply this change and upload the test file, if an preview is generated this change is most likely working as expecting.
2014-03-19 17:45:20 +01:00
kondou
mh
blizzz
Jan-Christoph Borchardt
Morris Jobke
Thomas Müller
Robin McCorkell
Robin Appelman
Vincent Petry
Jörn Friedrich Dreyer
Lukas Reschke
Thomas Tanghus
raghunayyar
Oskar Hollmann