Robin Appelman
3821a09689
merge master into webdav-injection
2014-04-22 12:25:49 +02:00
Jörn Friedrich Dreyer
4d9ff49f61
Merge pull request #8283 from owncloud/translatable-max-in-upload
...
make max. text translatable
2014-04-22 10:23:08 +02:00
Jenkins for ownCloud
a9b4fba528
[tx-robot] updated from transifex
2014-04-22 01:54:58 -04:00
Jenkins for ownCloud
4fe5ca1908
[tx-robot] updated from transifex
2014-04-21 01:56:06 -04:00
Volkan Gezer
1aa7774178
make max. text translatable
2014-04-21 02:41:33 +02:00
Andreas Fischer
93ed6a695e
Merge pull request #8169 from owncloud/change-to-show
...
Change from showHTML to show
* owncloud/change-to-show:
Change from showHTML to show
2014-04-20 15:53:33 +02:00
Jenkins for ownCloud
a7d7ca2fb3
[tx-robot] updated from transifex
2014-04-17 01:56:06 -04:00
Thomas Müller
8bc7174bdc
Merge pull request #8104 from owncloud/lukepolo-master
...
Added the ability to Drag and Drop folders [chrome]
2014-04-15 21:39:32 +02:00
Thomas Müller
83e8981e24
add link to further discussion about that folder check
2014-04-15 21:39:13 +02:00
Robin Appelman
c82adb8c5d
merge master into webdav-injection
2014-04-15 20:03:00 +02:00
Lukas Reschke
6343391e58
Change from showHTML to show
...
There is no need to use `showHTML` here.
2014-04-11 20:38:27 +02:00
Björn Schießle
10dc1de644
Merge pull request #8069 from owncloud/fix-localization-issues-with-file-encrypt-app
...
Fix some localization issues with file encryption/decryption strings
2014-04-11 17:22:13 +02:00
Lukas Reschke
d229856fc5
Merge pull request #8076 from owncloud/enable-dav-browser
...
Re-enable the sabredav browser plugin to fix sync client setup
2014-04-10 21:47:03 +02:00
Thomas Müller
0edacf372c
fix single file upload in firefox
2014-04-10 18:07:36 +02:00
Jenkins for ownCloud
7c072510d3
[tx-robot] updated from transifex
2014-04-10 01:55:39 -04:00
Thomas Müller
e8be2ac554
In cases folder drag and drop is not supported a proper message is displayed
2014-04-09 23:32:12 +02:00
Thomas Müller
2fc9e27ced
use FileList.findFileEl
2014-04-09 22:16:41 +02:00
Thomas Müller
d2961dcf11
Merge branch 'master' into lukepolo-master
...
Conflicts:
apps/files/js/filelist.js
2014-04-09 22:00:25 +02:00
Morris Jobke
d8f56e3c00
Merge pull request #8049 from owncloud/filepickersvg
...
Fix file picker SVG issues
2014-04-09 15:05:40 +02:00
Jenkins for ownCloud
796f719548
[tx-robot] updated from transifex
2014-04-09 01:56:49 -04:00
Jenkins for ownCloud
4ad4b9768c
[tx-robot] updated from transifex
2014-04-08 01:57:51 -04:00
Thomas Müller
68b7822cf5
js style fixes according to our jshintrc rules
2014-04-07 23:45:35 +02:00
Thomas Müller
d15a4719d2
fix folder upload in js
2014-04-07 23:04:08 +02:00
Thomas Müller
971a311fee
adding parentId to file info array
2014-04-07 23:03:19 +02:00
Thomas Müller
6d373e97c3
remove unused exit()
2014-04-07 23:02:49 +02:00
Thomas Müller
3587c88fe9
Merge branch 'master' of https://github.com/lukepolo/core-1 into lukepolo-master
...
Conflicts:
apps/files/js/file-upload.js
2014-04-07 22:28:16 +02:00
Jörn Friedrich Dreyer
c90b0ac00b
Fix copy conflict dialog translation
2014-04-07 11:46:47 +02:00
Robin Appelman
593977f016
Re-enable the sabredav browser plugin
2014-04-06 14:49:39 +02:00
Jenkins for ownCloud
a9d49de465
[tx-robot] updated from transifex
2014-04-06 01:56:11 -04:00
Volkan Gezer
286323f7a4
Fix some localization issues with file encryption/decription strings
2014-04-05 19:28:53 +02:00
Robin Appelman
01d93f81f6
Show higher resolution previews for high dpi screens
2014-04-04 17:10:46 +02:00
Vincent Petry
a4eafca77f
Moved code to replace svg with png to OC.Util
...
- Moved code that replaces the "svg" extension for the given file to
core as OC.Util.replaceSVGIcon.
- Added unit test for OC.Util.replaceSVGIcon
- Moved "replaceSVG" to OC.Util.replaceSVG and deprecated the global
"replaceSVG" function.
- Added alias for SVGSupport() as OC.Util.hasSVGSupport() (for now)
2014-04-04 11:34:26 +02:00
Vincent Petry
8a10c44eb3
Merge pull request #8015 from owncloud/storageinfo-reuse
...
Allow reusing FileInfo for getStorageInfo
2014-04-04 10:18:02 +02:00
Jenkins for ownCloud
0805f678cc
[tx-robot] updated from transifex
2014-04-04 01:57:01 -04:00
Morris Jobke
bf7624fb25
Merge pull request #6968 from owncloud/files-ajaxload
...
Ajaxify files list for files + trashbin + public page
2014-04-03 22:02:05 +02:00
Vincent Petry
d1e78d7a6b
Correctly set svg for crumb divider
2014-04-03 17:08:06 +02:00
Vincent Petry
7c9537f33a
Fixed dirInfo check for non existing dir in files ajax call
2014-04-03 17:04:13 +02:00
Jenkins for ownCloud
54783550e8
[tx-robot] updated from transifex
2014-04-03 01:56:12 -04:00
Robin Appelman
da5541ac02
Allow reusing FileInfo for getStorageInfo
2014-04-02 17:10:57 +02:00
Robin Appelman
1e6a79e244
Reuse known free space in the files app
2014-04-02 16:53:45 +02:00
Vincent Petry
0be9de5df5
Files, trashbin, public apps use ajax/JSON for the file list
...
Files app:
- removed file list template, now rendering list from JSON response
- FileList.addFile/addDir is now FileList.add() and takes a JS map with all required
arguments instead of having a long number of function arguments
- added unit tests for many FileList operations
- fixed newfile.php, newfolder.php and rename.php to return the file's
full JSON on success
- removed obsolete/unused undo code
- removed download_url / loading options, now using
Files.getDownloadUrl() for that
- server side now uses Helper::getFileInfo() to prepare file JSON response
- previews are now client-side only
Breadcrumbs are now JS only:
- Added BreadCrumb class to handle breadcrumb rendering and events
- Added unit test for BreadCrumb class
- Moved all relevant JS functions to the BreadCrumb class
Public page now uses ajax to load the file list:
- Added Helper class in sharing app to make it easier to authenticate
and retrieve the file's real path
- Added ajax/list.php to retrieve the file list
- Fixed FileActions and FileList to work with the ajax list
Core:
- Fixed file picker dialog to use the same list format as files app
2014-04-02 15:33:47 +02:00
Jenkins for ownCloud
73dd5ff26c
[tx-robot] updated from transifex
2014-04-02 01:56:39 -04:00
Thomas Müller
d762e25cc5
Merge pull request #7989 from owncloud/files-deletefileregressionfix
...
Fixed broken delete file action
2014-04-01 22:54:05 +02:00
Vincent Petry
aaa8d6ec02
Fixed broken delete file action
2014-04-01 16:09:48 +02:00
Vincent Petry
0bede65947
Fix dirInfo check when dir does not exist
2014-04-01 15:15:03 +02:00
Vincent Petry
5807681c09
Merge pull request #7975 from owncloud/fix-7973-master-2
...
remove pl_PL - fixes #7973
2014-04-01 12:38:47 +02:00
Vincent Petry
18acfa8bb3
Merge pull request #7915 from owncloud/replace-personalblock
...
Replace personalblock with .section
2014-04-01 11:20:16 +02:00
Jenkins for ownCloud
7a4a836abe
[tx-robot] updated from transifex
2014-04-01 01:56:15 -04:00
Thomas Müller
fe2c6f4e6d
remove pl_PL - fixes #7973
2014-03-31 18:03:42 +02:00
Jan-Christoph Borchardt
2be2a5d2c5
external storage: fix merge conflict, indentation
2014-03-31 13:12:04 +02:00