lp:~c11emian/lenasys/1172226

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:lenasys at revision 111

Gustav Hartvigsson: Approve on 2013-05-28

Diff: 15 lines (+5/-0)

1 file modified

codeigniter/application/controllers/codeviewer.php (+5/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1172226: CodeViewer link is broken

Undecided

Fix Committed

Link a bug report

Related blueprints

110. By Emil Andersson on 2013-05-28

Temporarily redirects the user to the startpage

109. By Gustav Hartvigsson on 2013-05-28

merged Jonsson:s changes:

Fixed so the bannermenu is scrollable horizontally but not vertically.
Fixed the layout between bannermenu, sidemenu and cmscontent so it doesn't overlap each.

108. By Gustav Hartvigsson on 2013-05-28

Merged Bigestans:s changes:

* Started work on the viewStudents functionality... So far, displaying users works and it outputs correct and standardized html.
* Still plenty to do though.

107. By Gustav Hartvigsson on 2013-05-27

Merged Bigestanas:s changes:
* Merged trunk
* Added new files relating to login functionality
* Added login and logout functions to start controller

106. By Gustav Hartvigsson on 2013-05-27

merged Ohlson:s changes:
Cleaned and perfected the template layout view.
edited the body.css to make sure that the content end up at the correct position.

105. By Gustav Hartvigsson on 2013-05-26

merged Jonsson:s branch:

    Updated branch.

    Updated getActiveCourse in user-model, and fixed so bannermenu- and cms-view uses it.
    Removed links from bannermenu-view.
    Fixed so cms is loaded in home-controller when user is logged in.
    Added function for expand collapse courses in bannermenu-view.

    Removed coursemenu and statsmenu and replaced it with new combined sidemenu.

104. By Gustav Hartvigsson on 2013-05-26

Merged Jonsson:s branch:

    Updated branch.

    Updated getActiveCourse in user-model, and fixed so bannermenu- and cms-view uses it.
    Removed links from bannermenu-view.
    Fixed so cms is loaded in home-controller when user is logged in.
    Added function for expand collapse courses in bannermenu-view.

103. By Gustav Hartvigsson on 2013-05-24

Merged Jonsson:s changes so you can display the login box.

102. By Gustav Hartvigsson on 2013-05-24

Merged Elofs stuffs

    * Finalized normalization of popups. All popups now have common CSS and HTML structure.

101. By Gustav Hartvigsson on 2013-05-24

Some fixes.... Woops!