a21885953f
No need to strip slashes, json_decode handles that for us
2013-04-19 13:45:40 +02:00
cbd8b792d9
[tx-robot] updated from transifex
2013-04-18 02:09:28 +02:00
37868818ff
[tx-robot] updated from transifex
2013-04-17 02:29:17 +02:00
606b672a3d
always connect file cache updater hooks first
2013-04-16 13:07:55 +02:00
d0b3e8aceb
[tx-robot] updated from transifex
2013-04-16 02:17:30 +02:00
e13e4c412f
[tx-robot] updated from transifex
2013-04-15 02:12:43 +02:00
7d68cd4040
[tx-robot] updated from transifex
2013-04-14 02:20:35 +02:00
19afc216cf
[tx-robot] updated from transifex
2013-04-13 02:15:54 +02:00
33ee2e2f10
[tx-robot] updated from transifex
2013-04-12 02:11:02 +02:00
b02db643d0
[tx-robot] updated from transifex
2013-04-11 02:10:41 +02:00
c06bc81c79
[tx-robot] updated from transifex
2013-04-10 02:09:39 +02:00
5ef389610f
[tx-robot] updated from transifex
2013-04-09 02:14:02 +02:00
ccde0212b1
[tx-robot] updated from transifex
2013-04-08 02:18:28 +02:00
6d6dfffea7
Merge pull request #2279 from owncloud/refactor_upload_js
...
Refactor upload js
2013-04-06 15:44:08 -07:00
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
46a552fd56
Merge pull request #2738 from Kondou-ger/fix_alert_issues
...
Fixed things in alert-messages
2013-04-06 08:24:43 -07:00
de2e546617
Translate 'Error' in core
2013-04-06 16:52:55 +02:00
6798b6dc34
[tx-robot] updated from transifex
2013-04-06 00:05:32 +02:00
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
c745bfa821
[tx-robot] updated from transifex
2013-04-05 00:22:48 +02:00
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
cbece8b12f
[tx-robot] updated from transifex
2013-04-04 00:06:51 +02:00
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
5e74ec26a8
[tx-robot] updated from transifex
2013-03-30 00:06:29 +01:00
5dd1f7d764
Using max-width instead of width for filename.
2013-03-30 00:13:47 +05:30
024b60decc
Adds a fixed width to the filename to prevent horizontal scroll.
2013-03-29 16:26:03 +05:30
7ecbaef16c
use css browser switch instead of deprecated jquery browser detection
2013-03-28 19:13:37 +01:00
dac875eb9c
'#upload' is actually '#uploadprogresswrapper', fix css and js to show cancel button correctly
2013-03-28 18:50:49 +01:00
e31d74037a
use local variable to walk DOM only once
2013-03-28 18:20:03 +01:00
868d7b956d
use === to compare empty string ''
2013-03-28 18:20:03 +01:00
831b7ca803
don't update progress bar in ie < 10
2013-03-28 18:20:03 +01:00
c1a944a655
return created table row, use as context in fileupload events
2013-03-28 18:17:18 +01:00
4dd4167f80
refactor files.js, make proper use of fileupload events
2013-03-28 18:17:18 +01:00
0968eb0a65
return original filename to fileupload
2013-03-28 18:03:52 +01:00
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
0c666cb764
[tx-robot] updated from transifex
2013-03-27 00:11:05 +01:00
586a47b186
fixes #1463 - file size is now displayed correctly in IE8
2013-03-26 21:28:01 +01:00
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
3817922c93
fixes #2125 - the warning is now displayed with a disabled button
2013-03-26 15:44:35 +01:00
e0e5cb73bf
fixes #1461
2013-03-26 14:14:30 +01:00
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
4f6e13e673
[tx-robot] updated from transifex
2013-03-23 00:06:16 +01:00
3b1c7de459
[tx-robot] updated from transifex
2013-03-21 00:04:36 +01:00
5b1f857907
Merge pull request #2363 from owncloud/uploadsize
...
Improve behaviour when max upload size is unknown
2013-03-18 08:18:27 -07:00
2a48aa322d
[tx-robot] updated from transifex
2013-03-18 00:06:55 +01:00
1427af4a22
[tx-robot] updated from transifex
2013-03-16 22:18:26 +01:00
319e3f162c
Don't block uploads if the max upload size is unknown
2013-03-15 16:40:36 +01:00
32b8fd8fb7
Improve handeling of unlimited max upload size
2013-03-15 16:31:35 +01:00
0c123ebf9d
[tx-robot] updated from transifex
2013-03-15 00:06:36 +01:00
9a0cb2ccaa
[tx-robot] updated from transifex
2013-03-14 00:06:29 +01:00
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
e5f40ddaae
only prevent shared action for the Shared folder in the root dir
2013-03-13 11:33:20 +01:00
f971ce0b66
let public link download handle json encoded file lists
2013-03-13 11:15:17 +01:00
f3a2daaa9d
[tx-robot] updated from transifex
2013-03-13 00:06:21 +01:00
b2da2f769a
don't add share action to the Shared folder
2013-03-12 17:28:36 +01:00
569c7ab138
[tx-robot] updated from transifex
2013-03-12 00:14:05 +01:00
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
6bdb84ab28
[tx-robot] updated from transifex
2013-03-10 00:06:53 +01:00
e58dbd46fc
Merge in master
2013-03-09 00:04:33 +00:00
0629ff4dd9
[tx-robot] updated from transifex
2013-03-09 00:06:34 +01:00
308c85090e
[tx-robot] updated from transifex
2013-03-08 00:26:35 +01:00
19073e0711
Merge pull request #2167 from owncloud/input-type-fix
...
Input type fix
2013-03-07 07:28:22 -08:00
3970d1f875
remove debug output
2013-03-07 14:18:27 +01:00
4a4f705adc
json encode list of files
2013-03-07 14:15:02 +01:00
97222b1de5
[tx-robot] updated from transifex
2013-03-07 00:16:59 +01:00
ab7dc76ff1
add type=text to ZIP size field, fix second part of #2097
2013-03-06 12:39:36 +01:00
c1a32b5073
[tx-robot] updated from transifex
2013-03-06 00:08:33 +01:00
370f202251
Rebase to current master
2013-03-05 00:25:56 +00:00
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
52919fa94b
use p() for the output and not for the comparison
2013-03-04 12:01:45 +01:00
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
d3ddf03687
Datepicker height fixed.
...
New id defined for files table for positioning.
2013-03-04 09:21:38 +05:30
b738aaba2a
[tx-robot] updated from transifex
2013-03-04 00:07:35 +01:00
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
f4411b0243
durhurrrhurrr
2013-03-03 13:01:25 +01:00
844e18a8b1
[tx-robot] updated from transifex
2013-03-03 00:06:56 +01:00
6c96b93fd4
[tx-robot] updated from transifex
2013-03-05 00:19:07 +01:00
afe7ea8ca2
fix files table CSS specificity issue causing multiselect bar overlap, fix #2075
2013-03-04 16:10:11 +01:00
4b9863fa7d
Merge branch 'master' into from-insane-autoescape-to-p
...
Conflicts:
apps/files/templates/index.php
2013-03-01 23:09:20 +01:00
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
ff9476b3e3
fix oc#47
2013-03-01 18:30:25 +01:00
301d065686
Sed was wrong
2013-02-28 20:21:14 +01:00
5f8bd07927
[Files] Use p() instead of echo
2013-02-27 23:40:30 +01:00
b93ebe1860
Merge master
2013-02-27 23:36:52 +01:00
ab5e20a2c1
Just use rawurlencode in files list template
2013-02-27 21:53:46 +01:00
c9415e6529
[files] Unescape file size
2013-02-27 21:40:06 +01:00
85209287bb
[Files] Use htmlspecialchars()
2013-02-27 21:19:11 +01:00
4860d03270
[Files] Use p() instead of echo
2013-02-27 21:14:15 +01:00
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
fd654e9c2f
[tx-robot] updated from transifex
2013-02-27 14:37:12 +01:00
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
348812f2ce
[tx-robot] updated from transifex
2013-02-27 00:09:33 +01:00
07e9f8d0d3
remove general CSS from IE specific rules, displays Shared state permanently again
2013-02-26 18:49:20 +01:00
63d9feb8c0
[tx-robot] updated from transifex
2013-02-26 00:06:26 +01:00
1d83d76b45
fixed bug that prevented a newly created file to be opened with registered files actions
2013-02-25 17:50:17 +01:00
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
dbf2bfc8cd
delete table row if file was deleted instead of just hide it
2013-02-25 16:32:54 +01:00
664e7a3fc2
use distance option to delay dragging in sane browsers
2013-02-25 15:08:14 +01:00
660670ec68
Merge pull request #1832 from owncloud/fix_1779
...
use :hover pseudo class to set opacity
2013-02-25 04:35:34 -08:00
7c30c1a2e8
Merge pull request #1833 from owncloud/fix_1465
...
Fix 1465
2013-02-25 04:34:13 -08:00
8f65916904
Merge pull request #1882 from owncloud/required_version
...
Set required owncloud version to 4.93
2013-02-25 00:37:22 -08:00
21f3291eee
[tx-robot] updated from transifex
2013-02-25 00:06:17 +01:00
4e826b1673
Set required owncloud version to 4.93
2013-02-24 17:38:36 +01:00
bb75dfc021
Whitespace fixes
2013-02-22 19:05:36 +01:00
e8da90d0f4
Merge pull request #1711 from owncloud/style-cleanup
...
Codestyle cleanup
2013-02-22 07:02:51 -08:00
734a463297
[tx-robot] updated from transifex
2013-02-22 00:08:47 +01:00
19c5213b53
Join split translated strings
2013-02-21 23:47:56 +01:00
0dd7fd0599
IE8 does not support window.onclick
2013-02-21 17:38:25 +01:00
859caee66a
use :hover pseudo class to set opacity
2013-02-21 16:52:18 +01:00
dcd93a53e4
[tx-robot] updated from transifex
2013-02-21 00:15:58 +01:00
3b9d9eea09
replaced for in loops with normal enumerating loops to fix #1803
2013-02-20 21:57:50 +01:00
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
3878203679
Merge pull request #1731 from owncloud/unknown-freespace
...
Give storage backends the option to define having no known free space
2013-02-19 15:18:12 -08:00
99758dce2b
[tx-robot] updated from transifex
2013-02-20 00:03:28 +01:00
76c4dc6296
[tx-robot] updated from transifex
2013-02-19 00:06:51 +01:00
fde0a8b520
Add Ability to the app to detect more details on the file
2013-02-18 13:22:43 +03:00
3b9796bfcc
[tx-robot] updated from transifex
2013-02-18 00:06:45 +01:00
c8e7b14ab3
[tx-robot] updated from transifex
2013-02-17 00:26:17 +01:00
d96146a017
Give storage backends the option to define having no known free space
...
When this is the case only the configured max upload size is taking into account for uploading
2013-02-16 03:27:50 +01:00
83f0c8ce61
[tx-robot] updated from transifex
2013-02-16 00:05:50 +01:00
ac32ae79af
Merge pull request #1683 from owncloud/ie-fixes
...
IE fixes
2013-02-15 03:32:31 -08:00
b169073169
[tx-robot] updated from transifex
2013-02-15 00:06:50 +01:00
9058d398a7
Merge pull request #1662 from owncloud/style-cleanup
...
Style cleanup
2013-02-14 12:54:36 -08:00
f4c9d4c067
Merge pull request #1682 from owncloud/fix-ie8-master
...
Fix ie8 master
2013-02-14 06:10:00 -08:00
bd22e948ca
call 'Trash bin' 'Deleted files'
2013-02-14 12:32:14 +01:00
a03d70209f
fixing undefined originalEvent
2013-02-14 12:19:50 +01:00
b8a6bca2d3
always show checkbox when selected, also in IE8, fix #1621
2013-02-14 10:40:23 +01:00
cd35d257bb
Fix NoSpaceAfterComma and SpaceBeforeComma
2013-02-14 08:36:26 +01:00
bfe6334cd9
[tx-robot] updated from transifex
2013-02-14 00:06:51 +01:00
f141f8b523
Add further capabilities to /cloud/capabilitites api call
2013-02-10 14:42:23 +01:00
68fa0b7dcc
[tx-robot] updated from transifex
2013-02-13 00:05:40 +01:00
8d9352a40d
[tx-robot] updated from transifex
2013-02-12 15:12:46 +01:00
fb23ac3ce2
[tx-robot] updated from transifex
2013-02-12 00:21:45 +01:00
2cb2644254
Merge pull request #1613 from owncloud/multiselect-row-width
...
Files: fix width of table header when files are selected
2013-02-11 11:49:08 -08:00
ca99ff31dc
Merge pull request #1627 from owncloud/home-svg
...
svg replacement for breadcrumb home icon, fix #1620
2013-02-11 08:02:14 -08:00
130f1006c1
Merge pull request #1626 from owncloud/share-indicator-position
...
Files: always show share action at the right
2013-02-11 07:43:04 -08:00
9c8f5de6c6
svg replacement for breadcrumb home icon, fix #1620
2013-02-11 16:19:22 +01:00
37ea784294
Files: always show share action at the right
...
Fixes #1619
2013-02-11 16:09:04 +01:00
39d19a9274
[tx-robot] updated from transifex
2013-02-11 15:42:41 +01:00
25b5b39e7a
Files: fix width of table header when files are selected
2013-02-11 12:23:53 +01:00
855c9480b7
only encodeURIComponent once
2013-02-09 13:07:52 +01:00
e928a342c4
Check if extra / is necessary for the folder URL
2013-02-09 13:07:52 +01:00
0c73cae77b
Merge pull request #1565 from owncloud/fix_replacing
...
remove code properly to make @DeepDiver1975 happy ;)
2013-02-09 03:58:06 -08:00
2137bbe330
remove code properly
2013-02-09 12:38:40 +01:00
ab4ae2b952
Merge pull request #1560 from owncloud/fix_replacing
...
remove (comment out) old code to fix replacing of files
2013-02-09 03:28:40 -08:00
c5fd9cc0c2
Merge pull request #1562 from schiesbn/fix_naming
...
rename trash to trash bin
2013-02-09 03:21:30 -08:00
ca243f3fac
Merge pull request #1521 from schiesbn/label_fixed
...
don't call the delete button unshare, unshare operation no longer available
2013-02-09 03:14:25 -08:00
6e9f434bda
rename trash to trash bin
2013-02-09 12:01:49 +01:00
8961e675c7
remove (comment out) old code to fix replacing of files
2013-02-09 11:28:13 +01:00
5a15221910
Merge pull request #1550 from owncloud/fix-files-download-links
...
Fix files router download links
2013-02-09 01:28:25 -08:00
3918325520
Merge pull request #1541 from owncloud/fixing-1540-master
...
remove undefined function FileList.finishDelete
2013-02-09 01:17:11 -08:00
04146f2059
[tx-robot] updated from transifex
2013-02-11 00:04:49 +01:00
bf4a073dca
count divs in actions instead of action div itself (is set to 100%)
2013-02-10 12:38:16 +01:00
1c56539c01
Merge pull request #1551 from owncloud/fix_files_multiselect
...
Fix filelist shifting up one row on (multi)select
2013-02-10 02:54:12 -08:00
f7d898d835
[tx-robot] updated from transifex
2013-02-10 00:10:29 +01:00
419eced65c
Remove hascontrols - use original positioning.
...
I couldn't get Chromium and FF to agree, so a working hack
is better than a non-working one ;)
2013-02-09 17:54:56 +01:00
676f89bbdb
extract common code
2013-02-09 14:42:03 +01:00
60344bf1dd
Another attempt on the filelist heading.
2013-02-09 14:00:26 +01:00
e5c05e9674
[tx-robot] updated from transifex
2013-02-09 00:14:08 +01:00
680af2e6ca
Fix filelist shifting up one row on (multi)select
2013-02-08 22:30:27 +01:00
ed1dc3e064
Fix files router download links
2013-02-08 22:05:13 +01:00
ce8fc20e0b
remove unused code
2013-02-08 18:04:27 +01:00
1d3c1328fa
remove undefined function FileList.finishDelete
2013-02-08 15:51:28 +01:00
40f6e1eba0
Merge pull request #1534 from owncloud/files_l10n
...
Add translation support back to move/rename
2013-02-08 03:58:17 -08:00
9bdc43e1fc
Files: explicitly define
2013-02-08 12:03:28 +01:00
59249ebc0c
[tx-robot] updated from transifex
2013-02-08 00:13:16 +01:00
5ef9d96d10
Files: rename 'space' to 'storage' in upload.php
2013-02-07 23:59:14 +01:00
b67251b0ff
Files: add translation support back to move/rename
2013-02-07 23:57:18 +01:00
a93282ab16
Merge pull request #1507 from tripflex/master
...
remove float left from actions div class
fixes #1504
2013-02-07 12:49:14 -08:00
c72537cd85
don't call the delete button unshare, unshare operation no longer available
2013-02-07 12:42:09 +01:00
35bd7a400d
[tx-robot] updated from transifex
2013-02-07 00:11:04 +01:00
e522872408
Merge pull request #1498 from schiesbn/delete_trash
...
delete files from trash bin permanently
2013-02-06 11:27:32 -08:00
ddd47978e1
Remove left float from actions div class
2013-02-06 13:44:41 -05:00
3879e5d9c5
Merge pull request #1428 from owncloud/content_positioning
...
Fix leftcontent positioning. Ref #1255
2013-02-06 08:13:45 -08:00
e2516a2b65
allow to delete single files from the trash bin permanently
2013-02-06 16:23:22 +01:00
335b6cd060
[tx-robot] updated from transifex
2013-02-06 00:06:28 +01:00
65bd7af8df
Remove undefined crumb variable from home breadcrumb
2013-02-04 20:40:16 -05:00
98f37f4bed
[tx-robot] updated from transifex
2013-02-05 00:20:29 +01:00
b06ac67e07
Add 'hascontrols' class for content with fixed topbar.
2013-02-04 18:30:49 +01:00
04b97a1906
Merge pull request #1229 from owncloud/from_live_to_on
...
replace live() with on() in core js
2013-02-03 21:55:54 -08:00
5ceddabaa6
Merge pull request #1340 from owncloud/fixing-js-errors-public-link-master
...
Fixing js errors public link master
2013-02-03 21:53:02 -08:00
9060c3bd83
Files: fix positioning of Trash button and upload progress bar
2013-02-04 01:05:59 +01:00
da6e79a381
[tx-robot] updated from transifex
2013-02-04 00:05:52 +01:00
1557b6d99d
Fix leftcontent positioning. Ref #1255
2013-02-03 14:44:33 +01:00
743c330f03
Merge pull request #1422 from TheSFReader/master
...
Correct the Cache Scanner so that it doesn't try and scan subdirs of a non-dir path when renaming
2013-02-03 00:24:49 -08:00
2936140838
[tx-robot] updated from transifex
2013-02-03 00:06:15 +01:00
7e3aa0de86
Merge remote-tracking branch 'refs/remotes/upstream/master'
2013-02-02 09:44:09 +01:00
b29b55a332
[tx-robot] updated from transifex
2013-02-02 00:08:15 +01:00
d8f6595c5e
Merge remote-tracking branch 'refs/remotes/upstream/master'
2013-02-01 23:28:20 +01:00
469b1e8dd2
Correct it
2013-02-01 20:29:02 +01:00
94f7446724
[tx-robot] updated from transifex
2013-02-01 00:19:28 +01:00
a9e1c9bf6d
Merge pull request #1351 from owncloud/navigation
...
New navigation design
2013-01-31 14:37:39 -08:00
b1da1db0eb
Merge branch 'master' into from_live_to_on
...
Conflicts:
apps/files_external/js/google.js
2013-01-31 23:34:12 +01:00
c1072d0c09
call ajax scan only if a user is logged in - otherwise we'll get a 500
2013-01-31 23:26:40 +01:00
2af6d74bc1
Merge branch 'master' into fixing-js-errors-public-link-master
...
Conflicts:
apps/files/js/files.js
apps/files/templates/part.list.php
2013-01-31 23:23:10 +01:00
3d5c7ca245
Merge branch 'master' into navigation
2013-01-31 19:28:25 +01:00
ab2b79cda6
add multiple domains reverse proxy support
...
Add support for a reverse proxy that handles multiple domains via different
web roots (http[s]://proxy.tld/domain.tld/owncloud).
As the reverse proxy web root is transparent for the web server the
REQUEST_URI and SCRIPT_NAME need manual adjustments. This patch replace
the direct use of this _SERVER variables with function calls and extend
this functions to overwrite the web root. Additionally it adds a Sabre
request backend that extends the Sabre_HTTP_Request to use the same
functions.
2013-01-31 18:42:31 +01:00
5417e44b2a
Files: fix moving files by DnD
2013-01-31 17:56:44 +01:00
209d599ec5
[tx-robot] updated from transifex
2013-01-31 17:05:21 +01:00
ad044eb888
Merge branch 'master' into navigation
2013-01-31 15:35:20 +01:00
Bart Visscher
Jenkins for ownCloud
Jörn Friedrich Dreyer
kondou
Jan-Christoph Borchardt
raghunayyar
Björn Schießle
Bernhard Posselt
Robin Appelman
Björn Schießle
Tom Needham
Tom Needham
Frank Karlitschek
Lukas Reschke
Michael Gapczynski
Georg Ehrke
j-ed
VicDeo
Thomas Tanghus
Myles McNamara
TheSFReader
Stefan Herbrechtsmeier