lp://staging/~sruegamer/dc2/01-chrome-options-branch

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/~leonov-gtk/dc2/trunk at revision 75

Stephan Rügamer: Approve on 2011-01-10

Diff: 99 lines (+44/-5)

4 files modified

dc2-chromium-extention/dc2-frontend/options.html (+35/-0)
dc2-chromium-extention/manifest.json.template (+2/-1)
dc2-frontend-qooxdoo/config.json (+1/-2)
dc2-frontend-qooxdoo/source/class/fai/Application.js (+6/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

75. By Stephan Rügamer on 2010-12-15

Chrome Extension option support (starting)
added:
  dc2-chromium-extention/dc2-frontend/options.html
modified:
  dc2-chromium-extention/manifest.json.template
  dc2-frontend-qooxdoo/config.json
  dc2-frontend-qooxdoo/source/class/fai/Application.js

74. By Stephan Rügamer on 2010-12-14

merged lp:~shermann/dc2/03-new-logo-branch

modified:
  dc2-chromium-extention/dc2-frontend/icon.png
  Stephan Hermann 2010-12-14 Added dc2-logo as icon for chromium extension

73. By Stephan Rügamer on 2010-12-13

Merged lp:~shermann/dc2/01-dc2-template-branch

72. By Stephan Rügamer on 2010-12-09

merged lp:~shermann/dc2/01-tftpd--branch

71. By Stephan Rügamer on 2010-12-09

merged lp:~shermann/dc2/01-dc2-lib-branch

70. By Stephan Rügamer on 2010-12-09

Merged lp:~shermann/dc2/02-new-logo-branch

69. By Stephan Rügamer on 2010-12-09

Merged lp:~shermann/dc2/01-new-logo-branch

68. By Stephan Rügamer on 2010-12-09

Merged lp:~shermann/dc2/02-puppet-recipe-branch

67. By Stephan Rügamer on 2010-12-09

Merged ~shermann/dc2/01-puppet-recipe-branch

66. By Stephan Rügamer on 2010-12-08

Adding new template administration functionality