lp:~lenasysimpl1/lenasys/GammaBear
Created by
Patrik Fransson
and last modified
- Get this branch:
- bzr branch lp:~lenasysimpl1/lenasys/GammaBear
Members of
GammaBjörn
can upload to this branch. Log in for directions.
Branch merges
Propose for merging
No branches
dependent on this one.
- Gustav Hartvigsson: Approve
-
Diff: 1309 lines (+512/-403)18 files modifiedDuggaSys/duggor/Dugga 3 Datorgrafik - Transformationer/johan_dugga_datorgrafik_1_transforms.js (+235/-0)
DuggaSys/duggor/Dugga 3 Datorgrafik - Transformationer/johan_dugga_datorgrafik_1_transforms.php (+2/-243)
Widget Library/sliderdemo.html (+2/-12)
Widget Library/sliders.css (+2/-0)
Widget Library/sliders.js (+44/-23)
codeigniter/application/controllers/admin.php (+11/-11)
codeigniter/application/controllers/codeviewer.php (+18/-6)
codeigniter/application/models/admin/admin_model.php (+89/-23)
codeigniter/application/models/codeviewer/codeviewer_model.php (+45/-50)
codeigniter/application/views/admin/add_example.php (+2/-0)
codeigniter/application/views/admin/add_page.php (+0/-2)
codeigniter/application/views/admin/index.php (+3/-3)
codeigniter/application/views/admin/manage_course.php (+3/-3)
codeigniter/application/views/admin/manage_example.php (+2/-2)
codeigniter/application/views/admin/manage_page.php (+13/-14)
codeigniter/application/views/codeviewer/codeviewer.php (+19/-0)
codeigniter/css/adminstyle.css (+4/-0)
codeigniter/js/script.js (+18/-11)
Related source package recipes
Branch information
Recent revisions
- 26. By Victor Nagy
-
Adams bugfixes
-
Merged branch
lp:~adamringhede/lenasys/branch
- Bug #1163893: Multiple <body> tags in CodeViewer output
- Bug #1163939: Codeviewer alt layout bug: Zooming
- Bug #1164464: Code Viewer Alt - Rounded corners and drop shadow
- Bug #1164541: Widget Library/sliders.css - CSS not working in IE7
- Bug #1164908: Code Viewer Alt/index.html - Split link and no margin
- Bug #1166155: DuggaSys\duggor\Dugga 3 Datorgrafik - Transformationer\johan_dugga_datorgrafik_1_transforms.php - Swedish comments
- 24. By Victor Nagy
-
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 - 23. By Gustav Hartvigsson
-
merged in implemetaion group one's team bransh, it contains code-ignighter
and the new admin-panel.
20130411 - 22. By Gustav Hartvigsson <email address hidden>
-
Merged implementation group2:s team branch.
20130409. -
Merged branch
lp:~adamringhede/lenasys/branch
- Bug #1163893: Multiple <body> tags in CodeViewer output
- Bug #1163939: Codeviewer alt layout bug: Zooming
- Bug #1164464: Code Viewer Alt - Rounded corners and drop shadow
- Bug #1164541: Widget Library/sliders.css - CSS not working in IE7
- Bug #1164908: Code Viewer Alt/index.html - Split link and no margin
- Bug #1166155: DuggaSys\duggor\Dugga 3 Datorgrafik - Transformationer\johan_dugga_datorgrafik_1_transforms.php - Swedish comments
- 21. By Gustav Hartvigsson
-
Note to self: "bzr resolve --all" works like magic.
Merged implementation group 1's branch.
20130408. -
Merged branch
lp:~elof-bigestans/lenasys/elofsbranch
- Bug #1164306: CSS errors in showcode.css
- Bug #1164500: Missing css in Codeviewer.
- Bug #1164524: Codeviewer/Lindex.html - links to examples are broken
- Bug #1164530: ErModeller/canvas.css - formatting isn't following code standard
- Bug #1164535: ErModeller/canvas.js - Indentation isn't following code standard
- Bug #1164537: ErModeller/canvas.js - Comments aren't following code standards
- Bug #1164542: ErModeller/canvas.js - isn't following code standards
- 20. By Gustav Hartvigsson
-
Merged from implementation group 1's team branch into trunk, 20130405 end of
day.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:~henrik-gustavsson/lenasys/trunk
