Skip to content

Commit

Permalink
Merge pull request #7 from MFreakNL/moodle35
Browse files Browse the repository at this point in the history
Moodle35
  • Loading branch information
luukverhoeven authored Nov 14, 2019
2 parents 1b8c53e + 47a7f62 commit bd8671b
Show file tree
Hide file tree
Showing 1,048 changed files with 82,165 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ env:
- MOODLE_BRANCH=MOODLE_35_STABLE
- MOODLE_BRANCH=MOODLE_36_STABLE
- MOODLE_BRANCH=MOODLE_37_STABLE
- MOODLE_BRANCH=MASTER
- MOODLE_BRANCH=master

matrix:
- DB=pgsql
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "moodlefreak/moodle-block_mfavatar",
"description": "MoodleFreak Plugin Avatar gives the user the possibility to take a snapshot with a live webcam. The user can then upload the picture and modify his profile picture at any time. ",
"name": "mfreak/moodle-block_mfavatar",
"description": "Mfreak Plugin Avatar gives the user the possibility to take a snapshot with a live webcam. The user can then upload the picture and modify his profile picture at any time. ",
"license": "GNU General Public License",
"authors": [
{
Expand Down
4 changes: 2 additions & 2 deletions lang/en/block_mfavatar.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
$string['mfavatar:myaddinstance'] = 'Add a new avatar snapshot block to My home';
$string['mfavatar:view'] = 'View Mfavatar';

$string['pluginname'] = 'MoodleFreak Avatar';
$string['pluginname'] = 'Mfreak Avatar';
$string['makesnapshot'] = 'Make Snapshot';
$string['snapshotpage'] = 'Snapshot';
$string['installflash'] = 'Please install flash';
Expand All @@ -46,7 +46,7 @@
$string['failed:sesskey'] = 'Error: failed saving you are still logged? Refresh the page and retry';
$string['failed:permission_editownprofile'] = 'Error: User can\'t change their images';

$string['pluginname_desc'] = 'Customize MoodleFreak avatar below.';
$string['pluginname_desc'] = 'Customize Mfreak avatar below.';
$string['webrtc_enabled'] = 'WebRTC (modern) browser will support this';

$string['privacy:null_reason'] = 'No data collected by this plugin.';
Expand Down
4 changes: 2 additions & 2 deletions lang/nl/block_mfavatar.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@

$string['mfavatar:addinstance'] = 'Voeg avatar snapshot tool toe';
$string['mfavatar:myaddinstance'] = 'Voeg een nieuwe avatar snapshot blok toe aan Mijn startpagina';
$string['mfavatar:view'] = 'MoodleFreak Avatar weergeven';
$string['pluginname'] = 'MoodleFreak Avatar';
$string['mfavatar:view'] = 'Mfreak Avatar weergeven';
$string['pluginname'] = 'Mfreak Avatar';
$string['makesnapshot'] = 'Maak Snapshot';
$string['snapshotpage'] = 'Snapshot';
$string['installflash'] = 'Installeer flash';
Expand Down
7 changes: 7 additions & 0 deletions vendor/autoload.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?php

// autoload.php @generated by Composer

require_once __DIR__ . '/composer/autoload_real.php';

return ComposerAutoloaderInitdb895faa6a24dcb10d5811469e5babcb::getLoader();
Loading

0 comments on commit bd8671b

Please sign in to comment.