lp:~c11emian/lenasys/1171772

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:lenasys at revision 116

lenasysmaint: Pending requested 2013-05-28

Diff: 59 lines (+24/-26)

1 file modified

codeigniter/application/controllers/codeviewer.php (+24/-26)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1171772: controllers/codeviewer.php - Show-method does not handle calls with no arguments

Undecided

Fix Committed

Link a bug report

Related blueprints

116. By Emil Andersson on 2013-05-28

#1171772

115. By Gustav Hartvigsson on 2013-05-28

Merged Ohlson:s changes:

corrected a wrong in the css file

114. By Gustav Hartvigsson on 2013-05-28

Merged Andersson:s changes:
Added the functions getPublicCourses(), getPrivateCourses() and getStudentCourses().
* getPublicCourses() returns all the public courses.
* getPrivateCourses() returns the private and published courses a student is registred to.
* getStudentCourses() returns both public and private courses for a student.

113. By Gustav Hartvigsson on 2013-05-28

Merged Bigestans:s changes:
* Merged trunk AND
* Modified js/login.js and js/bannermenu.js, specifically functions related to the login popup!
Continuing work on viewstudents

112. By Gustav Hartvigsson on 2013-05-28

Merged Ohlson:s changes:

managed the manage courses view to better fit in controller view

111. By Gustav Hartvigsson on 2013-05-28

Merged Andesson:s changes:

Temporarily redirects the user to the startpage

110. By Gustav Hartvigsson on 2013-05-28

Merged Jonsson:s changes:

Changed so that cms-controller loads filetree (before known as examplesController, examplesBody, examplesMenu).
Also changed to describing filenames and names for attributes and functions in css, php-view and in model that is used for this.
Started working on cmsindex-view and -css.

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