Commit Graph

Select branches

Hide Pull Requests

Fix-translations

d3summaryChart

l10n_master

master

metadata

ramdomize

release

revert-11-add-override-of-check-button

revert-29-max_score

set-xapi-data

stable

#1

#10

#11

#12

#13

#13

#14

#15

#16

#18

#19

#19

#2

#20

#21

#21

#22

#23

#26

#27

#29

#3

#30

#31

#32

#33

#34

#34

#35

#36

#37

#38

#39

#4

#4

#40

#41

#42

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#53

#54

#55

#55

#56

#57

#58

#59

#6

#6

#60

#61

#62

#63

#64

#65

#66

#67

#69

#7

#7

#70

#72

#72

#74

#75

#76

#77

#78

#79

#8

#80

#81

#82

#84

#85

#86

#87

#88

#88

#9

1.0.57

1.0.58

1.0.60

1.1.0

1.10.0

1.10.1

1.10.2

1.11.0

1.12.0

1.12.1

1.12.2

1.13.2

1.13.3

1.13.4

1.14.1

1.15.0

1.15.1

1.15.2

1.15.3

1.16.2

1.16.3

1.16.4

1.16.5

1.17.0

1.17.1

1.17.2

1.17.3

1.17.4

1.17.5

1.17.6

1.17.7

1.3.2

1.4.0

1.4.1

1.4.2

1.5.0

1.5.1

1.5.2

1.6.2

1.6.4

1.7.0

1.8.3

1.8.4

1.9.0

release-2016-nov-01

release-2016-nov-16

Mono Color

