diff options
| author | Arun yadav <arunkumar5587@gmail.com> | 2012-05-30 19:01:12 +0530 |
|---|---|---|
| committer | Arun yadav <arunkumar5587@gmail.com> | 2012-05-30 19:01:12 +0530 |
| commit | adb0662690f845be8524d68cf2aa9f57c10fac13 (patch) | |
| tree | a051ac7dd45cdbdb4eeecf5f50d1819cdc119366 /gstudio/urls | |
| parent | 244509e3eb4058a3aff505e3836d43d64b08fe7d (diff) | |
| download | gnowsys-adb0662690f845be8524d68cf2aa9f57c10fac13.tar.gz | |
Full version control for OTs,Objects,ATs,RTs done.Merge and revert also done.Extra history field added in nbhood
Diffstat (limited to 'gstudio/urls')
| -rw-r--r-- | gstudio/urls/history.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gstudio/urls/history.py b/gstudio/urls/history.py index 3932cd62..b2c489e3 100644 --- a/gstudio/urls/history.py +++ b/gstudio/urls/history.py @@ -3,6 +3,8 @@ from django.conf.urls.defaults import url from django.conf.urls.defaults import patterns urlpatterns = patterns('gstudio.views.history', - url(r'^viewhistory/(?P<ssid>\d+)/(?P<cnt>\d+)/$', 'history', + url(r'^viewhistory/(?P<ssid>\d+)/(?P<version_no>\d+)/$', 'history', name='gstudio_history'), - url(r'^showhistory/(?P<ssid>\d+)/$','showHistory'),) + url(r'^compare_history/(?P<ssid>\d+)/$','compare_history'), + url(r'^merge/(?P<ssid1>\d+)/(?P<ssid2>\d+)/$','merge_version'), + url(r'^revert/$','revert_version'),) |