← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to loggerhead/controllers/changelog_ui.py

Committer: Martin Albisetti
Date: 2008-07-22 00:40:03 UTC
mfrom: (182 loggerhead.search_integration)
mto: (157.1.3 loggerhead)
mto: This revision was merged to the branch mainline in revision 187.
Revision ID: argentina@gmail.com-20080722004003-lx1fp0tthpp6kl92

Merged from trunk, resolved billions of conflicts

files added:
loggerhead/controllers/search_ui.py

loggerhead/search.py

loggerhead/static/javascript/custom.js

loggerhead/static/javascript/mootools-1.2-more.js

loggerhead/templates/search.pt

loggerhead/wholehistory.py

files removed:
loggerhead/static/javascript/custom.js

loggerhead/static/javascript/mootools-1.2-more.js

files modified:
NEWS

loggerhead/apps/__init__.py

loggerhead/apps/branch.py

loggerhead/apps/config.py

loggerhead/apps/filesystem.py

loggerhead/controllers/__init__.py

loggerhead/controllers/atom_ui.py

loggerhead/controllers/changelog_ui.py

loggerhead/controllers/download_ui.py

loggerhead/controllers/revision_ui.py

loggerhead/history.py

loggerhead/templates/browse.pt

loggerhead/templates/macros.pt

loggerhead/tests/test_simple.py

loggerhead/util.py

start-loggerhead.py

Show diffs side-by-side

added added

removed removed

loggerhead/controllers/changelog_ui.py

66

66

navigation = util.Container(

67

67

pagesize=pagesize, revid=revid, start_revid=start_revid,

68

68

revid_list=revid_list, filter_file_id=filter_file_id,

69

scan_url='/changes', branch=self._branch, feed=True)

69

scan_url='/changes', branch=self._branch, feed=True, history=h)

70

70

if query is not None:

71

71

navigation.query = query

72

72

util.fill_in_navigation(navigation)

Older »