lp:~gustav-hartvigsson/lenasys/bug1176808

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:lenasys at revision 56

Erik Wikström (community): Approve on 2013-05-07

Diff: 66 lines (+8/-8)

1 file modified

codeigniter/application/models/admin/admin_model.php (+8/-8)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1176808: Cannot access admin panel at /codeigniter/admin

Critical

Fix Committed

Link a bug report

Related blueprints

57. By Gustav Hartvigsson on 2013-05-07

fixed some more things.

56. By Gustav Hartvigsson on 2013-05-07

fixed bug bug #1176808
Admin panel should new work.

55. By Gustav Hartvigsson on 2013-05-07

merge

54. By Gustav Hartvigsson on 2013-05-07

merded the new salting stuff for the user passwords and stuff...

53. By Gustav Hartvigsson on 2013-05-03

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.

52. By Gustav Hartvigsson on 2013-05-02

Merged the changes to the categories.

51. By Gustav Hartvigsson on 2013-04-24

merge db changes... \n Contain criss-cross, but should work....

50. By Gustav Hartvigsson on 2013-04-24

Mergin moaaaaaar DB changes

49. By Gustav Hartvigsson on 2013-04-24

Merged moar DB changes.

48. By Gustav Hartvigsson on 2013-04-23

merged DB changes