Clark Tomlinson
|
b04bab0ac7
|
Merge branch 'fix-9969-take-two' of https://github.com/th3fallen/core into fix-9969-take-two
|
2014-07-31 09:34:42 -04:00 |
Clark Tomlinson
|
26af116fcd
|
Removing unnecessary switch statements in fopen methods.
|
2014-07-31 09:34:27 -04:00 |
Clark Tomlinson
|
222b9fd22b
|
Resolving 9969 resubmitting to fix rebase issue.
|
2014-07-31 08:53:42 -04:00 |
Thomas Müller
|
4eb2b4e1b0
|
Merge pull request #10051 from owncloud/preview-empty-text
Use svg mimeicons for empty text files
|
2014-07-31 11:38:29 +02:00 |
Jenkins for ownCloud
|
c1562057e8
|
[tx-robot] updated from transifex
|
2014-07-31 01:55:01 -04:00 |
Sander
|
fd1bb688f9
|
Merge pull request #10055 from owncloud/notification-fix
Fix notification preventing top bar clickability
|
2014-07-30 21:16:30 +02:00 |
Jan-Christoph Borchardt
|
8389ff5875
|
Merge pull request #10054 from owncloud/dont_preload_videos
don't preload videos on public sharing, fixes #10042
|
2014-07-30 21:10:57 +02:00 |
Jan-Christoph Borchardt
|
5b11a18dea
|
Merge pull request #10044 from owncloud/transparency_fix
extract transparency fix from #8050
|
2014-07-30 18:36:51 +02:00 |
Morris Jobke
|
521934ee0d
|
Merge pull request #10029 from owncloud/fix-thirdparty
Fix silent crash if 3rdparty dir is not available
|
2014-07-30 18:34:55 +02:00 |
Jan-Christoph Borchardt
|
b177f9b063
|
set max width for notifications so they won't overlap the whole header
|
2014-07-30 18:16:32 +02:00 |
Jan-Christoph Borchardt
|
a6484fbda9
|
fix yellow notification style
|
2014-07-30 18:02:53 +02:00 |
Jan-Christoph Borchardt
|
be2a3c7398
|
fix notification preventing top bar clickability, fix #9680
|
2014-07-30 18:00:46 +02:00 |
Der-Jan
|
84ea393393
|
Fixed wrong brackets in apps settings
|
2014-07-30 17:23:19 +02:00 |
Morris Jobke
|
62b37fbb99
|
Merge pull request #10024 from owncloud/preview-restrict-height
Also keep maxY into account when scaling a preview while preserving aspect ratio
|
2014-07-30 17:22:20 +02:00 |
Björn Schießle
|
ef3c0c508f
|
Merge pull request #9897 from owncloud/support_webdav_copy
add support for webdav copy to the encryption and versions app
|
2014-07-30 17:21:32 +02:00 |
Georg Ehrke
|
3d0bcb7c46
|
don't preload videos on public sharing, fixes #10042
|
2014-07-30 17:06:41 +02:00 |
Jörn Friedrich Dreyer
|
dd9347fdd2
|
Merge pull request #10000 from owncloud/fix-lowlat-cache-autoload
Cache factory needs to use globalPrefix in createLowLatency()
|
2014-07-30 16:56:45 +02:00 |
Robin Appelman
|
4a9b0d5465
|
Use svg mimeicons for empty text files
|
2014-07-30 16:31:37 +02:00 |
Georg Ehrke
|
fa461befbc
|
extract transparency fix from #8050
|
2014-07-30 16:13:33 +02:00 |
Bjoern Schiessle
|
1a797f90bb
|
add unit test for rename and copy operation
|
2014-07-30 15:14:01 +02:00 |
Bjoern Schiessle
|
dba2574c52
|
make sure that we always find all versions
|
2014-07-30 15:14:01 +02:00 |
Bjoern Schiessle
|
c738f71657
|
make the versions and encryption app aware of the copy operation
|
2014-07-30 15:14:01 +02:00 |
Morris Jobke
|
38e309b0fe
|
Merge pull request #9970 from owncloud/sharing_set_expire_date
Sharing set expire date
|
2014-07-30 14:37:16 +02:00 |
Victor Dubiniuk
|
eb9bd200fa
|
Replace exit with return
|
2014-07-30 14:03:31 +02:00 |
Victor Dubiniuk
|
31e7fdb9bf
|
Fix silent crash if 3rdparty dir is not available
|
2014-07-30 14:03:31 +02:00 |
Robin Appelman
|
c066320208
|
Also keep maxY into account when scaling a preview while preserving aspect ratio
|
2014-07-30 13:52:40 +02:00 |
Morris Jobke
|
06d118d06c
|
Merge pull request #10032 from owncloud/kill-swift-tests
only if the environment variable RUN_OBJECTSTORE_TESTS is set the object...
|
2014-07-30 13:47:03 +02:00 |
Morris Jobke
|
a9255fbb47
|
Merge pull request #10041 from owncloud/design-link-folder-icon
also use link icon for the folders ..
|
2014-07-30 13:19:42 +02:00 |
Thomas Müller
|
54d5d03271
|
Merge pull request #9888 from owncloud/mysql-tinyint-master
migration test for sqlite - adding type mapping for 'tinyint unsigned'
|
2014-07-30 11:48:10 +02:00 |
Jan-Christoph Borchardt
|
da48ba2782
|
also use link icon for the folders ..
|
2014-07-30 11:07:16 +02:00 |
Thomas Müller
|
7d6221d25d
|
Merge pull request #9914 from owncloud/fix-appframework-blank-template
Fix template rendering for 'blank' templates
|
2014-07-30 10:31:15 +02:00 |
Jenkins for ownCloud
|
47e72917e5
|
[tx-robot] updated from transifex
|
2014-07-30 01:55:32 -04:00 |
Thomas Müller
|
1a7d80acd7
|
only if the environment variable RUN_OBJECTSTORE_TESTS is set the object store unit test will be executed
|
2014-07-29 21:51:21 +02:00 |
Thomas Müller
|
a779878657
|
Merge pull request #10022 from owncloud/fix-exec-admin-master
only call exec() if allowed to
|
2014-07-29 21:28:52 +02:00 |
Jan-Christoph Borchardt
|
9bcf2c351c
|
Merge pull request #10020 from owncloud/design-link-icon
use more understandable 'link' icon for public links (instead of hard to recognize globe)
|
2014-07-29 20:18:27 +02:00 |
Thomas Müller
|
673a8bb2b8
|
only call exec() if allowed to
|
2014-07-29 16:59:40 +02:00 |
Morris Jobke
|
889088f72d
|
Fix template rendering for 'blank' templates
|
2014-07-29 16:49:50 +02:00 |
Björn Schießle
|
2946a63f6b
|
Merge pull request #9721 from owncloud/enc_define_type_in_pre_hook
[encryption] define type in pre hook
|
2014-07-29 16:29:28 +02:00 |
Björn Schießle
|
f7d60f1190
|
Merge pull request #9951 from owncloud/enc_inproved_error_messages
show a warning in the personal settings and admin settins if the encyption keys are not initialized
|
2014-07-29 16:27:24 +02:00 |
Jan-Christoph Borchardt
|
4087d128bb
|
use more understandable 'link' icon for public links (instead of hard to recognize globe), fix #9707
|
2014-07-29 14:53:43 +02:00 |
Björn Schießle
|
a36c4402f5
|
Merge pull request #9988 from owncloud/sharing_remove_share_permission
remove share permission if user is excluded from sharing
|
2014-07-29 14:05:13 +02:00 |
Björn Schießle
|
03f7c5c561
|
Merge pull request #9983 from owncloud/sharing_add_unshare_to_overview
update attributes for share-with-user view
|
2014-07-29 14:00:57 +02:00 |
Andreas Fischer
|
a8fbc709ce
|
Add registerAutoloaderCache().
|
2014-07-29 11:18:40 +02:00 |
Andreas Fischer
|
9be8ac5867
|
Memcache\Factory: Remove static, use globalPrefix.
|
2014-07-29 11:14:36 +02:00 |
Andreas Fischer
|
da391b8932
|
InstanceId is properly injected into factory. Remove comment.
|
2014-07-29 11:03:10 +02:00 |
Bjoern Schiessle
|
67e302885c
|
remove share permission if user is excluded from sharing
|
2014-07-29 10:08:08 +02:00 |
Thomas Müller
|
58472a2660
|
migration test for sqlite - adding type mapping for 'tinyint unsigned'
|
2014-07-29 09:18:37 +02:00 |
Jenkins for ownCloud
|
29a3f1e2af
|
[tx-robot] updated from transifex
|
2014-07-29 09:16:02 +02:00 |
Thomas Müller
|
021f25836a
|
Merge pull request #9989 from owncloud/fix-failing-unit-test-master
function declaration did not match
|
2014-07-29 07:44:23 +02:00 |
Thomas Müller
|
09ebe1cfa6
|
function declaration did not match
|
2014-07-29 00:34:02 +02:00 |