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 |
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 |
|
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 |