/lenasys/trunk

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

From Revision 137

expand all

collapse all

Rev		Summary	Authors	Date	Diff	Files
124		merged Bigestans:s changes. merged  Bigestans:s changes. * Moved login JS to bannermenu.js and removed login.js * Removed deprecated login CSS and JS * Fixed login functionality -- now shows validation errors directly in the login popup, works through ajax * Added a nifty little icon to represent the disabled login hint button * Removed temporary functions from cms controller: tempLogin(), tempLogout(), test() * Cleaned up ajax.php and cms.php	Gustav Hatvigsson	12 years ago
114		Merged Andersson:s changes: 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.	Gustav Hatvigsson	12 years ago
97		Merged Ohlson:s changes. Merged Ohlson:s changes.	Gustav Hatvigsson	12 years ago
94		Merged Bigestans's changes to the manage coureses stuff usin... Merged Bigestans's changes to the manage coureses stuff using JS+JQuery and AJAX...	Gustav Hatvigsson	12 years ago
86		Merges Ohlson:s changes so that the admin model now sorts by... Merges Ohlson:s changes so that the admin model now sorts by course name.	Gustav Hatvigsson	12 years ago
80		merged changes to the admin model and controller from Chelwi... merged changes to the admin model and controller from Chelwing.	Gustav Hatvigsson	12 years ago
71		Merded the changes to the Admin panel so it now is how it ch... Merded the changes to the Admin panel so it now is how it chould be.	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
56		merged the changes to the admin panel so it now works. merged the changes to the admin panel so it now works. :-)	Gustav Hartvigsson	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
52		Merged the changes to the categories. Merged the changes to the categories.	Gustav Hatvigsson	12 years ago
36		merged some fixes to some names. merged some fixes to some names.	Gustav Hatvigsson	12 years ago
25		Merging implementation group one's team bnanch in to trunk. Merging implementation group one's team bnanch in to trunk. This is also end of this cycle. Good work guys. 20130412.	Gustav Hartvigsson	12 years ago
24		commited implementation group one's team branch. 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.	Gustav Hartvigsson	12 years ago
23		merged in implemetaion group one's team bransh, it contains ... merged in implemetaion group one's team bransh, it contains code-ignighter and the new admin-panel. 20130411	Gustav Hatvigsson	12 years ago