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

16683 commits

This branch
This branch
All branches
Author SHA1 Message Date
Scott Arciszewski
09cc020535 Update crypt.php 
Use a 256-bit random value
 2014-03-24 08:57:33 -04:00
Scott Arciszewski
36da3bc359 Update crypt.php 
A 1024 kilobyte key would be obnoxiously slow to operate on. I'm assuming you meant 1024-bit?

Also, 183 bytes = 1464 bits.

Here's a safe alternative: 2048 bits, with comment-code sanity
 2014-03-19 13:31:51 -04: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
Robin Appelman
214357ca68 Improve sorting performance of large lists of files 2014-03-19 13:53:59 +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
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
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
Vincent Petry
1f79f368ef Added unit tests for when adding ext storage mount points 
- test config was written correctly (global and local)
- test that personal mount points can be added for allowed backends
- test that personal mount points cannot be added for disallowed backends
- added $skipTest flag to make it possible add mount points without
  doing an actual check/connection (note: this is necessary because the
  static class OC_Mount_Config cannot be mocked)
 2014-03-18 18:29:08 +01:00
Thomas Tanghus
13f1f105c8 Set overflow-y to auto 2014-03-18 18:25:30 +01:00
Vincent Petry
8ababef4cd Fix validation of allowed personal backend 2014-03-18 17:54:14 +01:00
Thomas Müller
6b9ae27b90 drop file cache migration OC5 -> OC6 2014-03-18 17:14:38 +01:00
Morris Jobke
f6c3667efa Merge pull request #7784 from owncloud/enc-adminpageallowupload 
Display admin option for public upload with encryption enabled
 2014-03-18 12:49:38 +01:00
Vincent Petry
b75ca9fb50 Display admin option for public upload with encryption enabled 
Now that public upload works with encryption, the admin option to toggle
it must be made visible.
 2014-03-18 11:28:56 +01:00
Jenkins for ownCloud
d744e2c176 [tx-robot] updated from transifex 2014-03-18 01:55:31 -04:00
Thomas Müller
a4a185cc71 updating 3rdparty submodule 2014-03-17 22:22:16 +01:00
Thomas Müller
756bbe8786 Merge pull request #7649 from owncloud/routing-public 
Move routing classes to an interface and expose it in the public api
 2014-03-17 21:07:05 +01:00
Robin McCorkell
792d0d3314 Fix smb4php to work with home shares 
Stat'ing a share with url_stat now checks if the user can run 'ls' in that share rather than checking if the share is listed by the server. This means that OwnCloud can now mount user home shares, which are never listed by the server.
 2014-03-17 15:03:25 +00:00
icewind1991
6fbf3dd7c4 Merge pull request #7764 from owncloud/datadir-chmod 
use a non-recursive chmod on the datadir
 2014-03-17 15:52:44 +01:00
icewind1991
5c72b526a3 Merge pull request #7760 from owncloud/core-roundbytes 
Correctly round bytes when converted from human readable format
 2014-03-17 15:21:57 +01:00
Vincent Petry
df7853363a Merge pull request #7761 from owncloud/improve_documentation 
clarify the use-case of the encryption app.
 2014-03-17 13:23:35 +01:00
icewind1991
4112d63a40 Merge pull request #7727 from owncloud/cli-trusteddomainupgradewarning 
Added warning for trusted_domains after CLI upgrade
 2014-03-17 13:21:54 +01:00
Vincent Petry
bd98538a36 Merge pull request #7704 from owncloud/preview_use_pre_instead_of_post_delete_hook_2 
use preDelete instead of postDelete hook
 2014-03-17 12:59:35 +01:00
Vincent Petry
43ebd8cb64 Merge pull request #7728 from owncloud/oc_image_show_save_custom_mime 
make it possible to influence output type of \OC_Image
 2014-03-17 12:58:40 +01:00
Robin Appelman
166dfbf58b use a non-recursive chmod on the datadir 2014-03-17 12:53:55 +01:00
Frank Karlitschek
8a24e1eb96 clearify the use-case of this app 2014-03-17 12:29:17 +01:00
Vincent Petry
145db370d1 Correctly round bytes when converted from human readable format 
Instead of leave two decimal places which is confusing, round the byte
values correctly to the closest byte.
 2014-03-17 12:15:12 +01:00
Thomas Müller
cd038604d3 unit tests for specific image type output added 2014-03-17 08:40:59 +01:00
Thomas Müller
79ba930ef9 fixing PHPDoc 2014-03-17 08:17:56 +01:00
Jenkins for ownCloud
518903c6eb [tx-robot] updated from transifex 2014-03-17 01:56:06 -04:00
Morris Jobke
7ffaf0d70a Merge pull request #7734 from owncloud/icon-class-remove 
remove unneeded icon class
 2014-03-16 10:24:57 +01:00
Jenkins for ownCloud
c89aa6d5fe [tx-robot] updated from transifex 2014-03-16 03:13:21 -04:00
Jenkins for ownCloud
b2e929d580 [tx-robot] updated from transifex 2014-03-15 02:14:22 -04:00
Georg Ehrke
3527adbbe1 OC_Image::_output() - throw exception instead of falling back to png 2014-03-14 18:19:16 +01:00
Georg Ehrke
9dee3772eb remove image/pjpeg from OC_Image::_output 2014-03-14 18:12:33 +01:00
Jan-Christoph Borchardt
55c630ea7d remove unneeded icon class 2014-03-14 14:47:40 +01:00
Raghu Nayyar
0f0baa5303 Merge pull request #7725 from owncloud/body-public 
add 'body-public' ID to body in base layout so it can be identified via CSS
 2014-03-14 16:27:43 +05:30
Georg Ehrke
c140010e81 don't change mimetype of whole image object 2014-03-14 11:17:20 +01:00
Vincent Petry
1a116828cf Added warning for trusted_domains after CLI upgrade 
If trusted_domains is not set after a CLI upgrade, show a warning in the
output.
 2014-03-14 11:16:45 +01:00
Georg Ehrke
0c3c75efd5 always output a png 2014-03-14 11:14:09 +01:00
Georg Ehrke
6f96ab3e90 make it possible to influence output type of \OC_Image 2014-03-14 11:13:45 +01:00
Jan-Christoph Borchardt
74eb9bea22 add 'body-public' ID to body in base layout so it can be identified via CSS 2014-03-14 11:08:16 +01:00
Jenkins for ownCloud
53f5747ac1 [tx-robot] updated from transifex 2014-03-14 01:55:34 -04:00
Jenkins for ownCloud
49deb752cf [tx-robot] updated from transifex 2014-03-13 17:20:51 -04:00
Jenkins for ownCloud
4b802aa7cb [tx-robot] updated from transifex 2014-03-13 17:12:37 -04:00
Björn Schießle
b2757e621c Merge pull request #7686 from owncloud/ocs_fix_paths 
finally fix the paths for the OCS Share API
 2014-03-13 20:27:07 +01:00