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

15845 commits

This branch
This branch
All branches
Author SHA1 Message Date
Morris Jobke
0a1708ba11 Merge pull request #6912 from owncloud/replace-webroot-in-css 
Remove %webroot% from CSS
 2014-01-27 04:11:15 -08:00
Jan-Christoph Borchardt
46745895ae Merge pull request #5153 from owncloud/core-em-to-px 
Cleans up Core apps for relative(em) to absolute(px) styles.
 2014-01-27 02:29:47 -08:00
Jan-Christoph Borchardt
6fbc73e673 Merge pull request #5152 from owncloud/files-em-to-px 
Converts em to px values for styles in Files.
 2014-01-27 02:28:01 -08:00
Björn Schießle
1d3da8b0ed Merge pull request #6916 from owncloud/encryption_update_filecache 
[encryption] update file cache after the file was written
 2014-01-27 01:37:52 -08:00
raghunayyar
2a0e8329f9 Fixes settings.css and converts more styles. 2014-01-26 03:02:52 +05:30
raghunayyar
932e8f9f58 Fixes width of the dropdown menus as per computed styles. 2014-01-26 02:59:28 +05:30
Jan-Christoph Borchardt
d94c9bc8da Merge pull request #6939 from owncloud/disable-password-autocomplete 
prevent autofill for password change settings, prevent leak of existing password
 2014-01-25 07:54:55 -08:00
Jan-Christoph Borchardt
150d3856a0 prevent autofill for password change settings, prevent leak of existing password, fix #6552 2014-01-24 18:58:56 +01:00
Vincent Petry
3bea9b8ddd Merge pull request #6905 from owncloud/add_expiredate_to_linkshare 
add expire date to link share if possible
 2014-01-24 07:44:33 -08:00
Morris Jobke
dff2675efa Merge pull request #6923 from owncloud/files-maxuploadfieldstylefix 
Fixed max upload size input field style
 2014-01-24 07:05:50 -08:00
Björn Schießle
6875e3d9c7 Merge pull request #6921 from owncloud/trash_mimetype_size 
increase size of mimetype column
 2014-01-24 07:05:18 -08:00
Bjoern Schiessle
83878b9a7d only update file cache with the unenecrypted size when the file was written 2014-01-24 16:01:00 +01:00
Morris Jobke
1fe60e435e Merge pull request #6184 from owncloud/6051-ux-files-Move-File-Spinner 
#6051 [ux][files] Move File Spinner
 2014-01-24 06:53:53 -08:00
Vincent Petry
9f003a3546 Merge pull request #5954 from owncloud/extstorage-stream-sftp 
[Ext storage] Now using SFTP stream wrapper from phpseclib
 2014-01-24 06:20:23 -08:00
Bjoern Schiessle
77de47858b add expire date to link share if possible 2014-01-24 10:46:08 +01:00
Thomas Müller
9fa788c452 Merge pull request #6736 from owncloud/tests-jsunittests 
Added Javascript unit tests
 2014-01-23 12:43:05 -08:00
Thomas Müller
269f24cf96 remove css files from rewrite rule - there is no need to rewrite css any more 2014-01-23 21:28:19 +01:00
Vincent Petry
4734146580 Fixed max upload size input field style 
Added "type=text" makes it look like nice like all other fields
 2014-01-23 20:50:09 +01:00
Bjoern Schiessle
28b6434f46 increase size of mimetype column 2014-01-23 18:28:59 +01:00
Jan-Christoph Borchardt
5956277ed4 Merge pull request #6234 from owncloud/change-email-by-enter 
change mail address by pressing enter - fixes #6179
 2014-01-23 08:03:22 -08:00
Vincent Petry
bf95532fb6 Removed unused writeBack method 2014-01-23 15:05:05 +01:00
Jan-Christoph Borchardt
f0c9e8205f remove %webroot from files_sharing app 2014-01-23 14:04:13 +01:00
Jan-Christoph Borchardt
809fb8482d remove %webroot% from files app 2014-01-23 13:11:08 +01:00
Jan-Christoph Borchardt
25e9b7a742 add icons.css file, first step to get rid of %webroot% 2014-01-23 12:55:39 +01:00
Vincent Petry
421f24868a Now using SFTP stream wrapper from phpseclib 
- Upgraded phpseclib to master version (post 0.3.5)
- Now using fopen() on sftp URL for both read and write
- Fixes #4063
 2014-01-23 12:43:12 +01:00
