Georg Ehrke
|
8ef40277b2
|
Merge master into oc_preview
|
2013-08-30 18:11:18 +02:00 |
|
Georg Ehrke
|
b7758d0f8d
|
Merge master into oc_preview
|
2013-08-29 10:50:55 +02:00 |
Morris Jobke
|
6e8bc13aa3
|
fix weird logical behaviour
|
2013-08-27 10:58:17 +02:00 |
Thomas Müller
|
8cf9336bcb
|
storage information is path specific
|
2013-08-27 00:59:58 +02:00 |
|
Thomas Müller
|
1e4ebf47e2
|
webdav quota now displays the same values as the web interface does
|
2013-08-27 00:57:28 +02:00 |
|
Morris Jobke
|
7d141656ee
|
Merge branch 'xsendfile_complete_zip_fix' of github.com:riso/owncloud-core into riso-xsendfile_complete_zip_fix from pull request #3307
Conflicts:
lib/helper.php
|
2013-08-26 18:04:49 +02:00 |
|
Georg Ehrke
|
6ffa2a28d0
|
Merge branch 'master' into oc_preview
|
2013-08-23 23:10:37 +02:00 |
|
Georg Ehrke
|
f2702ff1ca
|
Merge master into oc_preview
|
2013-08-19 11:24:17 +02:00 |
Robin Appelman
|
d8c71ba734
|
merge master in storage-wrapper-quota
|
2013-08-18 11:34:56 +02:00 |
|
Thomas Müller
|
12f4494de0
|
Merge pull request #4339 from owncloud/mimetype-defaults
Add the option to provide templates for newly created files
|
2013-08-17 08:42:49 -07:00 |
|
Georg Ehrke
|
7fe9320ffe
|
improve unknown backend
|
2013-08-15 13:22:04 +02:00 |
Valerio Ponte
|
881e362f93
|
final fix for xsendfile zip generation race condition
|
2013-08-08 23:34:04 +02:00 |
|
Robin Appelman
|
9321eceed6
|
add the option to have templates for newly created files
|
2013-08-07 16:53:09 +02:00 |
|
Robin Appelman
|
fc332acf8a
|
split of mimetype detection code from OC_Helper, adding the option for apps to register additional mimetype mappings
|
2013-08-07 16:38:57 +02:00 |
Jan-Christoph Borchardt
|
5a77b67147
|
change long couldn't be determined string to question mark again
|
2013-08-04 16:27:17 +02:00 |
|
Georg Ehrke
|
ac6a3133ec
|
style fixes
|
2013-07-30 12:33:54 +02:00 |
|
Thomas Müller
|
7425efade7
|
Merge branch 'master' into oc_preview
Conflicts:
3rdparty
lib/template.php
|
2013-07-30 00:34:36 +02:00 |
|
Georg Ehrke
|
65affdc9b3
|
make previews in files app smaller
|
2013-07-29 14:40:26 +02:00 |
|
Robin Appelman
|
d042c8f166
|
use renamed constants
|
2013-07-25 16:00:48 +02:00 |
Bart Visscher
|
df8ad46dae
|
Change exit calls to throwing an exception
This way the error won't be fatal in a unit test
|
2013-07-21 22:29:50 +02:00 |
|
Georg Ehrke
|
53830f2f75
|
implement use of previews in sharing app
|
2013-07-11 11:58:52 +02:00 |
|
Georg Ehrke
|
a357e5b284
|
merge conflicts ...
|
2013-07-10 12:41:53 +02:00 |
|
Georg Ehrke
|
cf449d42e8
|
properly encode path
|
2013-07-10 12:30:20 +02:00 |
|
Bart Visscher
|
22c29eb64b
|
Fix renaming using parenthesis
|
2013-07-05 15:38:09 +02:00 |
|
Bart Visscher
|
424ec94680
|
Make buildNotExistingFileName testable and write unittests
|
2013-07-05 13:03:01 +02:00 |
Georg Ehrke
|
806f3bddec
|
increase size of preview to size of row
|
2013-06-26 18:19:13 +02:00 |
|
Georg Ehrke
|
39c387eed4
|
implement server side use of previews
|
2013-06-26 18:04:22 +02:00 |
Roland Hager
|
a06d901e37
|
Fix: The check if upload_max_filesize or post_max_size is 0 fails if only one of them is 0.
$upload_max_filesize and $post_max_size need to be casted to (int) to match "=== 0"
|
2013-06-21 09:33:06 +02:00 |
|
Robin Appelman
|
85abede9bf
|
actually return result
|
2013-06-07 00:22:05 +02:00 |
|
Robin Appelman
|
0470a5ba94
|
fix variable name
|
2013-06-07 00:17:51 +02:00 |
|
Robin Appelman
|
cf7321915d
|
seperate mimetype guessing from filename
|
2013-06-06 23:51:44 +02:00 |
Michael Gapczynski
|
59655e9afd
|
Style fixes
|
2013-05-29 10:56:28 -04:00 |
|
Robin Appelman
|
24a401a548
|
Cache mimetype icons
|
2013-05-29 15:43:41 +02:00 |
|
Bart Visscher
|
05a0b4533b
|
Merge pull request #2491 from riso/xsendfile_fix_zip
improved handling of xsendfile zip generation race condition
|
2013-05-03 05:37:01 -07:00 |
Bernhard Posselt
|
b98b56e4a8
|
check if there is a default/ folder in the theme directory if no theme exists
|
2013-04-24 13:45:40 +02:00 |
|
Valerio Ponte
|
033c94d076
|
fixed xsendfile zip generation race condition
|
2013-03-20 22:37:02 +01:00 |
|
Robin Appelman
|
8a97afac6f
|
Don't show storage space warning when the free space can't be determined
|
2013-03-15 16:46:20 +01:00 |
|
Robin Appelman
|
319e3f162c
|
Don't block uploads if the max upload size is unknown
|
2013-03-15 16:40:36 +01:00 |
|
Robin Appelman
|
32b8fd8fb7
|
Improve handeling of unlimited max upload size
|
2013-03-15 16:31:35 +01:00 |
Björn Schießle
|
eabfd9b69b
|
put value assignment into brackets
|
2013-02-22 16:45:57 +01:00 |
|
Björn Schießle
|
d8137fdf66
|
return both, count and result if the operation succeeded or failed. Maybe in some cases it is useful to know how much bytes where copied
|
2013-02-22 16:43:11 +01:00 |
|
Björn Schießle
|
5b94959686
|
using the number of writen bytes as indicator if streamCopy() was successfully. Instead check if fwrite returns the number of bytes or false
|
2013-02-22 14:56:50 +01:00 |
|
Robin Appelman
|
d96146a017
|
Give storage backends the option to define having no known free space
When this is the case only the configured max upload size is taking into account for uploading
|
2013-02-16 03:27:50 +01:00 |
|
Bart Visscher
|
ffae6f4b84
|
Style-fix: Breakup long lines
|
2013-02-14 08:38:37 +01:00 |
Lukas Reschke
|
46103e62d2
|
Coding style
|
2013-02-10 14:09:49 +01:00 |
|
Lukas Reschke
|
1b10032556
|
Use sanitizeHTML instead of stripslashes + htmlspecialchars
|
2013-02-10 14:03:40 +01:00 |
Jörn Friedrich Dreyer
|
1ef3e4c5c6
|
simplyfy mimetype parsing of 'file' output
|
2013-02-07 17:46:16 +01:00 |
|
Robin Appelman
|
207aa22d12
|
merge master into filesystem
|
2013-01-30 19:24:24 +01:00 |
TheSFReader
|
9c7a18044d
|
Merge remote-tracking branch 'refs/remotes/upstream/master'
|
2013-01-26 23:19:40 +01:00 |
|
Michael Gapczynski
|
7237ebf08b
|
Fix OC_Helper and change deprecated methods
|
2013-01-26 15:16:53 -05:00 |