Jenkins for ownCloud
63ca84e7bc
[tx-robot] updated from transifex
2013-03-19 00:05:52 +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
Jan-Christoph Borchardt
c262ad56b3
Merge pull request #2408 from dcneiner/infield-upgrade
...
Upgraded infield labels plugin to the latest version. Updated invocation...
2013-03-18 07:49:26 -07:00
Thomas Tanghus
a50d53c4dd
Merge pull request #2417 from owncloud/trash_more_error_logs
...
add some error logs to the trash bin app
2013-03-18 05:17:21 -07:00
Björn Schießle
4a1a23ce1b
add some error logs to the trash bin app
2013-03-18 12:08:34 +01:00
Frank Karlitschek
67f5b00980
Merge pull request #2411 from owncloud/fix_magicquotes
...
remove deprecated call
2013-03-18 02:37:01 -07:00
Doug Neiner
b8c1a4da3e
Upgraded infield labels plugin to the latest version. Updated invocation to opt-in to pollling at the same duration you were using before, 100ms
2013-03-17 22:21:34 -05:00
Jenkins for ownCloud
2a48aa322d
[tx-robot] updated from transifex
2013-03-18 00:06:55 +01:00
Frank Karlitschek
63336f2acb
remove deprecated call
2013-03-17 22:05:45 +01:00
Frank Karlitschek
7f1ff3e9e1
Merge pull request #2204 from owncloud/chache_updater_rename
...
Cache: better rename hook for cache updater
2013-03-17 05:03:18 -07:00
Thomas Müller
86f6938c38
Merge pull request #2387 from owncloud/cron-session-close
...
Close sessions when doing background jobs
2013-03-16 18:22:45 -07:00
Robin Appelman
d3858e9f96
Close sessions when doing background jobs
2013-03-17 00:48:10 +01:00
Jenkins for ownCloud
db69e2b3e8
[tx-robot] updated from transifex
2013-03-17 00:02:13 +01:00
Jenkins for ownCloud
1427af4a22
[tx-robot] updated from transifex
2013-03-16 22:18:26 +01:00
Bernhard Posselt
07df7b3de7
added %webroot% instead of relative path
2013-03-16 21:19:57 +01:00
Bernhard Posselt
b3499c8dc3
Merge pull request #2380 from henningoschwald/76bb5221c7a1b71f0d617c55e844c51e889a2c70
...
Fixes keyboard accessibility of expandable settings
2013-03-16 12:22:33 -07:00
Bernhard Posselt
a3db54f9b0
Merge pull request #2383 from owncloud/error-handling-upgrade
...
Add error handling to the file cache upgrade
2013-03-16 12:17:31 -07:00
Michael Gapczynski
c69dc3483a
Add error handling to the file cache upgrade
2013-03-16 14:28:42 -04:00
Henning Oschwald
76bb5221c7
Restores keyboard accessibility for expandable settings area.
...
Tabindex="0" makes the element focussable with the keyboard and
role="link" tells assistive technologies that this clickable span
element is supposed to be presented as a hyperlink.
2013-03-16 16:32:55 +01:00
Jan-Christoph Borchardt
25175937a9
Merge pull request #2322 from PHLAK/master
...
Added 3rdparty folder as a git submodule
2013-03-16 06:31:16 -07:00
Lukas Reschke
047ceaac0f
Merge pull request #2360 from sherbrecher/master
...
files_external: fix for overlap if input controls
2013-03-15 10:48:46 -07:00
sherbrecher
ec45a8433d
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
apps/files_external/templates/settings.php
2013-03-15 17:50:02 +01:00
Robin Appelman
8a97afac6f
Don't show storage space warning when the free space can't be determined
2013-03-15 16:46:20 +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
Bernhard Posselt
ebb2cb3403
Merge pull request #2350 from aschoenebeck/ignore_blacklisted_files
...
Filter display of blacklisted files
2013-03-15 08:25:13 -07:00
sherbrecher
d2b3a9fb3b
Update settings.php
...
fixed overlap of input controls (root cert import)
see issue: https://github.com/owncloud/apps/issues/767
2013-03-15 15:09:55 +01:00
Frank Karlitschek
761540e78b
Merge pull request #2320 from ceri/master
...
Fix erroneous email when folders are shared
2013-03-15 04:22:44 -07:00
Andreas Schönebeck
387be37427
Filter display of blacklisted files
...
Blacklisted files like ".htaccess" and ".git" should not only be
blacklisted for upload and rename, but they should also not be displayed
in the directory listings.
I needed this personally to hide ".git" folders in shared folders. Its
also a simple implementation of feature requests like
http://forum.owncloud.org/viewtopic.php?f=4&t=3279 and
http://forum.owncloud.org/viewtopic.php?f=3&t=5708
2013-03-15 12:11:42 +01:00
Björn Schießle
418fb98c40
remove backticks around table names
2013-03-15 12:10:21 +01:00
Björn Schießle
e37e884d7a
add backtick for db queries to prevent postgresql errors
2013-03-15 12:10:07 +01:00
Björn Schießle
23fe98a562
Merge pull request #2336 from eMerzh/fix_trashpg
...
Add backtick for trash app to prevent pg errors
2013-03-15 03:17:54 -07:00
Frank Karlitschek
92a8676350
Merge pull request #2317 from owncloud/create_version_on_upload
...
create new version if the same file is uploaded again over the web interface
2013-03-15 01:18:20 -07:00
Jenkins for ownCloud
0c123ebf9d
[tx-robot] updated from transifex
2013-03-15 00:06:36 +01:00
Brice Maron
1631aa2434
Add backtick for trash app to prevent pg errors
2013-03-15 00:03:37 +01:00
Bernhard Posselt
1da6f79d3b
Merge pull request #2318 from owncloud/unkown-freespace
...
Return unknown freespace if the free_space call failed
2013-03-14 14:05:18 -07:00
Björn Schießle
285d328ef1
use html video tag to preview videos for public shares
2013-03-14 20:10:21 +01:00
Chris Kankiewicz
7f43d6559f
Added 3rdparty folder as a git submodule
2013-03-14 10:21:37 -07:00
Björn Schießle
f78594c0ae
fix var name
2013-03-14 17:09:48 +01:00
Björn Schießle
93b2ada6f6
fix var name
2013-03-14 17:08:16 +01:00
Robin Appelman
ed83597371
Return unknown freespace if the free_space call failed
...
Fixes #2312
2013-03-14 17:00:30 +01:00
Björn Schießle
0cf50d63bf
create new version if the same file is uploaded again over the web interface
2013-03-14 16:47:59 +01:00
Björn Schießle
abe408e934
replace \MDB with \OC_DB, approved in #2278
2013-03-14 14:59:12 +01:00
Björn Schießle
8154b4be7d
use display name as sender for private link mails, approved in #2294
2013-03-14 13:26:20 +01:00
Ceri Davies
17cb47fbf6
Correct emails when folders are shared.
...
itemType is never "dir"; it's either "file" or "folder".
2013-03-14 10:04:58 +00:00
Jenkins for ownCloud
9a0cb2ccaa
[tx-robot] updated from transifex
2013-03-14 00:06:29 +01:00
Bernhard Posselt
7d748a6b06
Merge pull request #2277 from owncloud/fix_sharing_hooks
...
listen to the pre delete hook in the sharing app [master]
2013-03-13 10:15:57 -07: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
30831b6b55
we need to listen to the pre delete hook, otherwise the file is already gone
2013-03-13 15:39:39 +01: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
