mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
19,626 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

19626 Commits

Author SHA1 Message Date
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
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
Thomas Müller 708b734e48 Merge pull request #9945 from owncloud/remove-mssql-bundle-master 
remove MssqlBundle
 2014-07-28 22:44:40 +02:00
Thomas Müller e0b649cf8d remove MssqlBundle 2014-07-28 22:22:40 +02:00
Bjoern Schiessle aff948925a update attributes for share with user list, file should always have delete permissions, this means unshare in this context, and the overview page is always a root view 2014-07-28 22:04:13 +02:00
Björn Schießle 0dc649f391 Merge pull request #9758 from owncloud/share-expdatefix 
Fix enforced share expiration date to be based on share time
 2014-07-28 17:58:26 +02:00
Björn Schießle c53b56e313 Merge pull request #9798 from owncloud/ocs_share_api_add_expire_date 
[share api] add OCS api call to set expire date for link shares
 2014-07-28 17:28:32 +02:00
Morris Jobke 1fbbaed261 Merge pull request #9949 from owncloud/fixing-sqlite-migration-shared-hoster 
generate copy of sqlite database file in data directory
 2014-07-28 16:54:52 +02:00
Robin Appelman cb0ff19dc4 Merge pull request #9924 from owncloud/eventsource-nginx-buffering 
Prevent nginx from buffering event source events
 2014-07-28 16:17:35 +02:00
Morris Jobke 798ffd9d7c Merge pull request #9853 from owncloud/design-mobile-search 
improve look of search on mobile, save space in top bar, fix overlap
 2014-07-28 13:15:19 +02:00
Thomas Müller 539d2b7ec3 Merge pull request #9784 from josh4trunks/libreoffice_match_cl 
Cleanup Document Preview
 2014-07-28 13:03:33 +02:00
Morris Jobke 1b5d31adc7 update 3rdparty submodule to merge commit 2014-07-28 12:54:20 +02:00
Jan-Christoph Borchardt 13ca1c6a99 Merge pull request #9585 from owncloud/design-fix-public-footer 
move public page footer rules from sharing app to core so it is used by other apps too
 2014-07-28 12:53:29 +02:00
Jan-Christoph Borchardt c51c93c800 Merge pull request #9847 from owncloud/design-input-grouping 
enable input grouping also outside of log in screen
 2014-07-28 12:52:49 +02:00
Bjoern Schiessle b7958f79c3 adjust error code 2014-07-28 12:39:22 +02:00
Thomas Müller a3411e3719 Merge pull request #9641 from owncloud/localuser-addressbook 
ownCloud users are exported as address book
 2014-07-28 12:18:56 +02:00
Thomas Müller 534fb9ebf9 Merge pull request #9631 from owncloud/update-getid3 
update getID3 library
 2014-07-28 11:51:36 +02:00
Bjoern Schiessle de4233bc1c show a warning in the personal settings and admin settins if the encyption keys are not initialized 2014-07-28 11:31:06 +02:00
Thomas Müller 11214219f3 Merge pull request #9819 from owncloud/updater-setversionafterupdate 
Set version AFTER a successful update
 2014-07-28 11:19:57 +02:00
Thomas Müller 0aa652ecfd Merge pull request #9859 from tiezdne/master 
Update mimetypes.list.php
 2014-07-28 11:16:43 +02:00
Thomas Müller cfaa05cc0e Merge pull request #9905 from owncloud/joblist-non-existing-class 
Dont try to execute jobs that no longer exist
 2014-07-28 11:09:27 +02:00
Thomas Müller ab8efe3aa2 Merge pull request #9935 from owncloud/harden-get-urlco 
Verify whether the URL is valid
 2014-07-28 11:07:41 +02:00
Thomas Müller c87f425fe7 generate copy of sqlite database file in data directory 2014-07-28 10:29:39 +02:00
Thomas Müller f2982b7a08 Merge pull request #9904 from owncloud/loggedout-getuserfolder 
Dont throw an error when calling $server->getUserFolder when logged out
 2014-07-28 10:04:01 +02:00
Thomas Müller 37f673c8b5 Merge pull request #9843 from owncloud/dont-silently-exit-in-cli-mode-master 
don't silently exit in cli-mode in case ownCloud in not yet installed
 2014-07-28 09:40:40 +02:00
Jenkins for ownCloud a169572223 [tx-robot] updated from transifex 2014-07-28 01:54:30 -04:00
Jan-Christoph Borchardt 0b63111892 Merge pull request #9922 from visit1985/app_icon_size 
max icon size for app menu
 2014-07-28 00:47:55 +02:00
Lukas Reschke 260729fd7d Verify whether the URL is valid 
Required for https://github.com/owncloud/mail/pull/100#issuecomment-50266017

@karlitschek Backport for stable6 and stable7 requested.
 2014-07-27 16:46:32 +02:00
Jenkins for ownCloud 9a4d2871eb [tx-robot] updated from transifex 2014-07-27 01:54:31 -04:00
Robin Appelman 2c4e06d325 Prevent nginx from buffering event source events 2014-07-26 16:07:11 +02:00
Michael Göhler 1e69fc9af2 max icon size for app menu 2014-07-26 13:06:51 +02:00