Georg Ehrke
224b80f906
move isMimeSupported out of template files
2013-08-21 15:55:59 +02:00
Jörn Friedrich Dreyer
bf04daff82
architecture too complex
2013-08-21 14:58:28 +02:00
Jenkins for ownCloud
a89199cc7b
[tx-robot] updated from transifex
2013-08-21 08:14:27 -04:00
Christopher
90da518e3e
Merge pull request #4262 from owncloud/fix_jslint_kondou
...
Fix some JSLint warnings
2013-08-20 12:45:10 -07:00
Jenkins for ownCloud
e9644c2f52
[tx-robot] updated from transifex
2013-08-19 15:14:38 -04:00
Georg Ehrke
48f0c54261
style fixes for preview lib
2013-08-19 12:16:55 +02:00
Georg Ehrke
f2702ff1ca
Merge master into oc_preview
2013-08-19 11:24:17 +02:00
Thomas Müller
0890a915b3
adding file templates for ods, odt and odp
2013-08-18 21:11:11 +02:00
Björn Schießle
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
Christopher
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
Kondou
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
Bart Visscher
eb97818519
Merge pull request #4483 from owncloud/compare-true-false
...
Compare result are already true/false
2013-08-18 03:26:35 -07:00
Jan-Christoph Borchardt
dce7cdaaec
remove unneeded extra ID selectors
2013-08-18 11:27:51 +02:00
Jan-Christoph Borchardt
bf4efd5290
move upload progress bar near upload button, more contextual
2013-08-18 11:18:16 +02:00
kondou
9e8a6b704d
Add _many_ newlines at the end of files
2013-08-18 11:06:59 +02:00
kondou
edd92e4c09
Merge branch 'master' into fix_jslint_kondou
...
Conflicts:
apps/files/js/file-upload.js
2013-08-18 00:38:52 +02:00
Andreas Fischer
d38929fb10
Fix spacing of all touched lines.
2013-08-17 23:38:26 +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
Bjoern Schiessle
cabe92ef12
Merge branch 'master' into decrypt_files_again
...
Conflicts:
apps/files_encryption/tests/keymanager.php
2013-08-17 13:15:22 +02:00
Bart Visscher
29b6dd53a0
Compare result are already true/false
2013-08-17 12:58:10 +02:00
Thomas Müller
de52157e76
remove ru_RU - fixes #3135
2013-08-17 11:43:37 +02:00
Jan-Christoph Borchardt
7e4dcd268f
vertically center rename input box
2013-08-17 10:46:03 +02:00
Georg Ehrke
164502477d
use jQuery.get instead of jQuery.ajax
2013-08-16 17:25:38 +02:00
Jörn Friedrich Dreyer
64d09452f5
remove editor div in filelist
2013-08-16 17:19:48 +02:00
Jörn Friedrich Dreyer
f94e603698
progress fixes
2013-08-16 11:40:55 +02:00
Jenkins for ownCloud
6bd0ba79df
[tx-robot] updated from transifex
2013-08-16 01:32:30 -04:00
Jan-Christoph Borchardt
d2767faf61
Merge pull request #4113 from owncloud/delete-fix
...
Delete icon fix
2013-08-15 15:31:42 -07:00
Thomas Müller
57f7ff2dbd
communicate size of newly created file back and update UI
2013-08-16 00:31:27 +02:00
Thomas Müller
7279a07ca2
Merge branch 'master' into mimetype-defaults
...
Conflicts:
apps/files/ajax/newfile.php
2013-08-16 00:13:10 +02:00
Thomas Müller
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
Jan-Christoph Borchardt
e7c0693570
checkstyle double quotes in HTML
2013-08-15 19:40:39 +02:00
Thomas Müller
ada13a4d40
fixing all broken translation files
2013-08-15 15:41:45 +02:00
Bjoern Schiessle
7adfc27caf
remove whitespaces and some leftover code from testing
2013-08-15 13:13:16 +02:00
Jan-Christoph Borchardt
2fd5178a00
adjust New file dialog for new styles
2013-08-15 12:50:26 +02:00
Jenkins for ownCloud
680ac48856
[tx-robot] updated from transifex
2013-08-15 04:53:54 -04:00
Jan-Christoph Borchardt
b2f666c98f
fix file summary position
2013-08-14 21:26:06 +02:00
Georg Ehrke
4b5fb08c2c
Merge master into oc_preview
2013-08-14 20:56:44 +02:00
Jan-Christoph Borchardt
137d644963
Merge branch 'oc_preview' of github.com:owncloud/core into oc_preview
2013-08-14 20:41:49 +02:00
Jan-Christoph Borchardt
cba0f69622
increase row height to 50px, properly position everything, checkboxes, actions etc
2013-08-14 20:41:20 +02:00
Jörn Friedrich Dreyer
8f3f47e868
Merge pull request #4376 from owncloud/use_plurals
...
Use plural translations
2013-08-14 10:23:19 -07:00
Georg Ehrke
a255cc6007
fix adding preview-icon to clss attribute
2013-08-14 18:52:53 +02:00
Thomas Müller
b3b2b2d64c
Merge pull request #4363 from owncloud/fix-4355
...
Send mime-type for new files
2013-08-14 09:46:10 -07:00
Jörn Friedrich Dreyer
9da49264ea
change filelist ui updates
2013-08-14 17:49:45 +02:00
Jan-Christoph Borchardt
320bf0e8c1
fix breaking error due to ... a wrong icon link. Seriously?
2013-08-14 16:19:02 +02:00
Georg Ehrke
4f525c864d
lazy load preview icons
2013-08-14 13:27:01 +02:00
Georg Ehrke
e704c8e4dc
use web.svg instead of web.png
2013-08-14 11:51:54 +02:00
Georg Ehrke
3cbbe395eb
don't use hardcoded size for preview
2013-08-14 11:38:52 +02:00
Jörn Friedrich Dreyer
e1927d5bee
fix whitespace, check selected files before starting upload
2013-08-14 10:55:12 +02:00
kondou
4002491947
Reword a phrase
2013-08-14 06:29:19 +02:00
Bjoern Schiessle
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
Jenkins for ownCloud
5ebff8cfc4
[tx-robot] updated from transifex
2013-08-11 08:11:03 -04:00
kondou
9549bd3e68
Use plural translations
2013-08-09 20:37:18 +02:00
Jenkins for ownCloud
98f836363a
[tx-robot] updated from transifex
2013-08-09 08:06:31 -04:00
Andreas Fischer
beb27168de
Use multiple lines for the JSON data array.
2013-08-08 22:14:21 +02:00
Andreas Fischer
0ab8850478
Adjust JSON code to stable5.
2013-08-08 22:14:21 +02:00
Andreas Fischer
1ed049a682
Do not repeat JSON success code.
2013-08-08 22:14:21 +02:00
Andreas Fischer
0718c92dc8
Do not repeat definition of $target.
2013-08-08 22:13:53 +02:00
Jan-Christoph Borchardt
8652137ad6
Merge pull request #3912 from owncloud/css_cleanup_kondou
...
General CSS cleanup
2013-08-08 07:31:01 -07:00
Jörn Friedrich Dreyer
ff67f115d4
fix #2711 using a custom event, also use css selectors over filterAttr
2013-08-08 13:50:04 +02:00
Thomas Müller
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
Robin Appelman
d91104e120
actually register html template
2013-08-07 23:48:44 +02:00
Andreas Fischer
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
Robin Appelman
9321eceed6
add the option to have templates for newly created files
2013-08-07 16:53:09 +02:00
Jenkins for ownCloud
0deae7b86f
[tx-robot] updated from transifex
2013-08-07 09:04:32 -04:00
Georg Ehrke
af983b843d
fix merge conflicts
2013-08-05 14:27:38 +02:00
Thomas Müller
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
Thomas Müller
010c4e0b83
remove cli check
2013-08-02 21:28:04 +02:00
Thomas Müller
5e1a775016
adjust usage text
2013-08-02 21:23:26 +02:00
Bart Visscher
a7a05b321a
Use console.php entry point for file scanning from console
2013-08-02 15:36:54 +02:00
Jenkins for ownCloud
16726ab793
[tx-robot] updated from transifex
2013-08-02 02:00:45 -04:00
kondou
1348330c7d
Fix a syntax error & have if-conds in an own line
2013-08-01 18:44:01 +02:00
kondou
aaf0fec9f5
Fix some JSLint warnings
2013-07-31 21:21:02 +02:00
Jenkins for ownCloud
761f40328c
[tx-robot] updated from transifex
2013-07-31 02:01:45 -04:00
Georg Ehrke
ac6a3133ec
style fixes
2013-07-30 12:33:54 +02:00
Jan-Christoph Borchardt
1a1c100719
fix loading.gif size for both upload and deletion, force visiblity
2013-07-30 10:44:01 +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
Victor Dubiniuk
33fe24dc3d
Replace delete icon with spinner
2013-07-29 19:27:11 +03:00
Björn Schießle
7f9795cc3d
Merge pull request #4203 from owncloud/trashbin_improvements
...
Trashbin improvements
2013-07-29 08:15:53 -07:00
Bjoern Schiessle
4a9f5f64da
remove whitespaces
2013-07-29 17:15:20 +02:00
Georg Ehrke
1e4ec2ac27
add class='preview-icon' to rows in file app that make use of previews
2013-07-29 15:47:17 +02:00
Jenkins for ownCloud
0fde473cb7
[tx-robot] updated from transifex
2013-07-29 01:57:04 -04:00
Jenkins for ownCloud
fa35650e0a
[tx-robot] updated from transifex
2013-07-27 02:03:03 -04:00
Björn Schießle
3354249691
fix typo
2013-07-26 11:51:18 +02:00
Björn Schießle
a00cff7c05
disable "deleted files" button if trash bin is empty
2013-07-26 11:14:29 +02:00
kondou
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
Robin Appelman
ad266a4253
Merge branch 'master' into sabre-objecttree
2013-07-24 15:53:48 +02:00
Thomas Müller
1a73e607bd
Merge branch 'master' into more-themable-strings
...
Conflicts:
lib/template.php
2013-07-24 09:35:33 +02:00
Jörn Friedrich Dreyer
7242480049
use $defaults->getName() as webdav REALM
2013-07-23 18:14:05 +02:00
Thomas Müller
2a42021815
Merge branch 'master' into delete-fix
...
Conflicts:
core/css/styles.css
2013-07-23 16:24:34 +02:00
Thomas Müller
934f2e94a3
Merge branch 'master' into disable-anon-upload-master
2013-07-22 11:36:52 +02:00
Jan-Christoph Borchardt
dba4111aa0
fix delete button not showing in IE8
2013-07-22 11:18:51 +02:00
Jenkins for ownCloud
01f3f8e0cc
[tx-robot] updated from transifex
2013-07-22 02:03:23 -04:00
Bart Visscher
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
Morris Jobke
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
Jenkins for ownCloud
9a13b687cc
[tx-robot] updated from transifex
2013-07-21 02:02:41 -04:00
Robin Appelman
2b89b7c880
Split scanning logic from ajax file
2013-07-19 16:44:47 +02:00
Jenkins for ownCloud
ae82f7fd17
[tx-robot] updated from transifex
2013-07-19 02:03:14 -04:00
Jan-Christoph Borchardt
48948ccf5f
finally remove the file size obfuscation as it had more disadvantages. I was wrong, sorry.
2013-07-18 22:15:26 +02:00
Jan-Christoph Borchardt
4bfd61fb7f
use new delete icon for deleted files as well
2013-07-18 18:46:37 +02:00
Jan-Christoph Borchardt
8a25d1ad06
remove unnecessary tipsy for Files delete
2013-07-18 18:41:01 +02:00
Jan-Christoph Borchardt
197c979d26
use background image instead of img for Files delete icon
2013-07-18 18:40:09 +02:00
Jenkins for ownCloud
279a71acb3
[tx-robot] updated from transifex
2013-07-18 02:02:51 -04:00
Jenkins for ownCloud
210006c4a6
[tx-robot] updated from transifex
2013-07-17 02:28:02 -04:00
Jenkins for ownCloud
a8acbfdf7b
[tx-robot] updated from transifex
2013-07-16 02:06:21 -04:00
Jenkins for ownCloud
29d8ae2f95
[tx-robot] updated from transifex
2013-07-14 02:10:41 +02:00
Jenkins for ownCloud
583addaea1
[tx-robot] updated from transifex
2013-07-13 02:07:35 +02:00
Thomas Müller
5f5700e353
in case the encryption app is enabled we cannot yet allow anonymous upload
2013-07-12 17:05:58 +02:00
Thomas Müller
fc2d538311
new admin setting added which allows to turn off anonymous uploads
2013-07-12 17:03:51 +02:00
Björn Schießle
cb81ceb31d
add new file above summary if it is the first file in the list
2013-07-12 10:40:24 +02:00
Jenkins for ownCloud
3fbf7ab189
[tx-robot] updated from transifex
2013-07-12 02:12:25 +02:00
Georg Ehrke
53830f2f75
implement use of previews in sharing app
2013-07-11 11:58:52 +02:00
Jenkins for ownCloud
f74659f3f6
[tx-robot] updated from transifex
2013-07-11 02:26:22 +02:00
Jan-Christoph Borchardt
a9072056a0
Merge pull request #3990 from owncloud/size-mb
...
add MB indicator to size heading, fix #3987
2013-07-10 08:42:05 -07:00
Jan-Christoph Borchardt
3fb3a7baa8
add MB indicator to size heading, fix #3987
2013-07-10 13:52:55 +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
Georg Ehrke
8eefaba719
some style adjustments
2013-07-10 12:30:11 +02:00
Jenkins for ownCloud
7ec6f3bde9
[tx-robot] updated from transifex
2013-07-10 02:20:59 +02:00
Victor Dubiniuk
582631323a
Migrate to encodePath
2013-07-09 17:46:11 +03:00
kondou
4818e0062e
General CSS cleanup
2013-07-09 16:08:32 +02:00
Jenkins for ownCloud
439cad07b5
[tx-robot] updated from transifex
2013-07-09 02:12:22 +02:00
Thomas Müller
0365d244e0
Merge pull request #3946 from owncloud/fixing-3942-master
...
handle anonymous upload to reshared folder
2013-07-08 02:27:21 -07:00
Jenkins for ownCloud
3cb4a72960
[tx-robot] updated from transifex
2013-07-08 02:09:41 +02:00
Jenkins for ownCloud
096d7674fc
[tx-robot] updated from transifex
2013-07-07 02:06:06 +02:00
Jenkins for ownCloud
c8ad3df1fa
[tx-robot] updated from transifex
2013-07-06 02:08:38 +02:00
Thomas Müller
dad91c156f
Merge branch 'master' into fixing-3942-master
...
Conflicts:
apps/files/ajax/upload.php
2013-07-06 00:02:11 +02:00
Thomas Müller
e159cbf527
on reshares we now recursively move to the root of all reshares - therefore some code has been refactured and added as a new public function
2013-07-05 17:39:41 +02:00
Thomas Müller
352c1415be
proper fix for getting the shared item if no user is logged in
2013-07-05 13:45:21 +02:00
Thomas Müller
d1d6885585
php 5.3 compliant now
2013-07-05 13:22:38 +02:00
Thomas Müller
0c32f66899
get the real physical folder name for anonymous upload
2013-07-05 12:15:47 +02:00
Thomas Müller
0202d47f7a
fixing Notice: Undefined index: isPublic
2013-07-05 11:30:53 +02:00
Thomas Müller
11172db55b
handle anonymous upload to reshared folder
2013-07-05 09:58:41 +02:00
Jenkins for ownCloud
955646c461
[tx-robot] updated from transifex
2013-07-05 02:21:23 +02:00
Jenkins for ownCloud
51cfacd789
[tx-robot] updated from transifex
2013-07-04 09:33:58 +02:00
Morris Jobke
56e91aa7b3
Merge pull request #3915 from owncloud/summary_as_last_filelist_entry
...
Show a summary as the last filelist entry
2013-07-03 04:17:17 -07:00
Jenkins for ownCloud
811cf02675
[tx-robot] updated from transifex
2013-07-03 02:04:16 +02:00
Georg Ehrke
6e864e6599
fix size of icons in 'new' dropdown menu - I hope @jancborchardt knows a better solution coz this won't work in most IE versions ...
2013-07-02 16:30:58 +02:00
Jenkins for ownCloud
cec8384b1a
[tx-robot] updated from transifex
2013-07-02 15:35:55 +02:00
kondou
063b0a2d17
Don't escape filesize (can contain a '<')
2013-07-02 13:09:07 +02:00
Georg Ehrke
d332b1d4a2
implement preview loading after upload
2013-07-02 11:13:22 +02:00
kondou
b1d0de95a9
Show a summary as the last filelist entry
...
Fix #993
2013-07-02 04:28:52 +02:00
Thomas Müller
5fff4e0d08
Merge pull request #3903 from owncloud/nonpublic-uploading
...
Fix upload regressions
2013-07-01 12:35:32 -07:00
Robin Appelman
492c0571a0
fix detection of public upload in filelist.js
2013-07-01 15:47:40 +02:00
Robin Appelman
86342224da
fix uploading when ['dirtoken'] is not set
2013-07-01 15:39:11 +02:00
Robin Appelman
e55ed10b0d
code style
2013-07-01 15:37:52 +02:00
Morris Jobke
b19033b353
Merge pull request #3223 from owncloud/fix-2820
...
if rename of file fails, the rename is undone in the view - fix 2820
2013-07-01 01:28:17 -07:00
Jenkins for ownCloud
80a8b9c995
[tx-robot] updated from transifex
2013-07-01 03:28:25 +02:00
Robin Appelman
1e0810e807
use new ObjectTree in sabredav
2013-06-30 18:37:47 +02:00
Jenkins for ownCloud
4d74e8955f
[tx-robot] updated from transifex
2013-06-30 02:13:07 +02:00
Jenkins for ownCloud
d2f50bc089
[tx-robot] updated from transifex
2013-06-29 02:09:10 +02:00
Bart Visscher
e3df2b8c87
Merge pull request #1044 from owncloud/fix_extra_slash
...
Remove duplicate / for first folder in root
2013-06-28 12:00:35 -07:00
Bart Visscher
89dc8be9f5
update to !==
2013-06-28 21:00:09 +02:00
Jörn Friedrich Dreyer
7d3490036c
Merge pull request #3838 from rgeber/master
...
Public Upload Feature
2013-06-28 07:30:41 -07:00
Jenkins for ownCloud
29caae3491
[tx-robot] updated from transifex
2013-06-27 02:12:00 +02:00
Roman Geber
da0caadf4e
Added file-upload to GIT repo
...
Optimized CSS identifiers
2013-06-26 22:51:38 +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
Jenkins for ownCloud
afc3d9314a
[tx-robot] updated from transifex
2013-06-26 02:07:04 +02:00
Jan-Christoph Borchardt
1a8e4399b0
increase Files row height to tappable 44px, more breathing space
2013-06-25 15:09:48 +02:00
Roman Geber
ddb0ff346d
Public upload feature
2013-06-25 12:24:14 +02:00
Jenkins for ownCloud
c3b8f2bf64
[tx-robot] updated from transifex
2013-06-25 02:13:40 +02:00
Robin Appelman
909d279e55
Add a CLI script for manually triggering checking a folder for updates
2013-06-23 17:49:38 +02:00
Robin Appelman
6778a45d45
use json to encode user list
2013-06-19 15:02:18 +02:00
Robin Appelman
85585ede02
allow scanning files for multiple users
2013-06-19 01:26:08 +02:00
Morris Jobke
e0547a25ab
if rename of file fails, the rename is undone in the view - #fix 2820
...
Changes:
* OC.dialog -> OC.Notification
* Added test
* Fixed OC.Notification.show() issue for queued items
* Highlight failed item and show notification
2013-06-15 09:58:27 +02:00
Robin Appelman
398fe8bf32
reuse etag when doing a forced rescan
2013-06-14 17:05:52 +02:00
Jenkins for ownCloud
6c534c8165
[tx-robot] updated from transifex
2013-06-14 02:52:34 +02:00
Roland Hager
2df8468b2f
Revert "FIX: Download of files named "true" or "false" impossible"
...
This reverts commit d2d71c8797
.
which was accidentally commited
2013-06-12 18:30:28 +02:00
Roland Hager
d2d71c8797
FIX: Download of files named "true" or "false" impossible
...
It was not possible to download a file called "true" or "false" (caseinsensitive) when clicking the link "download" due to the result of json_decode().
Both cases are now implicitly checked.
Hotfix provided by Herbert Pophal
2013-06-12 17:25:21 +02:00
Jan-Christoph Borchardt
5d4ff0e537
better contrast for files list, darker greys for selection and hover
2013-06-11 14:49:34 +02:00
Jan-Christoph Borchardt
0872f641dd
darker low threshold color for file size and age fading, better contrast
2013-06-11 14:30:13 +02:00
Jenkins for ownCloud
3c79d89492
[tx-robot] updated from transifex
2013-06-08 02:13:41 +02:00
Jenkins for ownCloud
67c085417c
[tx-robot] updated from transifex
2013-06-07 02:17:50 +02:00
Jenkins for ownCloud
81b6cab94f
[tx-robot] updated from transifex
2013-06-06 02:21:31 +02:00
Jenkins for ownCloud
666a5c1cc7
[tx-robot] updated from transifex
2013-06-05 02:01:42 +02:00
Robin Appelman
e1b5598f00
Files: use public api to register backgroundjob
2013-06-02 21:21:39 +02:00
Jenkins for ownCloud
7c0c6bd779
[tx-robot] updated from transifex
2013-05-29 02:10:54 +02:00
Jenkins for ownCloud
3420d853ab
[tx-robot] updated from transifex
2013-05-28 02:07:51 +02:00
Jenkins for ownCloud
0c621ff6a9
[tx-robot] updated from transifex
2013-05-26 02:03:54 +02:00
Michael Gapczynski
dbb6a10364
Merge pull request #3478 from davidak/master
...
small typo fix: added 2 whitespaces
2013-05-25 11:21:21 -07:00
Jenkins for ownCloud
6a6c18dfab
[tx-robot] updated from transifex
2013-05-25 02:11:52 +02:00
davidak
56006ea852
small typo fix: added 2 whitespaces
2013-05-24 14:31:06 +02:00
Michael Gapczynski
a98d6c4be6
Merge pull request #3425 from owncloud/move-storages
...
Support for moving/copying folders between storages
2013-05-23 17:35:11 -07:00
Jenkins for ownCloud
b47729c5fc
[tx-robot] updated from transifex
2013-05-24 02:02:43 +02:00
Michael Gapczynski
30330b4343
Merge branch 'master' into move-storages
...
Conflicts:
tests/lib/files/view.php
2013-05-23 10:25:12 -04:00
Jenkins for ownCloud
698862519d
[tx-robot] updated from transifex
2013-05-23 02:00:27 +02:00
Morris Jobke
9fd2be0757
Merge pull request #3406 from owncloud/oc_dialogs_oc_template
...
Use js templates in OC.dialogs etc.
2013-05-22 03:00:04 -07:00
Jenkins for ownCloud
afdad5c74d
[tx-robot] updated from transifex
2013-05-21 02:04:52 +02:00
Michael Gapczynski
ec475cbcfa
Add data-dir attribute to home breadcrumb
2013-05-20 10:21:13 -04:00
Jenkins for ownCloud
6609de28d8
[tx-robot] updated from transifex
2013-05-20 02:10:11 +02:00
Jenkins for ownCloud
9428d813ba
[tx-robot] updated from transifex
2013-05-18 02:03:28 +02:00
Thomas Tanghus
152e275c8a
Various cleanups in OC.dialogs
2013-05-17 04:54:08 +02:00
Jenkins for ownCloud
6a6079176b
[tx-robot] updated from transifex
2013-05-17 02:07:36 +02:00
Jenkins for ownCloud
966c2231e3
[tx-robot] updated from transifex
2013-05-16 02:01:37 +02:00
Jenkins for ownCloud
6a788d1a54
[tx-robot] updated from transifex
2013-05-15 02:02:45 +02:00
Thomas Müller
fdef2a373a
Merge pull request #2821 from owncloud/fix-2159-rename-to-shared
...
fix allowed rename of folder in root directory to reserved name "Shared"
2013-05-14 13:13:16 -07:00
Raghu Nayyar
418503a4ad
Merge pull request #3338 from owncloud/button_color_fix
...
Keeping Font Colors Consistant on the headers.
2013-05-14 09:52:54 -07:00
Morris Jobke
0d8fa2eb98
[files] add private declaration of $view
2013-05-14 12:49:23 +02:00
raghunayyar
18618c75aa
color change to crumb elements as well.
2013-05-14 11:07:12 +05:30
raghunayyar
6d95d130e4
Keeping Font Colors Consistant on the headers.
2013-05-13 23:12:05 +05:30
Jörn Friedrich Dreyer
591b383f2d
peselect filename without extension on rename
2013-05-13 15:54:45 +02:00
Morris Jobke
e2bd32323d
[files] fix mock creation and remove hardcoded 'require' statement
2013-05-12 13:02:01 +02:00
Morris Jobke
b777c0fd75
[files] rename lib to "App"
2013-05-12 11:47:22 +02:00
Morris Jobke
b32c30b6d0
[files] ownCloud typo
2013-05-12 11:47:22 +02:00
Morris Jobke
7e23e97676
[files] rename test class and add rename test
2013-05-12 11:47:22 +02:00
Morris Jobke
d4ba9cf338
[files] remove realpath in test
2013-05-12 11:47:22 +02:00
Morris Jobke
bb5554de7f
[files] rename tests
2013-05-12 11:47:22 +02:00
Morris Jobke
b9f426b1d7
[files] remove normalizePath on rename and dependency injection
2013-05-12 11:47:22 +02:00
Morris Jobke
324c423548
[files] kill stripslashes
2013-05-12 11:47:22 +02:00
Morris Jobke
418e878ba8
[files] fix typos
2013-05-12 11:47:22 +02:00
Morris Jobke
1020d5c16c
[files] refactoring
2013-05-12 11:47:22 +02:00
Morris Jobke
33b31931bd
string comparision
2013-05-12 11:47:22 +02:00
Morris Jobke
b393c91a96
wrong root dir name
2013-05-12 11:47:22 +02:00
Morris Jobke
a878bd9923
fix allowed rename of folder in root directory to reserved name "Shared"
...
refs #2159
2013-05-12 11:47:22 +02:00
Jenkins for ownCloud
74f92d0c7f
[tx-robot] updated from transifex
2013-05-12 02:05:29 +02:00
icewind1991
5b61c5d478
Merge pull request #3044 from owncloud/backgroundwatcher
...
Add a background job to watch for external filesystem changes
2013-05-07 10:00:00 -07:00
Robin Appelman
3de40f7cfb
Files: set the proper mimetype when creating a new text file
2013-05-06 17:55:22 +02:00
Jenkins for ownCloud
a876240b32
[tx-robot] updated from transifex
2013-05-04 02:00:54 +02:00
Jenkins for ownCloud
6163a85668
[tx-robot] updated from transifex
2013-05-01 02:02:59 +02:00
Jenkins for ownCloud
5764bf088e
[tx-robot] updated from transifex
2013-04-30 01:59:18 +02:00
Morris Jobke
cc9933be1c
Merge pull request #3160 from owncloud/remove-onclick
...
Remove onclick
2013-04-29 03:58:44 -07:00
Lukas Reschke
3a6e39b990
It's a class
2013-04-28 23:28:41 +02:00
Lukas Reschke
003e6adb3f
Remove uneeded onclick handler
2013-04-28 23:26:07 +02:00
Lukas Reschke
6cf6103ed2
Move onclick handler
2013-04-28 23:25:58 +02:00
Jenkins for ownCloud
901e0c598d
[tx-robot] updated from transifex
2013-04-28 02:01:38 +02:00
Jenkins for ownCloud
7b2c64236c
[tx-robot] updated from transifex
2013-04-27 02:24:29 +02:00
Jenkins for ownCloud
7ea2f785f4
[tx-robot] updated from transifex
2013-04-26 01:58:21 +02:00
Jenkins for ownCloud
a0df5903b0
[tx-robot] updated from transifex
2013-04-25 01:55:56 +02:00
Lukas Reschke
1ee224d8cb
Merge pull request #3108 from owncloud/fileactions-order
...
Files: fix the order fileactions are computed for a file
2013-04-24 10:55:38 -07:00
Jenkins for ownCloud
62b9c88bb9
[tx-robot] updated from transifex
2013-04-24 18:31:36 +02:00
Morris Jobke
637dd685db
fix wrong shared icon description
...
fix #2928
translation of string "Shared" has to be marked as located in "files" for the translation extractor
2013-04-24 16:13:17 +02:00
Robin Appelman
ab7fcebeb3
Files: fix the order fileactions are computed for a file
2013-04-24 15:26:36 +02:00
Jenkins for ownCloud
a7b4469b2e
[tx-robot] updated from transifex
2013-04-24 02:01:20 +02:00
Robin Appelman
1507d1ef26
Files: Fix XSS when creating dropshadow
2013-04-22 21:55:54 +02:00
Jenkins for ownCloud
f6808617b3
[tx-robot] updated from transifex
2013-04-22 02:00:20 +02:00
Robin Appelman
15dae6198f
Cache: add a backgroundjob to check for external changes to the filesystem
2013-04-20 16:38:03 +02:00
Jenkins for ownCloud
03c7a52bc5
[tx-robot] updated from transifex
2013-04-20 02:02:09 +02:00
Bart Visscher
802a5a331b
Fix displaying spinner on delete
2013-04-19 13:46:11 +02:00
Bart Visscher
a21885953f
No need to strip slashes, json_decode handles that for us
2013-04-19 13:45:40 +02:00
Jenkins for ownCloud
cbd8b792d9
[tx-robot] updated from transifex
2013-04-18 02:09:28 +02:00
Jenkins for ownCloud
37868818ff
[tx-robot] updated from transifex
2013-04-17 02:29:17 +02:00
Jörn Friedrich Dreyer
606b672a3d
always connect file cache updater hooks first
2013-04-16 13:07:55 +02:00
Jenkins for ownCloud
d0b3e8aceb
[tx-robot] updated from transifex
2013-04-16 02:17:30 +02:00
Jenkins for ownCloud
e13e4c412f
[tx-robot] updated from transifex
2013-04-15 02:12:43 +02:00
Jenkins for ownCloud
7d68cd4040
[tx-robot] updated from transifex
2013-04-14 02:20:35 +02:00
Jenkins for ownCloud
19afc216cf
[tx-robot] updated from transifex
2013-04-13 02:15:54 +02:00
Jenkins for ownCloud
33ee2e2f10
[tx-robot] updated from transifex
2013-04-12 02:11:02 +02:00
Jenkins for ownCloud
b02db643d0
[tx-robot] updated from transifex
2013-04-11 02:10:41 +02:00
Jenkins for ownCloud
c06bc81c79
[tx-robot] updated from transifex
2013-04-10 02:09:39 +02:00
Jenkins for ownCloud
5ef389610f
[tx-robot] updated from transifex
2013-04-09 02:14:02 +02:00
Jenkins for ownCloud
ccde0212b1
[tx-robot] updated from transifex
2013-04-08 02:18:28 +02:00
Bart Visscher
6d6dfffea7
Merge pull request #2279 from owncloud/refactor_upload_js
...
Refactor upload js
2013-04-06 15:44:08 -07:00
Bart Visscher
248e097f3c
Merge pull request #1974 from owncloud/use-rawurlencode
...
OC6- Just use rawurlencode in files list template
2013-04-06 11:55:44 -07:00
Bart Visscher
46a552fd56
Merge pull request #2738 from Kondou-ger/fix_alert_issues
...
Fixed things in alert-messages
2013-04-06 08:24:43 -07:00
kondou
de2e546617
Translate 'Error' in core
2013-04-06 16:52:55 +02:00
Jenkins for ownCloud
6798b6dc34
[tx-robot] updated from transifex
2013-04-06 00:05:32 +02:00
root
74b02db337
Fixed things in alert-messages
...
Two parameters for OC.dialogs.alert, otherwise one will be "undefined".
Also fixed missing translation.
2013-04-05 01:56:32 +02:00
Jenkins for ownCloud
c745bfa821
[tx-robot] updated from transifex
2013-04-05 00:22:48 +02:00
Bart Visscher
e824c6cffa
Merge pull request #2611 from owncloud/filename-width
...
Adds a fixed width to the filename to prevent horizontal scroll.
2013-04-04 05:32:38 -07:00
Jenkins for ownCloud
cbece8b12f
[tx-robot] updated from transifex
2013-04-04 00:06:51 +02:00
Jan-Christoph Borchardt
f8e48955b9
Merge pull request #2576 from owncloud/fixing-2125-master
...
fixes #2125 - the warning is now displayed with a disabled button
2013-03-31 09:53:07 -07:00
Jenkins for ownCloud
5e74ec26a8
[tx-robot] updated from transifex
2013-03-30 00:06:29 +01:00
raghunayyar
5dd1f7d764
Using max-width instead of width for filename.
2013-03-30 00:13:47 +05:30
raghunayyar
024b60decc
Adds a fixed width to the filename to prevent horizontal scroll.
2013-03-29 16:26:03 +05:30
Jörn Friedrich Dreyer
7ecbaef16c
use css browser switch instead of deprecated jquery browser detection
2013-03-28 19:13:37 +01:00
Jörn Friedrich Dreyer
dac875eb9c
'#upload' is actually '#uploadprogresswrapper', fix css and js to show cancel button correctly
2013-03-28 18:50:49 +01:00
Jörn Friedrich Dreyer
e31d74037a
use local variable to walk DOM only once
2013-03-28 18:20:03 +01:00
Jörn Friedrich Dreyer
868d7b956d
use === to compare empty string ''
2013-03-28 18:20:03 +01:00
Jörn Friedrich Dreyer
831b7ca803
don't update progress bar in ie < 10
2013-03-28 18:20:03 +01:00
Jörn Friedrich Dreyer
c1a944a655
return created table row, use as context in fileupload events
2013-03-28 18:17:18 +01:00
Jörn Friedrich Dreyer
4dd4167f80
refactor files.js, make proper use of fileupload events
2013-03-28 18:17:18 +01:00
Jörn Friedrich Dreyer
0968eb0a65
return original filename to fileupload
2013-03-28 18:03:52 +01:00
Jörn Friedrich Dreyer
df31ee5a90
Merge pull request #2575 from owncloud/fixing-1461-master
...
Fix upload progressbar in IE8 and IE9
2013-03-28 10:01:39 -07:00
Jenkins for ownCloud
0c666cb764
[tx-robot] updated from transifex
2013-03-27 00:11:05 +01:00
Thomas Mueller
586a47b186
fixes #1463 - file size is now displayed correctly in IE8
2013-03-26 21:28:01 +01:00
Thomas Mueller
cf50e67e1b
prevent to fire delete ajax a second time.
...
Before the click on a single file delete icon fired two different handlers - one of them is for multiple deletion only
2013-03-26 16:27:56 +01:00
Thomas Mueller
3817922c93
fixes #2125 - the warning is now displayed with a disabled button
2013-03-26 15:44:35 +01:00
Thomas Mueller
e0e5cb73bf
fixes #1461
2013-03-26 14:14:30 +01:00
Björn Schießle
d121180d46
Merge pull request #2270 from owncloud/fix_json_encoded_pubic_download
...
let public link download handle json encoded file lists [master]
2013-03-26 01:56:47 -07:00
Jenkins for ownCloud
4f6e13e673
[tx-robot] updated from transifex
2013-03-23 00:06:16 +01:00
Jenkins for ownCloud
3b1c7de459
[tx-robot] updated from transifex
2013-03-21 00:04:36 +01:00
Bernhard Posselt
5b1f857907
Merge pull request #2363 from owncloud/uploadsize
...
Improve behaviour when max upload size is unknown
2013-03-18 08:18:27 -07:00
Jenkins for ownCloud
2a48aa322d
[tx-robot] updated from transifex
2013-03-18 00:06:55 +01:00
Jenkins for ownCloud
1427af4a22
[tx-robot] updated from transifex
2013-03-16 22:18:26 +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
Jenkins for ownCloud
0c123ebf9d
[tx-robot] updated from transifex
2013-03-15 00:06:36 +01:00
Jenkins for ownCloud
9a0cb2ccaa
[tx-robot] updated from transifex
2013-03-14 00:06:29 +01:00
Björn Schießle
c3ba49f384
Merge pull request #2265 from owncloud/no_share_option_for_shared_folder
...
don't add share action to the Shared folder
2013-03-13 08:23:35 -07:00
Björn Schießle
e5f40ddaae
only prevent shared action for the Shared folder in the root dir
2013-03-13 11:33:20 +01:00
Björn Schießle
f971ce0b66
let public link download handle json encoded file lists
2013-03-13 11:15:17 +01:00
Jenkins for ownCloud
f3a2daaa9d
[tx-robot] updated from transifex
2013-03-13 00:06:21 +01:00
Björn Schießle
b2da2f769a
don't add share action to the Shared folder
2013-03-12 17:28:36 +01:00
Jenkins for ownCloud
569c7ab138
[tx-robot] updated from transifex
2013-03-12 00:14:05 +01:00
Tom Needham
dfbf57207d
Merge pull request #1584 from owncloud/ocs_multiple_methods
...
Allow registering of multiple methods on each api route. Add /cloud/capabilities route.
2013-03-09 16:59:13 -08:00
Jenkins for ownCloud
6bdb84ab28
[tx-robot] updated from transifex
2013-03-10 00:06:53 +01:00
Tom Needham
e58dbd46fc
Merge in master
2013-03-09 00:04:33 +00:00
Jenkins for ownCloud
0629ff4dd9
[tx-robot] updated from transifex
2013-03-09 00:06:34 +01:00
Jenkins for ownCloud
308c85090e
[tx-robot] updated from transifex
2013-03-08 00:26:35 +01:00
Frank Karlitschek
19073e0711
Merge pull request #2167 from owncloud/input-type-fix
...
Input type fix
2013-03-07 07:28:22 -08:00
Björn Schießle
3970d1f875
remove debug output
2013-03-07 14:18:27 +01:00
Björn Schießle
4a4f705adc
json encode list of files
2013-03-07 14:15:02 +01:00
Jenkins for ownCloud
97222b1de5
[tx-robot] updated from transifex
2013-03-07 00:16:59 +01:00
Jan-Christoph Borchardt
ab7dc76ff1
add type=text to ZIP size field, fix second part of #2097
2013-03-06 12:39:36 +01:00
Jenkins for ownCloud
c1a32b5073
[tx-robot] updated from transifex
2013-03-06 00:08:33 +01:00
Tom Needham
370f202251
Rebase to current master
2013-03-05 00:25:56 +00:00
Lukas Reschke
2a9c3c1660
Merge pull request #2069 from owncloud/fix_sanitize_call
...
use p() for the output and not for the comparison
2013-03-04 03:41:47 -08:00
Björn Schießle
52919fa94b
use p() for the output and not for the comparison
2013-03-04 12:01:45 +01:00
Bart Visscher
de066beaaf
Merge pull request #2044 from owncloud/fix_1779_including_permanent_shares
...
Fix file actions including permanent shares
2013-03-04 01:56:23 -08:00
raghunayyar
d3ddf03687
Datepicker height fixed.
...
New id defined for files table for positioning.
2013-03-04 09:21:38 +05:30
Jenkins for ownCloud
b738aaba2a
[tx-robot] updated from transifex
2013-03-04 00:07:35 +01:00
Michael Gapczynski
0488968443
Merge pull request #2034 from owncloud/fix_bug47
...
Fix #47 - Duplicate files create a (2) when multiples are uploaded
2013-03-03 11:49:04 -08:00
Jörn Friedrich Dreyer
f4411b0243
durhurrrhurrr
2013-03-03 13:01:25 +01:00
Jenkins for ownCloud
844e18a8b1
[tx-robot] updated from transifex
2013-03-03 00:06:56 +01:00
Jenkins for ownCloud
6c96b93fd4
[tx-robot] updated from transifex
2013-03-05 00:19:07 +01:00
Jan-Christoph Borchardt
afe7ea8ca2
fix files table CSS specificity issue causing multiselect bar overlap, fix #2075
2013-03-04 16:10:11 +01:00
Thomas Mueller
4b9863fa7d
Merge branch 'master' into from-insane-autoescape-to-p
...
Conflicts:
apps/files/templates/index.php
2013-03-01 23:09:20 +01:00
Thomas Mueller
e3e4c28316
fixes #2001 - in case the user has no permissions to upload/create files/folders a clear warning is displayed
2013-03-01 21:43:34 +01:00
Georg Ehrke
ff9476b3e3
fix oc#47
2013-03-01 18:30:25 +01:00
Lukas Reschke
301d065686
Sed was wrong
2013-02-28 20:21:14 +01:00
Lukas Reschke
5f8bd07927
[Files] Use p() instead of echo
2013-02-27 23:40:30 +01:00
Lukas Reschke
b93ebe1860
Merge master
2013-02-27 23:36:52 +01:00
Bart Visscher
ab5e20a2c1
Just use rawurlencode in files list template
2013-02-27 21:53:46 +01:00
Lukas Reschke
c9415e6529
[files] Unescape file size
2013-02-27 21:40:06 +01:00
Lukas Reschke
85209287bb
[Files] Use htmlspecialchars()
2013-02-27 21:19:11 +01:00
Lukas Reschke
4860d03270
[Files] Use p() instead of echo
2013-02-27 21:14:15 +01:00
j-ed
1f9551a382
Update apps/files/templates/part.list.php
...
prevent multiple slashes in a row when building URLs.
2013-02-27 19:09:37 +01:00
Jenkins for ownCloud
fd654e9c2f
[tx-robot] updated from transifex
2013-02-27 14:37:12 +01:00
Thomas Müller
58b06c5c9a
Merge pull request #1905 from owncloud/fix-share-icons
...
Fix adding share icons to share action
2013-02-27 02:31:52 -08:00
Jenkins for ownCloud
348812f2ce
[tx-robot] updated from transifex
2013-02-27 00:09:33 +01:00
Jan-Christoph Borchardt
07e9f8d0d3
remove general CSS from IE specific rules, displays Shared state permanently again
2013-02-26 18:49:20 +01:00
Jenkins for ownCloud
63d9feb8c0
[tx-robot] updated from transifex
2013-02-26 00:06:26 +01:00
Bernhard Posselt
1d83d76b45
fixed bug that prevented a newly created file to be opened with registered files actions
2013-02-25 17:50:17 +01:00
Björn Schießle
3ef8c0bda3
Merge pull request #1892 from owncloud/files_remove_row_on_delete
...
delete table row if file was deleted instead of just hide it
2013-02-25 07:44:35 -08:00
Björn Schießle
dbf2bfc8cd
delete table row if file was deleted instead of just hide it
2013-02-25 16:32:54 +01:00
Jörn Friedrich Dreyer
664e7a3fc2
use distance option to delay dragging in sane browsers
2013-02-25 15:08:14 +01:00
Thomas Müller
660670ec68
Merge pull request #1832 from owncloud/fix_1779
...
use :hover pseudo class to set opacity
2013-02-25 04:35:34 -08:00
Thomas Müller
7c30c1a2e8
Merge pull request #1833 from owncloud/fix_1465
...
Fix 1465
2013-02-25 04:34:13 -08:00
Frank Karlitschek
8f65916904
Merge pull request #1882 from owncloud/required_version
...
Set required owncloud version to 4.93
2013-02-25 00:37:22 -08:00
Jenkins for ownCloud
21f3291eee
[tx-robot] updated from transifex
2013-02-25 00:06:17 +01:00
Robin Appelman
4e826b1673
Set required owncloud version to 4.93
2013-02-24 17:38:36 +01:00
Bart Visscher
bb75dfc021
Whitespace fixes
2013-02-22 19:05:36 +01:00
Jörn Friedrich Dreyer
e8da90d0f4
Merge pull request #1711 from owncloud/style-cleanup
...
Codestyle cleanup
2013-02-22 07:02:51 -08:00
Jenkins for ownCloud
734a463297
[tx-robot] updated from transifex
2013-02-22 00:08:47 +01:00
Bart Visscher
19c5213b53
Join split translated strings
2013-02-21 23:47:56 +01:00
Jörn Friedrich Dreyer
0dd7fd0599
IE8 does not support window.onclick
2013-02-21 17:38:25 +01:00
Jörn Friedrich Dreyer
859caee66a
use :hover pseudo class to set opacity
2013-02-21 16:52:18 +01:00
Jenkins for ownCloud
dcd93a53e4
[tx-robot] updated from transifex
2013-02-21 00:15:58 +01:00
Bernhard Posselt
3b9d9eea09
replaced for in loops with normal enumerating loops to fix #1803
2013-02-20 21:57:50 +01:00
Frank Karlitschek
383194cb44
Merge pull request #1753 from owncloud/Extra_info
...
Ability for the action handler to get more info on the current file
2013-02-20 08:33:57 -08:00