Jörn Friedrich Dreyer
|
cec932f292
|
Merge branch 'master' into fix_3728_with_file_exists_dialog
Conflicts:
apps/files/js/file-upload.js
|
2013-09-10 16:54:48 +02:00 |
Jenkins for ownCloud
|
72689f643b
|
[tx-robot] updated from transifex
|
2013-09-10 10:42:16 -04:00 |
|
Thomas Müller
|
03ab26df75
|
Merge pull request #4787 from owncloud/fixing-php-end-tags-irods-master
Fixing php end tags irods master
|
2013-09-10 04:53:22 -07:00 |
|
Thomas Müller
|
d63ca25a94
|
proper test for use_logon_credentials
|
2013-09-10 12:35:14 +02:00 |
|
Thomas Müller
|
36e7a7c29b
|
use \OC::$session instead of $_SESSION
|
2013-09-10 12:34:41 +02:00 |
|
Thomas Müller
|
21e5daa218
|
removing all ?> jutt in case
|
2013-09-10 11:25:40 +02:00 |
|
Thomas Müller
|
c32c116957
|
removing ?> followed by whitespaces
|
2013-09-10 11:16:43 +02:00 |
|
Thomas Müller
|
956a2335ad
|
Merge pull request #4647 from owncloud/fix_4619
Workaround for IE 9 & 10 for clicking filelist after adding new item
|
2013-09-10 01:22:25 -07:00 |
Thomas Tanghus
|
2cdde7a56a
|
Merge pull request #4726 from owncloud/files-ie8-missingfilecheckboxes
Fixed missing checkboxes in IE8
|
2013-09-09 18:25:37 -07:00 |
|
Thomas Tanghus
|
fdfdd2e4e7
|
Remove console logging
|
2013-09-10 00:25:07 +02:00 |
|
Thomas Tanghus
|
51547c3316
|
Fix setting ocdialog options after initialization.
|
2013-09-10 00:21:42 +02:00 |
|
Thomas Müller
|
63a5409c6e
|
Merge pull request #4757 from owncloud/deleteAll-alias
change View->deleteAll to an alias of View->rmdir since rmdir works recursive
|
2013-09-09 15:08:18 -07:00 |
|
Thomas Müller
|
5e1821f21d
|
Merge pull request #4772 from owncloud/preview_improvements
oc\preview use avconv instead of ffmpeg
|
2013-09-09 12:32:45 -07:00 |
kondou
|
1832eb8872
|
Pass view in \OC_Avatar to constructor and use $_ for enable_avatars
|
2013-09-09 16:57:46 +02:00 |
|
Jenkins for ownCloud
|
92f6c3bb10
|
[tx-robot] updated from transifex
|
2013-09-08 21:37:53 -04:00 |
Vincent Petry
|
5f67ccba00
|
Fixed missing checkboxes in IE8
IE8 is not happy with the :checked CSS3 selector which causes it to
ignore the whole rule.
Replace it with a more compatible selector.
|
2013-09-08 22:21:07 +02:00 |
|
Jörn Friedrich Dreyer
|
e17c40acb7
|
Merge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core into fix_3728_with_file_exists_dialog
|
2013-09-08 17:31:49 +02:00 |
|
Jörn Friedrich Dreyer
|
bd1d5b69fb
|
fix ESC for conflicts dialog
|
2013-09-08 17:31:12 +02:00 |
|
Jörn Friedrich Dreyer
|
03c90e968f
|
whitespace and indentation fixes
|
2013-09-08 17:29:43 +02:00 |
|
kondou
|
564de4bc3f
|
Optimize triangle-e.png and triangle-e.svg
|
2013-09-08 15:18:23 +02:00 |
|
Christopher
|
f28c6bc213
|
Merge pull request #4761 from owncloud/fix_language_selection-kondou
Fix language selection
|
2013-09-08 05:50:41 -07:00 |
|
Jörn Friedrich Dreyer
|
577e3f22b2
|
remove unused hooks
|
2013-09-08 10:43:52 +02:00 |
|
Jörn Friedrich Dreyer
|
8828fafd36
|
cleanup comments
|
2013-09-08 10:41:20 +02:00 |
|
Jörn Friedrich Dreyer
|
0a0410815e
|
close and destroy dialog on ESC
|
2013-09-08 10:11:35 +02:00 |
|
kondou
|
4963a5b30f
|
Fix language selection; Fix #4756
|
2013-09-07 16:28:51 +02:00 |
Robin Appelman
|
00cc83e3f7
|
show preview for uploading image files on conflict
|
2013-09-07 14:58:51 +02:00 |
|
Robin Appelman
|
46a57a9f05
|
change View->deleteAll to an alias of View->rmdir since rmdir works recursive
|
2013-09-07 14:10:51 +02:00 |
|
Jenkins for ownCloud
|
e895cf9188
|
[tx-robot] updated from transifex
|
2013-09-07 04:46:57 -04:00 |
|
Jörn Friedrich Dreyer
|
ce03501646
|
fine ie8 compatability
|
2013-09-06 23:44:40 +02:00 |
|
Jörn Friedrich Dreyer
|
673e0c01a7
|
fix page leaving checks
|
2013-09-06 22:40:10 +02:00 |
|
Robin Appelman
|
2e1b534957
|
update phpdoc for public fileapi
|
2013-09-06 20:55:47 +02:00 |
|
Robin Appelman
|
0131a32025
|
extract interfaces from fileapi for public namespace
|
2013-09-06 20:38:59 +02:00 |
|
Robin Appelman
|
1cfd03771f
|
use ===
|
2013-09-06 20:20:17 +02:00 |
|
Jörn Friedrich Dreyer
|
796e137e82
|
fix upload to folder
|
2013-09-06 18:51:27 +02:00 |
|
Jörn Friedrich Dreyer
|
e2c0fe8296
|
fix upload of multiple files
|
2013-09-06 18:16:40 +02:00 |
|
Jörn Friedrich Dreyer
|
238d92b11c
|
refactor replace and autorename resolution in upload.php
|
2013-09-06 17:53:58 +02:00 |
|
kondou
|
4aa84047fe
|
Remove $recoveryPassword from changepersonalpassword & fix indent
|
2013-09-06 17:05:10 +02:00 |
|
Jörn Friedrich Dreyer
|
02d14aee17
|
completely remove dialog on cancel/continue
|
2013-09-06 16:50:45 +02:00 |
Bjoern Schiessle
|
b8241aa79d
|
remove some more debug output
|
2013-09-06 16:07:54 +02:00 |
|
Bjoern Schiessle
|
edb78c917c
|
remove some error_logs
|
2013-09-06 16:07:45 +02:00 |
|
Bjoern Schiessle
|
d33fabd02d
|
remove error logs
|
2013-09-06 16:07:25 +02:00 |
|
Bjoern Schiessle
|
b2dde14dbc
|
coding style fixes
|
2013-09-06 16:07:18 +02:00 |
|
Bjoern Schiessle
|
627b6164c4
|
if the files doesn't exist yet we start with the parent to search for shares
|
2013-09-06 16:07:07 +02:00 |
|
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 |
|
Jörn Friedrich Dreyer
|
4d04dd9c4c
|
Merge branch 'master' into fix_3728_with_file_exists_dialog
|
2013-09-06 13:42:05 +02:00 |
|
kondou
|
c6ca9c1e9d
|
Use shorter array-conversion
|
2013-09-06 13:33:17 +02:00 |