lp:~b11johgu/lenasys/demo

Branch merges

Propose for merging

No branches dependent on this one.

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

29. By Johan Gustavsson on 2013-04-15

test-fil för demox

28. By Gustav Hartvigsson on 2013-04-12

fixed an error in the header proposed header...

27. By Gustav Hartvigsson on 2013-04-12

Added the logo, may be replaced in future

26. By Gustav Hartvigsson on 2013-04-12

added:
* COPYING - licensing information
* COPYRIGHT_HEADER - the header that should be in every file related to
  the project.
* README - Information about the project.
* lgpl-3.0 - The license that is used by this project.

25. By Gustav Hartvigsson on 2013-04-12

Merging implementation group one's team bnanch in to trunk.
This is also end of this cycle.

Good work guys.

20130412.

24. By Gustav Hartvigsson on 2013-04-11

commited implementation group one's team branch.
20130411.

Merge proposal comment:
Removed codeigniter user guide, shouldn't be in the repo
Added and implemented CKEditor Wysiwyg editor for editing of pages
Made already uploaded code files visible as you edit a page
Implemented Adams dropdown menu in codeviewer.

23. By Gustav Hartvigsson on 2013-04-11

merged in implemetaion group one's team bransh, it contains code-ignighter
and the new admin-panel.
20130411

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

Merged implementation group2:s team branch.
20130409.

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.