opensourceprojects.eu / osp-allura / Commit [69d856]

Commit [69d856] master History

Merge branch 'master' of ssh://engr.geek.net/forge

Authored by: Jenny Steele 2010-02-12

Browse code at this revision

Parent(s): [3070cf][67e9ca]

Child(ren): [30ac1a]

added	pyforge/demo.ini
changed	ForgeForum/forgeforum/static/ForgeForum/js/comments.js
changed	ForgeSCM/forgescm/static/Repository/js/comments.js
changed	ForgeTracker/forgetracker/static/Tickets/js/comments.js
changed	ForgeTracker/forgetracker/templates/lib.html
changed	ForgeTracker/forgetracker/tracker_main.py
changed	ForgeWiki/forgewiki/templates/lib.html
changed	ForgeWiki/forgewiki/wiki_main.py
changed	HelloForge/helloforge/static/hello_forge/js/comments.js
changed	pyforge/pyforge/controllers/oembed.py
changed	pyforge/pyforge/controllers/project.py
changed	pyforge/pyforge/pastetemplates/forgeapp/+package+/static/+plugin_name+/js/comments.js
changed	pyforge/pyforge/templates/lib.html
changed	pyforge/pyforge/templates/master.html
changed	schema.xml
changed	ForgeTracker/forgetracker/model/ticket.py
changed	ForgeTracker/forgetracker/templates/edit_ticket.html
changed	ForgeTracker/forgetracker/tests/functional/test_root.py
changed	ForgeTracker/forgetracker/tracker_main.py
changed	pyforge/pyforge/model/artifact.py
changed	pyforge/pyforge/templates/lib.html
copied	pyforge/pyforge/templates/oembed/html.html -> pyforge/pyforge/templates/oembed/html_tpl.html

pyforge/demo.ini Diff Switch to side-by-side view

ForgeForum/forgeforum/static/ForgeForum/js/comments.js Diff Switch to side-by-side view

ForgeSCM/forgescm/static/Repository/js/comments.js Diff Switch to side-by-side view

ForgeTracker/forgetracker/static/Tickets/js/comments.js Diff Switch to side-by-side view

ForgeTracker/forgetracker/templates/lib.html Diff Switch to side-by-side view

ForgeTracker/forgetracker/tracker_main.py Diff Switch to side-by-side view

ForgeWiki/forgewiki/templates/lib.html Diff Switch to side-by-side view

ForgeWiki/forgewiki/wiki_main.py Diff Switch to side-by-side view

HelloForge/helloforge/static/hello_forge/js/comments.js Diff Switch to side-by-side view

pyforge/pyforge/controllers/oembed.py Diff Switch to side-by-side view

pyforge/pyforge/controllers/project.py Diff Switch to side-by-side view

pyforge/pyforge/pastetemplates/forgeapp/+package+/static/+plugin_name+/js/comments.js Diff Switch to side-by-side view

pyforge/pyforge/templates/lib.html Diff Switch to side-by-side view

pyforge/pyforge/templates/master.html Diff Switch to side-by-side view

schema.xml Diff Switch to side-by-side view

ForgeTracker/forgetracker/model/ticket.py Diff Switch to side-by-side view

ForgeTracker/forgetracker/templates/edit_ticket.html Diff Switch to side-by-side view

ForgeTracker/forgetracker/tests/functional/test_root.py Diff Switch to side-by-side view

ForgeTracker/forgetracker/tracker_main.py Diff Switch to side-by-side view

pyforge/pyforge/model/artifact.py Diff Switch to side-by-side view

pyforge/pyforge/templates/lib.html Diff Switch to side-by-side view

pyforge/pyforge/templates/oembed/html.html to pyforge/pyforge/templates/oembed/html_tpl.html

File was renamed.