/lenasys/trunk

(root)/lenasys/trunk » Changes to codeigniter/application/models/user.php from revision 137

From Revision 137

expand all

collapse all

Rev		Summary	Authors	Date	Diff	Files
128		Merged Ohlssons changes: Merged Ohlssons changes: added function to get ssn and name for the registrationspages in the user model. added the registrationpage for students. edited the registration page for instructors edited the css for both the registrationpages	Gustav Hatvigsson	12 years ago
113		Merged Bigestans:s changes: 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	Gustav Hatvigsson	12 years ago
104		Merged Jonsson:s branch: 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.	Gustav Hartvigsson	12 years ago
97		Merged Ohlson:s changes. Merged Ohlson:s changes.	Gustav Hatvigsson	12 years ago
70		Merged some changes to the AJAX controller. Merged some changes to the AJAX controller.	Gustav Hatvigsson	12 years ago
69		Merged the addition of the Ladok user data parser. Merged the addition of the Ladok user data parser.	Gustav Hatvigsson	12 years ago
65		Mered lots of changes to many files. Mered lots of changes to many files. Hopefully this will work :-)	Gustav Hatvigsson	12 years ago
63		Merged some changes for the logging of user activity. Merged some changes for the logging of user activity. And added a parser for Ladok user data.	Gustav Hatvigsson	12 years ago
54		merded the new salting stuff for the user passwords and stuf... merded the new salting stuff for the user passwords and stuff...	Gustav Hatvigsson	12 years ago
53		Merged the changes from the implementation team: - Added exa... Merged the changes from the implementation team: - Added examplespage. - Added functions to header. - Added interactions with database. - Added ajax controller for user settings. - Logged in page updated with links. - Added template layout controller. and so forth General changes in Codeigniter.	Gustav Hatvigsson	12 years ago
39		merge. merge.	Gustav Hatvigsson	12 years ago