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 |
|
Jenkins for ownCloud
|
844e18a8b1
|
[tx-robot] updated from transifex
|
2013-03-03 00:06:56 +01:00 |
Brice Maron
|
dbb9b68331
|
Fix quoting of query for user_ldap ref #1983
|
2013-03-02 16:26:15 +01:00 |
Lukas Reschke
|
d3e88e6a8c
|
Remove uneeded sanitizeHTML
|
2013-03-02 12:44:53 +01:00 |
|
Jenkins for ownCloud
|
c9d9c381ec
|
[tx-robot] updated from transifex
|
2013-03-02 00:05:42 +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 |
Bernhard Posselt
|
2e2cf28d30
|
Merge pull request #2005 from owncloud/trash_add_signals
add post_moveToTrash and post_restore signals to the trash bin
|
2013-03-01 09:41:07 -08:00 |
Georg Ehrke
|
ff9476b3e3
|
fix oc#47
|
2013-03-01 18:30:25 +01:00 |
Björn Schießle
|
a01540a300
|
fix getVersions() call for the history view
|
2013-03-01 13:55:10 +01:00 |
|
Björn Schießle
|
e81b6395d4
|
make sure that the version app always work on the users real home folder and not on the mount point
|
2013-03-01 13:54:26 +01:00 |
|
Björn Schießle
|
df2a9a3c60
|
add additional parameter to signal
|
2013-03-01 12:44:43 +01:00 |
|
Björn Schießle
|
7c360c2491
|
add post_moveToTrash and post_restore signals to the trash bin
|
2013-03-01 12:20:29 +01:00 |
|
Jenkins for ownCloud
|
d20fd7e9a6
|
[tx-robot] updated from transifex
|
2013-03-01 00:07:02 +01:00 |
|
Lukas Reschke
|
416607e559
|
Merge pull request #1979 from maelzx/patch-2
Fix window.location mistakes in previous code
|
2013-02-28 12:53:15 -08:00 |
|
Lukas Reschke
|
301d065686
|
Sed was wrong
|
2013-02-28 20:21:14 +01:00 |
|
Lukas Reschke
|
dee16deacd
|
Merge master
|
2013-02-28 20:03:06 +01:00 |
Jan-Christoph Borchardt
|
6d4b344f5d
|
Merge pull request #1397 from owncloud/trash_fileactions
Enable fileactions while viewing trash
|
2013-02-28 05:43:51 -08:00 |
Robin Appelman
|
12fd47af39
|
Trash: fix opening folders
|
2013-02-28 13:32:08 +01:00 |
maelzx
|
a319fa8d47
|
Fix window.location mistakes in previous code
Sorry guys, I commit the incomplete code. It should be window.location.assign(url);
However this is just tested in google chrome.
|
2013-02-28 11:26:42 +08:00 |
|
Jenkins for ownCloud
|
a93b5b47a1
|
[tx-robot] updated from transifex
|
2013-02-28 00:05:40 +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
|
0b5b495535
|
[user_webdavauth] From echo to p
|
2013-02-27 22:06:50 +01:00 |
|
Lukas Reschke
|
df1d90433d
|
[user_ldap] From echo to p
|
2013-02-27 22:04:57 +01:00 |
|
Lukas Reschke
|
fc5331eaec
|
[files_versions] From echo to p
|
2013-02-27 21:50:22 +01:00 |
|
Lukas Reschke
|
3ba8881bac
|
[files_trashbin] From echo to p
|
2013-02-27 21:46:37 +01:00 |
|
Lukas Reschke
|
c9415e6529
|
[files] Unescape file size
|
2013-02-27 21:40:06 +01:00 |
|
Lukas Reschke
|
221ecf63ab
|
[files_sharing] From echo to p
|
2013-02-27 21:37:14 +01:00 |
|
Lukas Reschke
|
236507a19f
|
[files_external] From echo to p
|
2013-02-27 21:31:27 +01:00 |
|
Lukas Reschke
|
7f8eddffe4
|
[files_encryption] Use p() instead of echo()
|
2013-02-27 21:20:37 +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 |
|
Robin Appelman
|
923c51773a
|
Trash: disable text editor from trash for now
|
2013-02-27 20:37:50 +01:00 |
|
Robin Appelman
|
f497970e30
|
Trash: fix download.php
|
2013-02-27 20:31:21 +01:00 |
|
Robin Appelman
|
d2fe600789
|
Trash: fix trash when default quota is used
|
2013-02-27 20:29:49 +01:00 |
|
Robin Appelman
|
429bf42e98
|
Merge master into trash_fileactions
|
2013-02-27 20:29:19 +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 |
|
Michael Gapczynski
|
766a301a6b
|
Merge pull request #1031 from owncloud/external_storage_ui_feedback
External Storage UI Improvements
|
2013-02-27 10:00:22 -08:00 |
|
Björn Schießle
|
f8bcd38d4d
|
remove admin settings from app.php
|
2013-02-27 15:53:08 +01:00 |
|
Björn Schießle
|
6cf147003f
|
Merge branch 'master' into versions_cleanup
|
2013-02-27 15:50:08 +01:00 |
|
Björn Schießle
|
9b220d0b93
|
rename History to Versions
|
2013-02-27 15:46:49 +01:00 |
|
Björn Schießle
|
d9e75c2b92
|
remove admin settings for versions
|
2013-02-27 15:44:02 +01:00 |
|
Jenkins for ownCloud
|
fd654e9c2f
|
[tx-robot] updated from transifex
|
2013-02-27 14:37:12 +01:00 |
Frank Karlitschek
|
49f2a2d25d
|
Merge pull request #1953 from owncloud/escape_regular_expressions
escape regular expressions; fix typo in variable name
|
2013-02-27 04:29:17 -08:00 |
|
Bernhard Posselt
|
a54be4acc4
|
Merge pull request #1948 from owncloud/improve_user_sorting
Sort after display name + LDAP server side sorting
|
2013-02-27 02:39:22 -08: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 |
|
Björn Schießle
|
5c7e3cf2e2
|
escape regular expressions; fix typo in variable name
|
2013-02-27 10:51:32 +01:00 |
|
Michael Gapczynski
|
f26c477433
|
Merge pull request #1949 from owncloud/fix-dropbox
Fix undefined root parameter in Dropbox storage
|
2013-02-26 16:14:45 -08:00 |