Commit Graph

485 Commits (163e3140599db7ba6026c7e2280d34ba6e9bdd56)

Author SHA1 Message Date
Paal Joergensen c129a71217 Merge branch 'release' 2016-05-03 11:32:35 +02:00
Paal Joergensen 8dd83f77d8 Merge branch 'confirmation-dialog' into release 2016-05-03 11:15:30 +02:00
Frode Petterson 9d8a35f807 Added extra check to upgrade script 2016-05-02 11:05:59 +02:00
Frode Petterson 4c389c89e3 Bumped patch version 2016-05-02 10:26:55 +02:00
Frode Petterson eae26f1351 Merge branch 'master' into release 2016-05-02 10:22:08 +02:00
Thomas Marstrander e90ef1f831 Added functionality for resizing Question Set if it is too small for confirmation dialog.
HFJ-1572
2016-04-25 13:28:02 +02:00
Paal Joergensen 35e8dbd925 Updated english strings in code to match semantics [HFJ-1858] 2016-04-22 10:33:07 +02:00
Thomas Marstrander d441f67b70 Override confirmation dialog parent element for interactions.
HFJ-1572
2016-04-21 15:51:43 +02:00
Paal Joergensen d8c6976aef Using latest version of blanks in QS 2016-04-21 15:47:13 +02:00
Paal Joergensen 001e765ddc Updated texts [HFJ-1858] 2016-04-21 14:45:43 +02:00
Frode Petterson fa7b05f6fe A case of a forgotten bracket 2016-04-18 13:14:20 +02:00
Frode Petterson e323c4ee3b Merge branch 'master' into unused-semantics
Conflicts:
	js/questionset.js
	language/ar.json
	language/de.json
	language/fr.json
	language/it.json
	language/nb.json
	language/nn.json
	semantics.json
	upgrades.js
2016-04-18 12:48:13 +02:00
Thomas Marstrander 0e50523853 Moved copyright question labels inside the common interface texts.
HFJ-1746
2016-04-15 12:49:09 +02:00
Frode Petterson 333d3f4161 Show intro when retrying
HFJ-1816
2016-04-15 09:49:50 +02:00
Frode Petterson c045d440d9 Set min. height to background image on intro
Also, made sure that the image always covers the background.
HFJ-1815
2016-04-15 09:30:27 +02:00
Thomas Marstrander 2745b6b414 Improved label of copyright dialog label.
HFJ-1746
2016-04-11 10:35:47 +02:00
Frode Petterson 63f6162ef2 Updated the default text 2016-04-08 16:07:24 +02:00
Frode Petterson c36e31ebf4 Hooked up the texts for next/prev buttons
HFJ-1749
2016-04-08 16:06:36 +02:00
Frode Petterson 6537378091 Fixed summary button icons
HFJ-1749
2016-04-08 16:02:54 +02:00
Frode Petterson 308be51132 Added description for 'jump to question' field
HFJ-1750
2016-04-08 15:59:28 +02:00
Frode Petterson 93a5efd6e8 Fixed aria-label for progress dots
HFJ-1750
2016-04-08 15:58:38 +02:00
Frode Petterson 04003cf303 Made summary buttons into valid buttons
HFJ-1749
2016-04-08 15:36:06 +02:00
Frode Petterson ab76075acc Converted progress dots to links + ARIA label
HFJ-1750
2016-04-08 14:42:49 +02:00
Frode Petterson 02cd4e1b7e Added focus effect to progress dots
HFJ-1661
2016-04-08 14:41:17 +02:00
Frode Petterson 2a26db16f6 Links for navigation + ARIA label
HFJ-1749
2016-04-08 12:40:28 +02:00
Thomas Marstrander d8be2e07ad Added unused semantics to Score/summary screen.
HFJ-1710
2016-04-07 16:23:15 +02:00
Frode Petterson 40fa6542e6 Show feedback for each question
Ref. https://h5p.org/node/8730
HFJ-1747
2016-04-06 15:53:50 +02:00
Frode Petterson 6d50af50ec Merge branch 'stable' 2016-04-05 12:06:39 +02:00
Frode Petterson 546c91975e Merge branch 'release' into stable 2016-04-05 11:56:03 +02:00
Frode Petterson bb943bbb3b Easier to use override 2016-04-04 15:50:41 +02:00
Frode Petterson 7a21b71525 Support for newest textual editor 2016-03-21 10:55:54 +01:00
Frode Petterson 4ba08f6a54 Merge branch 'master' into release 2016-03-21 10:01:34 +01:00
Thomas Marstrander 3036f888af Fix unused semantics.
HFJ-1710
2016-03-17 14:09:13 +01:00
Thomas Marstrander 1be48174bb New Video minor bump.
HFJ-1658
2016-03-08 13:24:40 +01:00
Frode Petterson 8e9a2573a9 Merge branch 'stable' 2016-02-19 09:39:32 +01:00
Frode Petterson 70ecfd889e Merge branch 'release' into stable 2016-02-19 09:30:11 +01:00
Frode Petterson 2fd04da428 Merge branch 'master' into release 2016-02-08 13:21:21 +01:00
Frode Petterson 6257e576ca Corrected german translation format 2016-02-08 09:37:26 +01:00
Frode Petterson 23c04a2f88 Merge pull request #3 from docmoritz/master
created de.json
2016-02-08 09:29:37 +01:00
Sven Peter c393f43292 Merge pull request #1 from docmoritz/docmoritz-patch-1
Create de.json
2016-02-06 15:01:38 +01:00
Frode Petterson 7919ebbf39 Updated FontAwesome dependency 2016-02-05 12:47:53 +01:00
Frode Petterson d8af1ac8d7 Increased patch version 2016-02-03 11:30:38 +01:00
Frode Petterson 4b49a4ff0d Merge branch 'master' into release 2016-02-03 11:28:39 +01:00
Sven Peter 5e1c0c07ba Create de.json
First file I commit, so please look careful!
2016-02-02 21:00:40 +01:00
Frode Petterson bf0dd46cc9 Merge branch 'stable' 2016-01-21 14:35:06 +01:00
Frode Petterson c63a4795ac Merge branch 'release' into stable 2016-01-21 14:34:34 +01:00
Svein-Tore Griff With c24ed57231 Allow links in the success and fail comments (h5p.org/node/6812) HFJ-1539 2016-01-12 17:03:09 +01:00
Frode Petterson 51c614a2be Updated MarkTheWords 2015-12-11 12:51:27 +01:00
Paal Joergensen bc1dd91715 Bumped version 2015-12-02 15:45:43 +01:00
Paal Joergensen e30df40148 Merge remote-tracking branch 'origin/master' into release 2015-12-02 14:05:28 +01:00