Bjoern Schiessle
|
93f4dec798
|
fix part file handling and real size calculation, this should also solve #4581
Conflicts:
apps/files_encryption/lib/stream.php
|
2013-09-06 16:06:34 +02:00 |
|
Bjoern Schiessle
|
f6830e7462
|
check shares for the real file and not for the .part file
|
2013-09-06 16:05:11 +02:00 |
|
Bjoern Schiessle
|
404e36323a
|
first check if a extension exists before comparing it
|
2013-09-06 16:05:03 +02:00 |
|
Bjoern Schiessle
|
597a3cf1ad
|
handle part files correctly
|
2013-09-06 16:04:56 +02:00 |
kondou
|
d18a070a03
|
Have the "notsquare" error as data, not as message
|
2013-09-06 13:46:50 +02:00 |
|
kondou
|
c6ca9c1e9d
|
Use shorter array-conversion
|
2013-09-06 13:33:17 +02:00 |
Pete McFarlane
|
83afba5070
|
prefix #filestable to tbody tr
|
2013-09-06 10:01:11 +01:00 |
|
kondou
|
226c205631
|
Use usort() instead of uasort() to not maintain keys
|
2013-09-06 06:45:16 +02:00 |
Thomas Müller
|
e9849270e3
|
Revert "fixes #4574"
This reverts commit 81a45cfcf1.
|
2013-09-06 00:28:13 +02:00 |
Bart Visscher
|
4629d6ad67
|
Merge pull request #4704 from owncloud/rename-lostpassword-controller
Use the namespaced variation of the classname.
|
2013-09-05 14:38:03 -07:00 |
|
kondou
|
221bbd275c
|
Use \OC_App for checking whether encryption is enabled
|
2013-09-05 23:26:02 +02:00 |
|
kondou
|
85e41d9500
|
Sort files by name, not by mimetype
|
2013-09-05 23:17:53 +02:00 |
|
kondou
|
3774632ecc
|
Clean up avatars and preliminary use JSON->rawlist.php
|
2013-09-05 23:12:52 +02:00 |
|
kondou
|
15ab798353
|
Fix an IE8 bug with the avatarcropper.
1. Crop an avatar
2. Crop another avatar without reloading
-> Second cropper is 28px x 30px big
|
2013-09-05 19:26:02 +02:00 |
|
kondou
|
f84fe479a5
|
Only use mimetype_list and clean up a bit
|
2013-09-05 18:40:55 +02:00 |
|
kondou
|
992b59f70b
|
Make it possible to pass rawlist.php an JSON array, to filter by more than one mimetype
|
2013-09-05 16:54:12 +02:00 |
|
Jenkins for ownCloud
|
0527fb05ad
|
[tx-robot] updated from transifex
|
2013-09-05 07:37:32 -04:00 |
Arthur Schiwon
|
c01675de5d
|
more is_resource checks before readdir
|
2013-09-05 11:58:57 +02:00 |
Georg Ehrke
|
2954db165b
|
use avconv instead of ffmpeg
|
2013-09-05 09:53:35 +02:00 |
Bernhard Posselt
|
fbedd643f7
|
Merge pull request #4477 from owncloud/hooks-view
also emit hooks for views that are a subfolder of the user folder
|
2013-09-04 16:09:22 -07:00 |
|
kondou
|
6db96603a0
|
Have login-checks and CSRF checks
|
2013-09-05 00:04:31 +02:00 |
|
Thomas Müller
|
7618cf3005
|
adding public interface for preview
|
2013-09-04 23:45:11 +02:00 |
|
Thomas Müller
|
835f477d8f
|
Merge branch 'master' into appframework-master
|
2013-09-04 23:15:17 +02:00 |
|
kondou
|
8fd76e39cf
|
Use proper controller naming
|
2013-09-04 22:22:56 +02:00 |
|
kondou
|
b643c02bd5
|
Fix some bugs and remove \OCP\Avatar for now
|
2013-09-04 22:13:59 +02:00 |
|
Thomas Müller
|
68dce9dde5
|
fixing style, var name & PHPDoc
|
2013-09-04 21:22:36 +02:00 |
|
Thomas Müller
|
3b25babe35
|
Merge pull request #4683 from owncloud/publicuploadjserror
Fixed public upload error that prevents upload
|
2013-09-04 11:50:38 -07:00 |
|
Thomas Müller
|
e43e8b0db8
|
Merge branch 'master' into rename-lostpassword-controller
Conflicts:
core/lostpassword/controller.php
|
2013-09-04 20:46:32 +02:00 |
|
kondou
|
fca5db748b
|
Remove backgroundcolor on updating avatar, and add a missing parameter
|
2013-09-04 13:16:21 +02:00 |
|
Arthur Schiwon
|
ec3639dc7a
|
Always check variable type before using readdir to avoid surprises
|
2013-09-04 13:06:04 +02:00 |
|
kondou
|
820fd42161
|
Merge branch 'master' into oc_avatars
|
2013-09-04 12:56:40 +02:00 |
|
kondou
|
a1e7614d73
|
Clean up oc_avatars
|
2013-09-04 12:56:14 +02:00 |
Morris Jobke
|
09187f3b3b
|
Merge pull request #4449 from owncloud/clean_up_util
Clean up \OC\Util
|
2013-09-03 22:53:03 -07:00 |
|
Morris Jobke
|
6435e18e95
|
Merge pull request #4709 from owncloud/previews_in_ocidalogs_filepicker
Add previews to OC.dialogs.filepicker()
|
2013-09-03 22:35:58 -07:00 |
|
kondou
|
32a7ba9823
|
Don't update avatar on displayNameChange anymore
|
2013-09-04 07:13:09 +02:00 |
|
kondou
|
b1d20e0470
|
Have the header avatar to the left of the user name
|
2013-09-03 21:44:32 +02:00 |
|
kondou
|
6d42f51d0c
|
Fix unwanted caching in IE8
|
2013-09-03 18:34:40 +02:00 |
|
kondou
|
4724d60ecd
|
Partly fix cropper in IE8 and don't use a dialog for it
|
2013-09-03 17:40:41 +02:00 |
|
kondou
|
ce263df4c7
|
Don't use HTML5 <header> to support avatars in IE8
|
2013-09-03 16:52:15 +02:00 |
|
Christopher
|
c2eaf7589d
|
Merge pull request #4707 from owncloud/use_on_instead_of_deprecated_bind
use on to add event listener instead of deprecated jquery bind
|
2013-09-03 06:27:08 -07:00 |
|
kondou
|
d62c5063f4
|
Add previews to OC.dialogs.filepicker(); Fix #4697
|
2013-09-03 15:15:20 +02:00 |
Jörn Friedrich Dreyer
|
85758f3d7d
|
Merge pull request #4473 from owncloud/texteditor_polishing
Texteditor polishing
|
2013-09-03 05:38:59 -07:00 |
|
Jenkins for ownCloud
|
fe0b8ac2c0
|
[tx-robot] updated from transifex
|
2013-09-03 07:46:55 -04:00 |
|
Jörn Friedrich Dreyer
|
449fe8c75e
|
Revert "remove editor div in filelist", add "is deprecated" comment
This reverts commit 64d09452f5.
|
2013-09-03 13:20:20 +02:00 |
|
Jörn Friedrich Dreyer
|
b0c6f990e4
|
use on to add event listener instead of deprecated jquery bind
|
2013-09-03 13:12:19 +02:00 |
|
Morris Jobke
|
84aba4542d
|
Merge pull request #4702 from owncloud/center-utils
center utils
|
2013-09-03 02:27:52 -07:00 |
|
Morris Jobke
|
2da6f6b4ce
|
Merge pull request #4695 from owncloud/placeholder-hsl
RGB -> HSL
|
2013-09-03 02:18:39 -07:00 |
|
kondou
|
65413a95dc
|
Merge branch 'master' into oc_avatars
Conflicts:
config/config.sample.php
|
2013-09-03 04:43:11 +02:00 |
|
Christopher
|
a7de0e9652
|
Merge pull request #4706 from owncloud/fix_filepicker_mimetype
Use provided mimetype on open. Fix #4696
|
2013-09-02 19:36:03 -07:00 |
Thomas Tanghus
|
53a7f80ac3
|
Use provided mimetype on open. Fix #4696
|
2013-09-02 23:53:45 +02:00 |