lp:~elof-bigestans/lenasys/elofsbranch

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~lenasysimpl1/lenasys/GammaBear at revision 21

Victor Nagy: Approve on 2013-04-05

Diff: 142006 lines api

Rejected for merging into lp:lenasys

lenasysmaint: Pending requested 2013-04-05

Diff: 1900 lines (+634/-1224)

5 files modified

CodeViewer/Lindex.html (+11/-11)
ErModeller/canvas.css (+13/-3)
ErModeller/canvas.js (+609/-601)
ErModeller/canvas_ER_demo_duggajs.html (+1/-1)
ErModeller/dugga.js (+0/-608)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1164306: CSS errors in showcode.css	Undecided	Fix Committed
Bug #1164500: Missing css in Codeviewer.	Undecided	Fix Committed
Bug #1164524: Codeviewer/Lindex.html - links to examples are broken	Undecided	Fix Committed
Bug #1164530: ErModeller/canvas.css - formatting isn't following code standard	Undecided	Fix Committed
Bug #1164535: ErModeller/canvas.js - Indentation isn't following code standard	Undecided	Fix Committed
Bug #1164537: ErModeller/canvas.js - Comments aren't following code standards	Undecided	Fix Committed
Bug #1164542: ErModeller/canvas.js - isn't following code standards	Undecided	Fix Committed

Link a bug report

Related blueprints

24. By Elof Bigestans <email address hidden> on 2013-04-05

* Fixed minor PHP syntax error

23. By Elof Bigestans <email address hidden> on 2013-04-05

Fixed some minor validation errors

22. By Elof Bigestans <email address hidden> on 2013-04-05

* Fixed bug #1164500
* Cleaned up HTML in Lindex.html

21. By Elof Bigestans <email address hidden> on 2013-04-05

 * Fixed bug #1164524 (in LIndex.html)

20. By Elof Bigestans <email address hidden> on 2013-04-05

 * Fixed bugs #1164530, #1164535, #1164537 and #1164542
 * Indentation, comment standards, etc.

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.