wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
16738 commits 157 branches 562 tags 714 MiB
Commit graph

16738 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jenkins for ownCloud
0245e64cec [tx-robot] updated from transifex 2014-03-22 01:56:09 -04:00
blizzz
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
Arthur Schiwon
422ccf4cdb add test for cloning and keeping configuration seperate 2014-03-21 15:31:30 +01:00
Arthur Schiwon
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
Arthur Schiwon
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
Morris Jobke
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
Vincent Petry
37af74efb3 Merge pull request #7655 from owncloud/shared-unencryptedsize 
Fixed warning when browsing Shared folder
 2014-03-21 12:28:27 +01:00
Vincent Petry
a52bc333a2 Merge pull request #7611 from owncloud/fix-updater 
Use $installedVersion instead of $currentVersion
 2014-03-21 12:16:51 +01:00
blizzz
3f95f9325f Merge pull request #7823 from owncloud/fix_7796 
Add FreeIPA UUID compatibility, fixes #7796
 2014-03-21 11:27:18 +01:00
Jenkins for ownCloud
bcf388d3c5 [tx-robot] updated from transifex 2014-03-21 01:55:35 -04:00
Robin McCorkell
7c3da27bf6 Fix duplicate ipauniqueid 2014-03-20 20:38:06 +00:00
Lukas Reschke
2c561c9c50 Merge pull request #7794 from owncloud/extstorage-obfuscatepasswords 
Obfuscate passwords in ext storage config
 2014-03-20 16:31:12 +01:00
Vincent Petry
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
Vincent Petry
d95fde3924 Removed comment 2014-03-20 15:24:05 +01:00
Morris Jobke
5747e0e3f9 remove executable flag for file-upload.js 2014-03-20 13:26:21 +01:00
Morris Jobke
95a13e2690 Merge pull request #7814 from oskholl/master 
Fix: 'Upload button tooltip doesn't disappear'
 2014-03-20 13:25:21 +01:00
Vincent Petry
1e4e0cfcd5 Lazy load phpseclib in ext storage config 2014-03-20 13:21:34 +01:00
Vincent Petry
6de9033d86 Added warning for Mac OS on setup page 2014-03-20 12:57:55 +01:00
Robin Appelman
cf23defa52 Fix typo in mount loading 2014-03-20 12:52:09 +01:00
Vincent Petry
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
Morris Jobke
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
Thomas Müller
8a81df0f2c Merge pull request #7651 from owncloud/close-session-faster-master 
Close session faster
 2014-03-20 11:07:21 +01:00
Thomas Tanghus
51fe3b8ccd Fix 'Undefined variable: message' in OCP\Util::logException 2014-03-20 10:23:40 +01:00
Jenkins for ownCloud
3aa8647634 [tx-robot] updated from transifex 2014-03-20 01:56:42 -04:00
Morris Jobke
d76fd16abc Merge pull request #7804 from jbtbnl/master 
Remove cursor:pointer CSS from li element
 2014-03-19 23:56:58 +01:00
Oskar Hollmann
90839b784f Comment moved to prevent 'Line is too long' warning. 2014-03-19 23:05:03 +01:00
Oskar Hollmann
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
Robin McCorkell
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
Vincent Petry
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
Lukas Reschke
01e9e40d83 Merge pull request #7806 from owncloud/add-matroska-video 
Add mimetype for MKV videos
 2014-03-19 18:32:53 +01:00
Vincent Petry
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
Vincent Petry
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
Lukas Reschke
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
jbtbnl
57cfff7d51 Fix #7758 2014-03-19 16:45:10 +01:00
Vincent Petry
6252c248c2 Merge pull request #7557 from owncloud/issue/7297 
Do not allow setting an expiration date in the past
 2014-03-19 15:53:08 +01:00
icewind1991
4f95adfb76 Merge pull request #7800 from owncloud/filesort-performance 
Improve sorting performance of large lists of files
 2014-03-19 15:38:15 +01:00
Vincent Petry
8e0a5ed5df Added tests to check mount point list for a target user 2014-03-19 15:21:54 +01:00
Robin Appelman
214357ca68 Improve sorting performance of large lists of files 2014-03-19 13:53:59 +01:00
Vincent Petry
4cb53f77b2 Moved external storage mounting code to files_external app 
Moved the mounting code for external storage from
OC\Filesystem::initMountPoint to files_external using the
post_initMountPoints hook
 2014-03-19 12:45:38 +01:00
Joas Schilling
7ab2632085 Use tipsy to display error when selecting a date in the past 2014-03-19 12:11:14 +01:00
Thomas Müller
c216c4777b Merge branch 'master' into close-session-faster-master 
Conflicts:
	apps/files/ajax/upgrade.php
 2014-03-19 11:44:21 +01:00
Vincent Petry
80180bea32 Added IV for ext storage password encryption 2014-03-19 11:42:22 +01:00
Thomas Müller
b9fc240b83 Merge pull request #7777 from owncloud/fix/7776 
updating 3rdparty submodule
 2014-03-19 11:36:00 +01:00
Thomas Müller
33e96597d1 Merge pull request #7790 from owncloud/fix/7788 
drop file cache migration OC5 -> OC6
 2014-03-19 11:29:50 +01:00
Vincent Petry
40a70ecf79 Added password obfuscation for external storage config 
Added obfuscation for all "password" options from external storages.
Added unit tests for reading/writing the configuration.
 2014-03-19 10:52:22 +01:00
Vincent Petry
e0dada704c Added ext storage unit tests for writing then reload the mount config 2014-03-19 10:52:22 +01:00
Vincent Petry
ff5b79edeb Merge pull request #7792 from owncloud/extstorage-fixpersonalstorage 
Fix validation of allowed personal backend
 2014-03-19 10:00:12 +01:00
Jenkins for ownCloud
7b1d52f5b9 [tx-robot] updated from transifex 2014-03-19 01:55:39 -04:00
Morris Jobke
2aa563b89c Merge pull request #7791 from owncloud/app-setting-auto-scroll 
Set overflow-y to auto
 2014-03-19 01:07:26 +01:00
Robin McCorkell
340cd2734b Merge pull request #7766 from Xenopathic/master 
Fix smb4php to work with home shares
 2014-03-18 19:42:04 +00:00