3b25babe35
Merge pull request #4683 from owncloud/publicuploadjserror
...
Fixed public upload error that prevents upload
2013-09-04 11:50:38 -07:00
49fd7e9f1e
refactor dialog creation
2013-09-04 16:42:18 +02:00
4af5a8c483
Merge branch 'master' into fix_3728_with_file_exists_dialog
...
Conflicts:
apps/files/ajax/upload.php
apps/files/js/file-upload.js
apps/files/js/filelist.js
apps/files/js/files.js
apps/files/templates/part.list.php
2013-09-04 14:11:40 +02:00
85758f3d7d
Merge pull request #4473 from owncloud/texteditor_polishing
...
Texteditor polishing
2013-09-03 05:38:59 -07:00
fe0b8ac2c0
[tx-robot] updated from transifex
2013-09-03 07:46:55 -04:00
449fe8c75e
Revert "remove editor div in filelist", add "is deprecated" comment
...
This reverts commit 64d09452f5
2013-09-03 13:20:20 +02:00
cafc8cb223
Change Files Scan command to use OC\User\Manager
2013-09-02 18:18:12 +02:00
f038cb9aea
Merge pull request #4671 from owncloud/emptycontent
...
centers text message in empty-content page (files and files_trashbin apps)
2013-09-01 17:47:55 -07:00
e68b5f8b0d
[tx-robot] updated from transifex
2013-09-01 13:30:40 -04:00
0aba549e7f
Use more object oriented way for console commands
2013-09-01 16:40:50 +02:00
307b673b79
Fixed public upload error that prevents upload
...
Public upload is broken because the file_upload_param variable expected
to exist by public.js didn't.
This fix sets the variable scope to the window to make it accessible
outside.
2013-09-01 16:14:46 +02:00
b10a646bc8
rename emptyfolder to emptycontent
2013-08-31 11:25:11 -04:00
4b32d84314
text centered horizontally and vertically in emptycontent div
2013-08-31 11:12:07 -04:00
668c4c2652
fix issue with filetable background
2013-08-30 22:05:44 +02:00
8ef40277b2
Merge master into oc_preview
2013-08-30 18:11:18 +02:00
40cee5639e
use gerMimeTypeDetector detectPath instead of getMimeType
2013-08-30 18:07:49 +02:00
dbc78b1a58
[tx-robot] updated from transifex
2013-08-30 09:38:20 -04:00
ab1f78eac3
prefix 'tbody tr' to separate app/core css errors
...
For specific details see:
https://github.com/owncloud/core/pull/4536/files#r6082305
2013-08-30 10:48:04 +01:00
f4ec5182bd
Workaround for IE 9 & 10 for clicking filelist after adding new item
2013-08-29 12:06:07 -04:00
b7758d0f8d
Merge master into oc_preview
2013-08-29 10:50:55 +02:00
6bd0f3cba7
Reimplement filesummary in JS
...
Fix #993
2013-08-28 15:10:17 +02:00
3eed060ec9
backport of #4357 to master
2013-08-27 23:53:04 +02:00
34a32d862c
Merge pull request #4572 from NCTU-NBA/pr-checkbox-displacement
...
Fix "select all" checkbox displacement when checked, fix #4571
2013-08-27 14:21:34 -07:00
d5062b9e0e
[tx-robot] updated from transifex
2013-08-27 11:23:18 -04:00
ea446544ef
Merge pull request #4586 from owncloud/fixing-3431-master
...
kill zh_CN.GB2312
2013-08-27 02:00:48 -07:00
c9123263ab
kill zh_CN.GB2312
2013-08-27 01:27:05 +02:00
8cf9336bcb
storage information is path specific
2013-08-27 00:59:58 +02:00
b16a018da9
use random string as id for checkbox
2013-08-26 16:33:51 +02:00
d538a566ac
fix background size in filelist.js
2013-08-26 14:36:18 +02:00
6f0c1e8d45
Merge master into oc_preview
2013-08-26 12:24:33 +02:00
46cbd7cd3b
fix preview issue when uploading a file with parentheses
2013-08-26 12:16:51 +02:00
a5873a96fa
Merge pull request #4542 from owncloud/fixing-4504-master
...
remove duplicate code
2013-08-26 02:19:32 -07:00
cd41de839f
Fix "select all" checkbox displacement when checked
2013-08-26 10:57:14 +08:00
d587146a5a
[tx-robot] updated from transifex
2013-08-25 19:21:52 -04:00
596ac40b7f
[tx-robot] updated from transifex
2013-08-23 20:17:08 -04:00
13e34649bf
move path generation for previews to dedicated function
2013-08-23 23:19:21 +02:00
6ffa2a28d0
Merge branch 'master' into oc_preview
2013-08-23 23:10:37 +02:00
02b2b5a808
[tx-robot] updated from transifex
2013-08-22 10:37:23 -04:00
7c9d999243
reduced complexity, added listing conflicts to dialog
2013-08-22 14:29:00 +02:00
101cfa2359
remove duplicate code
2013-08-22 00:09:43 +02:00
224b80f906
move isMimeSupported out of template files
2013-08-21 15:55:59 +02:00
bf04daff82
architecture too complex
2013-08-21 14:58:28 +02:00
a89199cc7b
[tx-robot] updated from transifex
2013-08-21 08:14:27 -04:00
90da518e3e
Merge pull request #4262 from owncloud/fix_jslint_kondou
...
Fix some JSLint warnings
2013-08-20 12:45:10 -07:00
e9644c2f52
[tx-robot] updated from transifex
2013-08-19 15:14:38 -04:00
48f0c54261
style fixes for preview lib
2013-08-19 12:16:55 +02:00
f2702ff1ca
Merge master into oc_preview
2013-08-19 11:24:17 +02:00
0890a915b3
adding file templates for ods, odt and odp
2013-08-18 21:11:11 +02:00
9be836814c
Merge pull request #4239 from owncloud/decrypt_files_again
...
Enable user to decrypt files again after encryption app was disabled
2013-08-18 09:51:48 -07:00
c620c5840a
Merge pull request #4498 from owncloud/uploadprogress-near-uploadbutton
...
move upload progress bar near upload button, more contextual
2013-08-18 09:30:47 -07:00
c7af26ec84
Merge pull request #4497 from owncloud/newlines_at_eof_kondou
...
Add newlines at the end of files
2013-08-18 07:16:15 -07:00
eb97818519
Merge pull request #4483 from owncloud/compare-true-false
...
Compare result are already true/false
2013-08-18 03:26:35 -07:00
dce7cdaaec
remove unneeded extra ID selectors
2013-08-18 11:27:51 +02:00
bf4efd5290
move upload progress bar near upload button, more contextual
2013-08-18 11:18:16 +02:00
9e8a6b704d
Add _many_ newlines at the end of files
2013-08-18 11:06:59 +02:00
edd92e4c09
Merge branch 'master' into fix_jslint_kondou
...
Conflicts:
apps/files/js/file-upload.js
2013-08-18 00:38:52 +02:00
d38929fb10
Fix spacing of all touched lines.
2013-08-17 23:38:26 +02:00
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
cabe92ef12
Merge branch 'master' into decrypt_files_again
...
Conflicts:
apps/files_encryption/tests/keymanager.php
2013-08-17 13:15:22 +02:00
29b6dd53a0
Compare result are already true/false
2013-08-17 12:58:10 +02:00
de52157e76
remove ru_RU - fixes #3135
2013-08-17 11:43:37 +02:00
7e4dcd268f
vertically center rename input box
2013-08-17 10:46:03 +02:00
164502477d
use jQuery.get instead of jQuery.ajax
2013-08-16 17:25:38 +02:00
64d09452f5
remove editor div in filelist
2013-08-16 17:19:48 +02:00
f94e603698
progress fixes
2013-08-16 11:40:55 +02:00
6bd0ba79df
[tx-robot] updated from transifex
2013-08-16 01:32:30 -04:00
d2767faf61
Merge pull request #4113 from owncloud/delete-fix
...
Delete icon fix
2013-08-15 15:31:42 -07:00
57f7ff2dbd
communicate size of newly created file back and update UI
2013-08-16 00:31:27 +02:00
7279a07ca2
Merge branch 'master' into mimetype-defaults
...
Conflicts:
apps/files/ajax/newfile.php
2013-08-16 00:13:10 +02:00
bd1895bdf8
Merge pull request #4354 from owncloud/fix_2711_shared_icon_disappears_on_firefox
...
fix #2711 using a custom event, also use css selectors over filterAttr
2013-08-15 14:08:01 -07:00
e7c0693570
checkstyle double quotes in HTML
2013-08-15 19:40:39 +02:00
ada13a4d40
fixing all broken translation files
2013-08-15 15:41:45 +02:00
7adfc27caf
remove whitespaces and some leftover code from testing
2013-08-15 13:13:16 +02:00
2fd5178a00
adjust New file dialog for new styles
2013-08-15 12:50:26 +02:00
680ac48856
[tx-robot] updated from transifex
2013-08-15 04:53:54 -04:00
b2f666c98f
fix file summary position
2013-08-14 21:26:06 +02:00
4b5fb08c2c
Merge master into oc_preview
2013-08-14 20:56:44 +02:00
137d644963
Merge branch 'oc_preview' of github.com:owncloud/core into oc_preview
2013-08-14 20:41:49 +02:00
cba0f69622
increase row height to 50px, properly position everything, checkboxes, actions etc
2013-08-14 20:41:20 +02:00
8f3f47e868
Merge pull request #4376 from owncloud/use_plurals
...
Use plural translations
2013-08-14 10:23:19 -07:00
a255cc6007
fix adding preview-icon to clss attribute
2013-08-14 18:52:53 +02:00
b3b2b2d64c
Merge pull request #4363 from owncloud/fix-4355
...
Send mime-type for new files
2013-08-14 09:46:10 -07:00
9da49264ea
change filelist ui updates
2013-08-14 17:49:45 +02:00
320bf0e8c1
fix breaking error due to ... a wrong icon link. Seriously?
2013-08-14 16:19:02 +02:00
4f525c864d
lazy load preview icons
2013-08-14 13:27:01 +02:00
e704c8e4dc
use web.svg instead of web.png
2013-08-14 11:51:54 +02:00
3cbbe395eb
don't use hardcoded size for preview
2013-08-14 11:38:52 +02:00
e1927d5bee
fix whitespace, check selected files before starting upload
2013-08-14 10:55:12 +02:00
4002491947
Reword a phrase
2013-08-14 06:29:19 +02:00
53bb89824d
check if some encrypted files are left after the app was disabled and warn the user
2013-08-12 17:25:27 +02:00
5ebff8cfc4
[tx-robot] updated from transifex
2013-08-11 08:11:03 -04:00
9549bd3e68
Use plural translations
2013-08-09 20:37:18 +02:00
98f836363a
[tx-robot] updated from transifex
2013-08-09 08:06:31 -04:00
beb27168de
Use multiple lines for the JSON data array.
2013-08-08 22:14:21 +02:00
0ab8850478
Adjust JSON code to stable5.
2013-08-08 22:14:21 +02:00
1ed049a682
Do not repeat JSON success code.
2013-08-08 22:14:21 +02:00
0718c92dc8
Do not repeat definition of $target.
2013-08-08 22:13:53 +02:00
8652137ad6
Merge pull request #3912 from owncloud/css_cleanup_kondou
...
General CSS cleanup
2013-08-08 07:31:01 -07:00
ff67f115d4
fix #2711 using a custom event, also use css selectors over filterAttr
2013-08-08 13:50:04 +02:00
f7915d745a
Merge pull request #4340 from owncloud/true-false-as-filename
...
Allow true and false as filenames.
2013-08-08 00:03:50 -07:00
d91104e120
actually register html template
2013-08-07 23:48:44 +02:00
67df0a60fb
Check expected type after JSON decode instead of checking what is not expected.
...
This will also allow "true" and "false" as filenames instead of only "null".
2013-08-07 17:01:14 +02:00
9321eceed6
add the option to have templates for newly created files
2013-08-07 16:53:09 +02:00
0deae7b86f
[tx-robot] updated from transifex
2013-08-07 09:04:32 -04:00
af983b843d
fix merge conflicts
2013-08-05 14:27:38 +02:00
bf1a9dfae3
Merge pull request #4285 from owncloud/scan-files-script-master
...
adding new cli script to rescan files
2013-08-05 01:09:15 -07:00
010c4e0b83
remove cli check
2013-08-02 21:28:04 +02:00
5e1a775016
adjust usage text
2013-08-02 21:23:26 +02:00
a7a05b321a
Use console.php entry point for file scanning from console
2013-08-02 15:36:54 +02:00
16726ab793
[tx-robot] updated from transifex
2013-08-02 02:00:45 -04:00
1348330c7d
Fix a syntax error & have if-conds in an own line
2013-08-01 18:44:01 +02:00
aaf0fec9f5
Fix some JSLint warnings
2013-07-31 21:21:02 +02:00
761f40328c
[tx-robot] updated from transifex
2013-07-31 02:01:45 -04:00
ac6a3133ec
style fixes
2013-07-30 12:33:54 +02:00
1a1c100719
fix loading.gif size for both upload and deletion, force visiblity
2013-07-30 10:44:01 +02:00
7425efade7
Merge branch 'master' into oc_preview
...
Conflicts:
3rdparty
lib/template.php
2013-07-30 00:34:36 +02:00
33fe24dc3d
Replace delete icon with spinner
2013-07-29 19:27:11 +03:00
7f9795cc3d
Merge pull request #4203 from owncloud/trashbin_improvements
...
Trashbin improvements
2013-07-29 08:15:53 -07:00
4a9f5f64da
remove whitespaces
2013-07-29 17:15:20 +02:00
1e4ec2ac27
add class='preview-icon' to rows in file app that make use of previews
2013-07-29 15:47:17 +02:00
0fde473cb7
[tx-robot] updated from transifex
2013-07-29 01:57:04 -04:00
fa35650e0a
[tx-robot] updated from transifex
2013-07-27 02:03:03 -04:00
3354249691
fix typo
2013-07-26 11:51:18 +02:00
a00cff7c05
disable "deleted files" button if trash bin is empty
2013-07-26 11:14:29 +02:00
92af840a51
Merge branch 'master' into css_cleanup_kondou
...
Conflicts:
core/css/styles.css
settings/templates/personal.php
2013-07-24 20:35:00 +02:00
ad266a4253
Merge branch 'master' into sabre-objecttree
2013-07-24 15:53:48 +02:00
1a73e607bd
Merge branch 'master' into more-themable-strings
...
Conflicts:
lib/template.php
2013-07-24 09:35:33 +02:00
7242480049
use $defaults->getName() as webdav REALM
2013-07-23 18:14:05 +02:00
2a42021815
Merge branch 'master' into delete-fix
...
Conflicts:
core/css/styles.css
2013-07-23 16:24:34 +02:00
934f2e94a3
Merge branch 'master' into disable-anon-upload-master
2013-07-22 11:36:52 +02:00
dba4111aa0
fix delete button not showing in IE8
2013-07-22 11:18:51 +02:00
01f3f8e0cc
[tx-robot] updated from transifex
2013-07-22 02:03:23 -04:00
37a731bcad
Merge pull request #4131 from owncloud/scanner-split
...
Remove scanner logic from ajax file and place it in it's own class
2013-07-21 11:32:11 -07:00
647e0a0cba
Merge pull request #4118 from owncloud/remove-size-experiment
...
finally remove the file size obfuscation as it had more disadvantages.
2013-07-21 01:25:39 -07:00
9a13b687cc
[tx-robot] updated from transifex
2013-07-21 02:02:41 -04:00
2b89b7c880
Split scanning logic from ajax file
2013-07-19 16:44:47 +02:00
ae82f7fd17
[tx-robot] updated from transifex
2013-07-19 02:03:14 -04:00
48948ccf5f
finally remove the file size obfuscation as it had more disadvantages. I was wrong, sorry.
2013-07-18 22:15:26 +02:00
4bfd61fb7f
use new delete icon for deleted files as well
2013-07-18 18:46:37 +02:00
8a25d1ad06
remove unnecessary tipsy for Files delete
2013-07-18 18:41:01 +02:00
197c979d26
use background image instead of img for Files delete icon
2013-07-18 18:40:09 +02:00
279a71acb3
[tx-robot] updated from transifex
2013-07-18 02:02:51 -04:00
210006c4a6
[tx-robot] updated from transifex
2013-07-17 02:28:02 -04:00
a8acbfdf7b
[tx-robot] updated from transifex
2013-07-16 02:06:21 -04:00
29d8ae2f95
[tx-robot] updated from transifex
2013-07-14 02:10:41 +02:00
583addaea1
[tx-robot] updated from transifex
2013-07-13 02:07:35 +02:00
5f5700e353
in case the encryption app is enabled we cannot yet allow anonymous upload
2013-07-12 17:05:58 +02:00
fc2d538311
new admin setting added which allows to turn off anonymous uploads
2013-07-12 17:03:51 +02:00
cb81ceb31d
add new file above summary if it is the first file in the list
2013-07-12 10:40:24 +02:00
3fbf7ab189
[tx-robot] updated from transifex
2013-07-12 02:12:25 +02:00
Thomas Müller
Jörn Friedrich Dreyer
Bart Visscher
Bernhard Posselt
Vincent Petry
Alessandro Cosentino
Georg Ehrke
petemcfarlane
ringmaster
kondou
Morris Jobke
Pellaeon Lin
Björn Schießle
Jan-Christoph Borchardt
Andreas Fischer
Bjoern Schiessle
Robin Appelman
Victor Dubiniuk