Commit Graph

619 Commits (26e4a970f3ce5d56464293280b1e01d91ebbeb80)

Author SHA1 Message Date
Pål Jørgensen 42395bcb18 Bumped patchVersion 2014-11-17 09:30:45 +01:00
Frode Petterson cb8db9b35e Merge branch 'background-image-white-background' 2014-11-14 16:15:04 +01:00
Pål Jørgensen f07bd8dfc3 Changing background-color from black to white when using background image 2014-11-14 15:06:07 +01:00
Thomas 46aa455310 Added hiding of check button for Mark The Words 2014-11-12 09:07:08 +01:00
Svein-Tore Griff With cf2ae6d207 Bump patch version 2014-11-02 19:55:59 +01:00
Svein-Tore Griff With 0ee099df25 Merge branch 'master' of github.com:h5p/h5p-question-set 2014-11-01 16:45:51 +01:00
Thomas 1d1d2eef00 Added MarkTheWords as a question option. 2014-11-01 13:43:14 +01:00
Frode Petterson 5a1ca2b517 Merge branch 'api-1.2' 2014-10-31 10:51:40 +01:00
Frode Petterson e0a615b8b3 Merge branch 'api-1.1' 2014-10-31 10:51:38 +01:00
Frode Petterson 1c4da0ac92 Merge branch 'api-1.2' of github.com:h5p/h5p-question-set into api-1.2 2014-10-30 10:36:52 +01:00
falcon e2efc849c9 Shorter function names 2014-10-26 22:14:26 +01:00
Magnus Vik Magnussen 917a2d1499 modified color of progress dots 2014-10-21 15:20:31 +02:00
Magnus Vik Magnussen a4f7bb1b96 modified position of arrow icons on next/prev buttons 2014-10-21 15:10:49 +02:00
Svein-Tore Griff With f491786c47 Added xAPI support 2014-10-13 21:51:36 +02:00
Magnus Vik Magnussen 1ebb38b88b test commit: moved feedback arrow 1px to the right 2014-10-09 14:37:54 +02:00
Frode Petterson a0a94d7b19 Up 2014-10-08 14:55:24 +02:00
Frode Petterson 76f407182f Merge branch 'api-1.2' of github.com:h5p/h5p-question-set into api-1.2 2014-10-08 14:53:57 +02:00
Frode Petterson aa4c1d1035 Moved introduction in semantics. 2014-10-08 14:53:43 +02:00
Pål Jørgensen 8f85d4a5a7 Removed some nn-text from the nb-translation 2014-10-07 11:37:03 +02:00
Frode Petterson 8a71d3689e Merge branch 'api-1.1' into api-1.2 2014-06-27 11:12:53 +02:00
Frode Petterson 1a6cc9b09d Merge branch 'master' into api-1.1 2014-06-27 11:12:42 +02:00
Frode Petterson 76fb66317c Added back text to finish button. 2014-06-27 11:12:31 +02:00
Frode Petterson cdbcc3ad92 Merge branch 'api-1.1' into api-1.2 2014-06-26 16:23:46 +02:00
Frode Petterson 4c5c3ffe86 Merge branch 'master' into api-1.1 2014-06-26 16:23:35 +02:00
Frode Petterson 24f877cc8e Removed text from nav buttons. 2014-06-26 16:23:12 +02:00
Frode Petterson b39df78eeb Merge branch 'api-1.1' into api-1.2 2014-05-23 11:12:51 +02:00
Frode Petterson 529f8405e7 Merge branch 'master' into api-1.1
Conflicts:
	css/questionset.css
	library.json
2014-05-23 11:12:16 +02:00
Frode Petterson 21535779a8 Added FontAwesome 4.1 as a dependency. 2014-05-23 11:09:49 +02:00
Pål Jørgensen 8185483de9 Merge branch 'api-1.1' into api-1.2 2014-05-06 12:21:59 +02:00
Pål Jørgensen 5d9ecfc9a0 Merge branch 'master' into api-1.1 2014-05-06 12:21:46 +02:00
Pål Jørgensen ad2326f0aa Updated language-fileas with translations for intropage background image 2014-05-06 12:21:26 +02:00
Frode Petterson 5ec069dad4 Merge branch 'api-1.1' into api-1.2 2014-04-30 12:20:51 +02:00
Frode Petterson dd52d82dcf Merge branch 'master' into api-1.1 2014-04-30 12:20:33 +02:00
Frode Petterson ada5e81c87 Added support for custom background on intro page. 2014-04-30 12:19:55 +02:00
Pål Jørgensen df90fb8e70 Merge branch 'api-1.1' into api-1.2 2014-04-15 14:48:53 +02:00
Pål Jørgensen 8f7c1b0817 Merge branch 'master' into api-1.1 2014-04-15 14:48:40 +02:00
Pål Jørgensen b6ba0e4c34 Made title text div not beeing rendered if no title set 2014-04-15 14:48:28 +02:00
Pål Jørgensen 0bc40d1ef2 Merge branch 'api-1.1' into api-1.2 2014-04-15 11:33:31 +02:00
Pål Jørgensen 272f8febb1 Merge branch 'master' into api-1.1 2014-04-15 11:33:21 +02:00
Pål Jørgensen 61e62185a6 Made introduction text div not beeing rendered if no intro text set 2014-04-15 11:33:01 +02:00
Pål Jørgensen f3df9e9923 Merge branch 'api-1.1' into api-1.2 2014-04-14 13:33:38 +02:00
Pål Jørgensen cc1b424793 Merge branch 'api-1.2' of github.com:h5p/h5p-question-set into api-1.2 2014-04-14 13:33:30 +02:00
Pål Jørgensen 7207049c2c Merge branch 'master' into api-1.1 2014-04-14 13:33:13 +02:00
Pål Jørgensen 8d58c88657 Updated texts 2014-04-14 13:32:54 +02:00
Pål Jørgensen 1209931228 Merge github.com:h5p/h5p-question-set into api-1.2 2014-04-13 19:03:39 +02:00
Frode Petterson dc2da8b757 Merge branch 'api-1.1' into api-1.2 2014-04-11 15:51:29 +02:00
Frode Petterson 10f9a0b447 Merge branch 'master' into api-1.1 2014-04-11 15:50:48 +02:00
Frode Petterson bc9b787e78 Fixed resize bug when embedded. 2014-04-11 15:50:22 +02:00
Frode Petterson 0dcc4503f9 Added ignore file. 2014-04-10 12:57:55 +02:00
Pål Jørgensen f661237a12 Merge branch 'api-1.1' into api-1.2 2014-04-03 15:08:51 +02:00