Björn Schießle
0daabe5b6a Merge pull request #6898 from owncloud/encryption_infinite_loop 
[encryption] infinite loop on sharing
 2014-01-23 01:09:34 -08:00
Bjoern Schiessle
b489d6b0af fix infinite loop if folder and subfolder has the same name 2014-01-22 17:15:01 +01:00
Bjoern Schiessle
eaed786eed add path relative to the files folder of the currently logged in user to the output of getFolderContent() 2014-01-22 17:11:37 +01:00
Björn Schießle
4474421ada Merge pull request #6890 from owncloud/version_fix_array_order 
[files_versions] fix array order
 2014-01-22 02:52:30 -08:00
Morris Jobke
cf6e79cda8 Merge pull request #6719 from tripflex/fix_pubup_progbar 
Fix public upload progress bar
 2014-01-22 02:28:28 -08:00
Bjoern Schiessle
a567f74d86 fix array order 2014-01-22 11:13:15 +01:00
Bjoern Schiessle
8d36ddcf03 code clean-up 2014-01-22 11:10:32 +01:00
Bjoern Schiessle
0b89a45f11 fix size calculation of getAllVersions() 2014-01-22 11:10:23 +01:00
Vincent Petry
9851727b0d Merge pull request #6856 from owncloud/fixing-gallery-password-protected-access-master 
adding password protection check to getShareByToken()
 2014-01-21 11:08:58 -08:00
Thomas Müller
9bab05fd45 Merge branch 'master' into fixing-gallery-password-protected-access-master 2014-01-21 19:36:20 +01:00
Thomas Müller
3b7fea25a3 Merge pull request #6863 from owncloud/versioning_expire_function_tests 
Versioning expire function tests
 2014-01-21 08:39:50 -08:00
Vincent Petry
91e66eeee1 Merge pull request #6868 from owncloud/enc-fixrandomfailunittest 
Replaced time() with uniqid() to make sure the file name is unique
 2014-01-21 08:35:41 -08:00
Jörn Friedrich Dreyer
0dd54a1250 Merge pull request #6844 from owncloud/fix-css-loading-master 
Revert "use getAppWebPath() in here as well"
 2014-01-21 08:31:22 -08:00
Thomas Müller
3a17220c9f Merge pull request #6858 from owncloud/fix-setupfs-only-for-existing-users-master 
OC_Util::setupFS($user) will create a data dir for the given string - no...
 2014-01-21 07:36:30 -08:00
Vincent Petry
f09c19c316 Replaced time() with uniqid() to make sure the file name is unique 
The cache isn't cleared properly because unlink() doesn't remove the
cache entry which caused side-effects when reusing the same file name
(which randomly happens when time() returns the same value)

This fix first makes sure the unit tests don't fail any more.
The unlink() case with the cache will be investigated separately.
 2014-01-21 16:31:58 +01:00
Bjoern Schiessle
85269641db add first unit test for the versioning app 2014-01-21 16:22:08 +01:00
Bjoern Schiessle
9efd07fbab isolate getExpireList function to make it testable 2014-01-21 16:22:08 +01:00
Thomas Müller
c57c9eae76 Merge branch 'master' into fixing-gallery-password-protected-access-master 2014-01-21 16:01:24 +01:00
Thomas Müller
262f221d11 Merge branch 'master' into fix-setupfs-only-for-existing-users-master 2014-01-21 15:35:32 +01:00
Thomas Müller
98415d68a5 Merge pull request #6864 from owncloud/protect-versions-preview-master 
don't use the user id within the versions preview call as it could be us...
 2014-01-21 06:16:22 -08:00
Thomas Müller
37e278f2a9 don't use the user id within the versions preview call as it could be used to access previews of another user 2014-01-21 13:50:56 +01:00
Thomas Müller
2e7fed1b9b Merge pull request #6861 from owncloud/neutral_download_zip_default_name 
use 'download.zip' as default name for zip downloads instead of 'owncloud.zip'
 2014-01-21 04:19:26 -08:00
Thomas Müller
c9194f761f Merge pull request #6857 from owncloud/fix_user_ldap_sql_on_oracle 
user workaround to compare CLOB column with CHAR value
 2014-01-21 04:14:28 -08:00
Jörn Friedrich Dreyer
267e1f3c40 use 'download.zip' as default name for zip downloads instead of 'owncloud.zip' 2014-01-21 12:41:10 +01:00
Thomas Müller
a3ea5aa2ac fixing comment + adding unit test for checkPasswordProtectedShare 2014-01-21 12:07:08 +01:00