lp:~guiona/bilboplanet/669551

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~greg-theclimber/bilboplanet/testing at revision 154

Gregoire de Hemptinne: Pending requested 2010-12-20

Diff: 1146 lines (+322/-126) (has conflicts)

21 files modified

admin/api/manage-account_api.php (+5/-8)
admin/api/manage-feed_api.php (+10/-9)
admin/api/manage-moderation_api.php (+7/-5)
admin/api/manage-option_api.php (+10/-13)
admin/api/manage-permissions_api.php (+6/-6)
admin/api/manage-site_api.php (+10/-10)
admin/api/manage-user_api.php (+13/-11)
admin/manage-cache.php (+8/-1)
admin/manage-feed.php (+1/-1)
admin/manage-newsletter.php (+20/-10)
admin/manage-post.php (+10/-1)
admin/manage-useroption.php (+34/-13)
admin/meta/css/styles.css (+57/-0)
admin/meta/js/jquery.bilboplanet.js (+31/-1)
admin/meta/js/jquery.bilboplanet.min.js (+1/-1)
admin/meta/js/manage-account.js (+2/-1)
admin/meta/js/manage-feed.js (+39/-12)
admin/meta/js/manage-moderation.js (+4/-2)
admin/meta/js/manage-option.js (+1/-1)
admin/meta/js/manage-permissions.js (+6/-3)
admin/meta/js/manage-user.js (+47/-17)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #669551: Theme Aragorn - Problème avec les votes

Undecided

Fix Committed

Link a bug report

Related blueprints

124. By Guiona on 2010-12-13

manage-account_api.php

123. By Guiona on 2010-11-22

Debut popup js

122. By Gregoire de Hemptinne on 2010-11-08

Correction bug simplepie

121. By Gregoire de Hemptinne on 2010-11-08

Correction theme gandalf

120. By Gregoire de Hemptinne on 2010-11-08

Support des balises <code> dans la page d'inscription

119. By Gregoire de Hemptinne on 2010-10-30

Gestion de l'echapement des caracteres a l'install

118. By Gregoire de Hemptinne on 2010-10-29

Updating translations

117. By Gregoire de Hemptinne on 2010-10-29

Updating aragorn theme with the right tpl

116. By Gregoire de Hemptinne on 2010-10-29

Adding window title in all public pages

115. By Gregoire de Hemptinne on 2010-10-29

Typo fix