• fd7399343a Merge branch 'markTheWordsIntegration' into markTheWords Svein-Tore Griff With 2014-11-17 14:13:19 +0100
• 890b479179 Merge tag '1.0.58' into stable Pål Jørgensen 2014-11-17 09:33:19 +0100
• 42395bcb18 Bumped patchVersion 1.0.60 1.0.58 Pål Jørgensen 2014-11-17 09:30:45 +0100
• cb8db9b35e Merge branch 'background-image-white-background' 1.0.57 Frode Petterson 2014-11-14 16:15:04 +0100
• f07bd8dfc3 Changing background-color from black to white when using background image Pål Jørgensen 2014-11-14 15:06:07 +0100
• 46aa455310 Added hiding of check button for Mark The Words Thomas 2014-11-12 09:07:08 +0100
• cf2ae6d207 Bump patch version Svein-Tore Griff With 2014-11-02 19:55:59 +0100
• 0ee099df25 Merge branch 'master' of github.com:h5p/h5p-question-set Svein-Tore Griff With 2014-11-01 16:45:51 +0100
• 1d1d2eef00 Added MarkTheWords as a question option. Thomas 2014-11-01 13:43:14 +0100
• 5a1ca2b517 Merge branch 'api-1.2' Frode Petterson 2014-10-31 10:51:40 +0100
• e0a615b8b3 Merge branch 'api-1.1' Frode Petterson 2014-10-31 10:51:38 +0100
• 1c4da0ac92 Merge branch 'api-1.2' of github.com:h5p/h5p-question-set into api-1.2 Frode Petterson 2014-10-30 10:36:52 +0100
• e2efc849c9 Shorter function names falcon 2014-10-26 22:14:26 +0100
• 917a2d1499 modified color of progress dots Magnus Vik Magnussen 2014-10-21 15:20:31 +0200
• a4f7bb1b96 modified position of arrow icons on next/prev buttons Magnus Vik Magnussen 2014-10-21 15:10:49 +0200
• f491786c47 Added xAPI support Svein-Tore Griff With 2014-10-13 21:51:36 +0200
• 1ebb38b88b test commit: moved feedback arrow 1px to the right Magnus Vik Magnussen 2014-10-09 14:37:54 +0200
• a0a94d7b19 Up Frode Petterson 2014-10-08 14:55:24 +0200
• 76f407182f Merge branch 'api-1.2' of github.com:h5p/h5p-question-set into api-1.2 Frode Petterson 2014-10-08 14:53:57 +0200
• aa4c1d1035 Moved introduction in semantics. Frode Petterson 2014-10-08 14:53:43 +0200
• 8f85d4a5a7 Removed some nn-text from the nb-translation Pål Jørgensen 2014-10-07 11:37:03 +0200
• 8a71d3689e Merge branch 'api-1.1' into api-1.2 Frode Petterson 2014-06-27 11:12:53 +0200
• 1a6cc9b09d Merge branch 'master' into api-1.1 Frode Petterson 2014-06-27 11:12:42 +0200
• 76fb66317c Added back text to finish button. Frode Petterson 2014-06-27 11:12:31 +0200
• cdbcc3ad92 Merge branch 'api-1.1' into api-1.2 Frode Petterson 2014-06-26 16:23:46 +0200
• 4c5c3ffe86 Merge branch 'master' into api-1.1 Frode Petterson 2014-06-26 16:23:35 +0200
• 24f877cc8e Removed text from nav buttons. Frode Petterson 2014-06-26 16:23:12 +0200
• b39df78eeb Merge branch 'api-1.1' into api-1.2 Frode Petterson 2014-05-23 11:12:30 +0200
• 529f8405e7 Merge branch 'master' into api-1.1 Frode Petterson 2014-05-23 11:12:16 +0200
• 21535779a8 Added FontAwesome 4.1 as a dependency. Frode Petterson 2014-05-23 11:09:49 +0200
• 8185483de9 Merge branch 'api-1.1' into api-1.2 Pål Jørgensen 2014-05-06 12:21:59 +0200
• 5d9ecfc9a0 Merge branch 'master' into api-1.1 Pål Jørgensen 2014-05-06 12:21:46 +0200
• ad2326f0aa Updated language-fileas with translations for intropage background image Pål Jørgensen 2014-05-06 12:21:26 +0200
• 5ec069dad4 Merge branch 'api-1.1' into api-1.2 Frode Petterson 2014-04-30 12:20:44 +0200
• dd52d82dcf Merge branch 'master' into api-1.1 Frode Petterson 2014-04-30 12:20:24 +0200
• ada5e81c87 Added support for custom background on intro page. Frode Petterson 2014-04-30 12:19:55 +0200
• df90fb8e70 Merge branch 'api-1.1' into api-1.2 Pål Jørgensen 2014-04-15 14:48:53 +0200
• 8f7c1b0817 Merge branch 'master' into api-1.1 Pål Jørgensen 2014-04-15 14:48:40 +0200
• b6ba0e4c34 Made title text div not beeing rendered if no title set Pål Jørgensen 2014-04-15 14:48:28 +0200
• 0bc40d1ef2 Merge branch 'api-1.1' into api-1.2 Pål Jørgensen 2014-04-15 11:33:31 +0200
• 272f8febb1 Merge branch 'master' into api-1.1 Pål Jørgensen 2014-04-15 11:33:21 +0200
• 61e62185a6 Made introduction text div not beeing rendered if no intro text set Pål Jørgensen 2014-04-15 11:33:01 +0200
• f3df9e9923 Merge branch 'api-1.1' into api-1.2 Pål Jørgensen 2014-04-14 13:33:38 +0200
• cc1b424793 Merge branch 'api-1.2' of github.com:h5p/h5p-question-set into api-1.2 Pål Jørgensen 2014-04-14 13:33:30 +0200
• 7207049c2c Merge branch 'master' into api-1.1 Pål Jørgensen 2014-04-14 13:33:13 +0200
• 8d58c88657 Updated texts Pål Jørgensen 2014-04-14 13:32:54 +0200
• 1209931228 Merge github.com:h5p/h5p-question-set into api-1.2 Pål Jørgensen 2014-04-13 19:03:39 +0200
• dc2da8b757 Merge branch 'api-1.1' into api-1.2 Frode Petterson 2014-04-11 15:51:29 +0200
• 10f9a0b447 Merge branch 'master' into api-1.1 Frode Petterson 2014-04-11 15:50:48 +0200
• bc9b787e78 Fixed resize bug when embedded. Frode Petterson 2014-04-11 15:50:22 +0200
• 0dcc4503f9 Added ignore file. Frode Petterson 2014-04-10 12:57:55 +0200
• f661237a12 Merge branch 'api-1.1' into api-1.2 Pål Jørgensen 2014-04-03 15:08:51 +0200
• 94f1a9017e Merge branch 'master' into api-1.1 Pål Jørgensen 2014-04-03 15:08:08 +0200
• ae8af678a2 Made rounded corners for background (title/description on intro page) Pål Jørgensen 2014-04-03 15:07:50 +0200
• 282e9e77e4 Merge branch 'api-1.1' into api-1.2 Pål Jørgensen 2014-04-03 10:21:02 +0200
• ce5d97b485 Merge branch 'master' into api-1.1 Pål Jørgensen 2014-04-03 10:20:35 +0200
• 9179f6209a Added transparent background-color to title and description fields on intro-page Pål Jørgensen 2014-04-03 10:19:47 +0200
• 6f13435445 Merge branch 'api-1.1' into api-1.2 Pål Jørgensen 2014-04-02 15:35:13 +0200
• e9835fd587 Merge branch 'master' into api-1.1 Pål Jørgensen 2014-04-02 15:34:55 +0200
• ef5670c5c4 Bumped patch version Pål Jørgensen 2014-04-02 15:33:43 +0200
• b289d25949 Merge branch 'api-1.1' into api-1.2 Pål Jørgensen 2014-04-02 15:17:45 +0200
• 8f62a51fe5 Merge branch 'master' into api-1.1 Pål Jørgensen 2014-04-02 15:17:25 +0200
• 31ddbd8379 Made getCopyrights work with empty optional fields Pål Jørgensen 2014-04-02 00:10:30 +0200
• b8a07e4996 Removed left overs from merge. Frode Petterson 2014-03-28 17:06:59 +0100
• e2fd4e2ba4 Merged new repo into old sub module. Frode Petterson 2014-03-28 17:05:08 +0100
• bd67306b96 Merge branch 'master' into api-1.2 Frode Petterson 2014-03-26 15:59:15 +0100
• 8088b40bab Merge branch 'api-1.0' Frode Petterson 2014-03-26 15:58:48 +0100
• 1c749e63ec Added README files. Frode Petterson 2014-03-26 15:56:54 +0100
• 5e31bb138f Merge branch 'master' into api-1.2 Frode Petterson 2014-03-23 01:34:26 +0100
• 4c777b3397 Merge branch 'api-1.0' Frode Petterson 2014-03-23 01:34:13 +0100
• 7eca1c8c0b HFJ-256: Added missing copyrights to boardgame. Frode Petterson 2014-03-23 01:27:49 +0100
• aa5387feef HFJ-256: Added missing copyrights to boardgame. Frode Petterson 2014-03-23 01:27:49 +0100
• 0f8892d697 Merge branch 'api-1.2' of b.amendor.com:h5p into api-1.2 Pål Jørgensen 2014-03-21 13:50:44 +0100
• 8b50061e01 Fixed resizing in embed-iframe Pål Jørgensen 2014-03-21 13:49:38 +0100
• 2d95ac1d7a Merge branch 'master' into api-1.2 Frode Petterson 2014-03-21 12:26:58 +0100
• 4171fd0327 Merge branch 'api-1.0' Frode Petterson 2014-03-21 12:23:23 +0100
• 6c9634eae7 HFJ-187: Fixed copyrights for boardgame and libraries used there. Frode Petterson 2014-03-21 09:37:39 +0100
• 36237099d6 HFJ-188: Fixed libraries resize support. Frode Petterson 2014-03-19 10:13:37 +0100
• 856f0e8412 HFJ-179: Fixed usage of api-1.1 Frode Petterson 2014-03-19 09:26:33 +0100
• 128db363c8 Merge branch 'api-1.0' Frode Petterson 2014-03-13 11:00:10 +0100
• 06b0ecaa20 HFJ-170: Removed question padding. Removed unused outdated content example. Frode Petterson 2014-02-26 10:59:53 +0100
• 9e5e3b4e89 HFJ-170: Removed question padding. Removed unused outdated content example. Frode Petterson 2014-02-26 10:59:53 +0100
• eb7ccdd523 HFJ-179: Prepared for new API version. Using new resize events, removed some deprecated stuff. Fixed a bug in CP editor. Frode Petterson 2014-02-24 16:26:07 +0100
• bf3f3d0518 Fix a bug so that result heading in questionset translateable Svein-Tore Griff With 2014-01-15 20:35:48 +0100
• 7044c644bf Remove white fader on the intro page of the questionsets. This was requested by ndla Svein-Tore Griff With 2013-12-09 10:13:17 +0100
• 8d3c5032de Upped patch version. Frode Petterson 2013-12-02 13:19:40 +0100
• c678f5bbde HFJ-45 Done minor changes to various css files when working on the editor. -Changed background on intro text and question in Question Set. -Changed some minor css in interactive video editor -Improved vertical tabs (replaced image arrow with css arrow and change bitmap icons to Font Awesome icons) Magnus Vik Magnussen 2013-11-28 13:23:09 +0100
• d5e7207e5b HFJ-50: Use border-box to keep padding within size. Frank Ronny Larsen 2013-11-20 10:58:00 +0100
• 0f371320f7 HFJ-1: Fixed emoticon positioning on QS endGame Frank Ronny Larsen 2013-11-08 13:56:58 +0100
• 84c9e73b30 HFJ-1: Style tweaks Frank Ronny Larsen 2013-11-08 11:42:08 +0100
• 9cc9250451 HFJ-1: Changed default score string. Also make score string editable and translatable Frank Ronny Larsen 2013-11-08 10:25:49 +0100
• cc02101416 Patch levels increased for libs committed lately Frank Ronny Larsen 2013-11-08 10:00:57 +0100
• 0f5bdbade5 BFB-3: Merged more lost code in QuestionSet and MultiChoice Frank Ronny Larsen 2013-11-07 14:32:38 +0100
• a33f7f1363 BFB-1: Fixed IcoMoon family names Frank Ronny Larsen 2013-11-07 13:39:27 +0100
• f4d1fde0e8 HFJ-1: Re-added postUserStatistics stuff lost in QuestionSet Frank Ronny Larsen 2013-11-07 11:43:52 +0100
• 334d36f692 Merge branch 'master' of b.amendor.com:h5p Frank Ronny Larsen 2013-11-07 10:31:29 +0100
• 711e55c42e HFJ-1,2,3,4: Fixed FontAwesome dependencies Frank Ronny Larsen 2013-11-06 11:48:36 +0100
• 2fe311acda Patch up. Frode Petterson 2013-11-06 09:16:43 +0100
• 2c26b7692d HFJ-1 Design update to questions set completed. No changes made to dragNdrop so far. Magnus Vik Magnussen 2013-10-31 13:39:51 +0100
• e766e50b7b Remove vertical tabs from questionset, ref http://bug.ndla.no/browse/TGP-5585 Svein-Tore Griff With 2013-10-15 15:39:17 +0200