lp:~c11emian/lenasys/c11emian_branch

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~imp2/lenasys/teamBranch at revision 23

Fagballs: Approve on 2013-04-10

Diff: 828 lines (+249/-260)

6 files modified

DuggaSys/quizAjax/answerQuiz.php (+38/-36)
DuggaSys/quizAjax/checkStudentCourseOccasion.php (+6/-10)
DuggaSys/quizAjax/getQuiz.php (+147/-151)
DuggaSys/quizAjax/getQuizObject.php (+17/-22)
DuggaSys/quizAjax/getStudentCourseRegistrations.php (+8/-9)
DuggaSys/quizSystem/answerQuiz.php (+33/-32)

api

Merged into lp:~imp2/lenasys/hitlerhorabajs at revision 9

Fagballs: Needs Fixing on 2013-03-28

Diff: 444 lines (+214/-188)

1 file modified

trunk/Code Tokenizer and Parser/Parser_Test.js (+214/-188)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1163742: File that doesn't follow the code standard.	Undecided	Fix Released
Bug #1164550: Code Tokenizer and Parser/Parser_Test.js - Not calling on the function correctly	Undecided	Fix Released
Bug #1164571: Code Tokenizer and Parser/Parser_Test.html - HTML body onload must be changed	Undecided	Fix Released
Bug #1166156: Incorrect type of commenting	Undecided	Fix Released

Link a bug report

Related blueprints

23. By Emil Andersson on 2013-04-10

Fixed bug #1166156 by changing the format of the comments.

22. By mattman-03 on 2013-04-09

wikxen merged

21. By Gustav Hartvigsson on 2013-04-08

Note to self: "bzr resolve --all" works like magic.
Merged implementation group 1's branch.
20130408.

20. By Gustav Hartvigsson on 2013-04-05

Merged from implementation group 1's team branch into trunk, 20130405 end of
day.

19. By Gustav Hartvigsson on 2013-04-04

Removed two DS_Store files.

18. By Gustav Hartvigsson on 2013-04-04

Readded the file that Adam Ringhede removed.

17. By Gustav Hartvigsson on 2013-04-04

Merging with implementation group 2's branch, containts an error,
will be fixed. (hopefully).

16. By Gustav Hartvigsson on 2013-04-04

Merged implementation group 2's team branch into trunk, at end-of-day 20130404.

15. By Gustav Hartvigsson <email address hidden> on 2013-04-04

merged Wikxens stuff to use localhost db, and user.

14. By Gustav Hartvigsson <email address hidden> on 2013-04-04

Merged Wikxen:s fixes for DuggaSys SQL.