Skip to content

Commit

Permalink
Use model's string representation
Browse files Browse the repository at this point in the history
Prepare CHANAGELOG vor v1.0.3
  • Loading branch information
Walter Renner committed Dec 4, 2014
1 parent c407bd8 commit 953e1c9
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 23 deletions.
26 changes: 6 additions & 20 deletions CHANGELOG.txt
@@ -1,25 +1,11 @@
=== (ongoing) ===
-

=== (1.0.3) ===
- Support custom user models

=== (1.0.2) ===
- Store info in session (see #3 comments)
- Signals while hijacking
- Visual notifications for hijacking, see README for more detail
- Django 1.6 compatibility (in urls.py)

# Suggested file syntax:
#
# === (ongoing) ===
# - this is always on top of the file
# - when you release a new version, you rename the last `(ongoing)` to the new
# version and add a new `=== (ongoing) ===` to the top of the file
#
# === 1.0 ===
# - a major version is created when the software reached a milestone and is
# feature complete
#
# === 0.2 ===
# - a minor version is created when new features or significant changes have
# been made to the software.
#
# === 0.1.1 ==
# - for bugfix releases, fixing typos in the docs, restructuring things, simply
# anything that doesn't really change the behaviour of the software you
# might use the third digit which is also sometimes called the build number.
2 changes: 1 addition & 1 deletion LICENSE
@@ -1,5 +1,5 @@
The MIT License (MIT)
Copyright (c) 2013 arteria GmbH
Copyright (c) 2013 arteria GmbH

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
Expand Down
5 changes: 3 additions & 2 deletions hijack/templates/hijack/notifications.html
@@ -1,5 +1,6 @@
{% load url from future %}
<div id="hijacked-warning" >
<span style="padding-top: 4px; float: left;"><b>You're currently working on behalf of {{ request.user.get_short_name }}. </b></span> <span style="float: right; margin-right: 15px;"> <a href="{% url 'release_hijack' %}" class="django-hijack-button">release {{ request.user }}</a>
<a href="{% url 'disable_hijack_warning' %}?next={{request.path_info}}" class="django-hijack-button">hide</a> </span>
<span style="padding-top: 4px; float: left;"><b>You're currently working on behalf of {{ request.user }}.</b></span>
<span style="float: right; margin-right: 15px;"><a href="{% url 'release_hijack' %}" class="django-hijack-button">release {{ request.user }}</a>
<a href="{% url 'disable_hijack_warning' %}?next={{ request.path_info }}" class="django-hijack-button">hide</a></span>
</div>

0 comments on commit 953e1c9

Please sign in to comment.