May 2014 - tor-commits - lists.torproject.org

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 23 May '14

23 May '14

commit 69ff1ce867e0842b9f8f4a4dd46234cff047d907 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 23 00:45:33 2014 +0000 Update translations for liveusb-creator --- nb/nb.po | 8 ++++---- ro/ro.po | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nb/nb.po b/nb/nb.po index f789a06..0b6b63a 100644 --- a/nb/nb.po +++ b/nb/nb.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-05-16 18:47+0200\n" -"PO-Revision-Date: 2014-05-22 20:11+0000\n" +"PO-Revision-Date: 2014-05-23 00:24+0000\n" "Last-Translator: kingu <comradekingu(a)gmail.com>\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/torproject/language/nb/)\n" "MIME-Version: 1.0\n" @@ -61,7 +61,7 @@ msgid "" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n" "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Copy the running Tails onto a USB stick or SD card. All data on the target drive will be lost.</span></p></body></html>" -msgstr "" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Kopier den kjørende Tails-instansen til en minnepinne eller et SD-kort. All data på målet vil forsvinne.</span></p></body></html>" #: ../liveusb/launcher_ui.py:162 msgid "" @@ -70,7 +70,7 @@ msgid "" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n" "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Copy the running Tails onto an already installed Tails device. Other partitions found on the stick are preserved.</span></p></body></html>" -msgstr "" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Kopier den kjørende Tails-instansen til en minnepinne eller et SD-kort. All data tilhørende andre partisjoner på målet vil bli opprettholdt.</span></p></body></html>" #: ../liveusb/launcher_ui.py:164 msgid "" @@ -79,7 +79,7 @@ msgid "" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n" "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Upgrade an already installed Tails device from a new ISO image.</span></p></body></html>" -msgstr "" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Oppgrader en installert versjon av Tails fra en ny ISO-avbildning. </span></p></body></html>" #: ../liveusb/dialog.py:163 msgid "Alt+B" diff --git a/ro/ro.po b/ro/ro.po index 355a7a6..9bc7767 100644 --- a/ro/ro.po +++ b/ro/ro.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-05-16 18:47+0200\n" -"PO-Revision-Date: 2014-05-22 10:02+0000\n" +"PO-Revision-Date: 2014-05-23 00:33+0000\n" "Last-Translator: kyx <mihaidiaconu(a)gmail.com>\n" "Language-Team: Romanian (http://www.transifex.com/projects/p/torproject/language/ro/)\n" "MIME-Version: 1.0\n"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 23 May '14

23 May '14

commit 7f4bf6ddfd783aef813f018794849eac6f0132e5 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 23 00:45:05 2014 +0000 Update translations for bridgedb --- nb/LC_MESSAGES/bridgedb.po | 9 +++++---- pl/LC_MESSAGES/bridgedb.po | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/nb/LC_MESSAGES/bridgedb.po b/nb/LC_MESSAGES/bridgedb.po index 9c374ca..c8130cf 100644 --- a/nb/LC_MESSAGES/bridgedb.po +++ b/nb/LC_MESSAGES/bridgedb.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: +# kingu <comradekingu(a)gmail.com>, 2014 # haarek <haarektrans(a)gmail.com>, 2014 # lateralus, 2013 # thor574 <thor.hovden(a)gmail.com>, 2014 @@ -11,8 +12,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2014-05-16 18:39+0000\n" -"PO-Revision-Date: 2014-05-22 17:11+0000\n" -"Last-Translator: haarek <haarektrans(a)gmail.com>\n" +"PO-Revision-Date: 2014-05-23 00:27+0000\n" +"Last-Translator: kingu <comradekingu(a)gmail.com>\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/torproject/language/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -224,7 +225,7 @@ msgstr "" #: lib/bridgedb/strings.py:124 msgid "Request IPv6 bridges." -msgstr "" +msgstr "Etterspør IPv6-broer." #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". #: lib/bridgedb/strings.py:126 @@ -237,7 +238,7 @@ msgstr "" #: lib/bridgedb/templates/base.html:91 msgid "Report a Bug" -msgstr "" +msgstr "Rapporter en feil" #: lib/bridgedb/templates/base.html:93 msgid "Source Code" diff --git a/pl/LC_MESSAGES/bridgedb.po b/pl/LC_MESSAGES/bridgedb.po index c8f34c7..0e1ba10 100644 --- a/pl/LC_MESSAGES/bridgedb.po +++ b/pl/LC_MESSAGES/bridgedb.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2014-05-16 18:39+0000\n" -"PO-Revision-Date: 2014-05-22 07:45+0000\n" +"PO-Revision-Date: 2014-05-23 00:33+0000\n" "Last-Translator: hoek <hoek(a)hoek.pl>\n" "Language-Team: Polish (http://www.transifex.com/projects/p/torproject/language/pl/)\n" "MIME-Version: 1.0\n"

1 0

[tor/master] sandbox: refactor string-based option-unchanged tests to use a macro
by nickm＠torproject.org 23 May '14

23 May '14

commit 85f49abfbe50d29e4314ed0a3b436f3b14162d00 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 22 20:00:22 2014 -0400 sandbox: refactor string-based option-unchanged tests to use a macro There was too much code duplication in doing it the old way, and I nearly made a copy-and-paste error in the last commit. --- src/or/config.c | 41 ++++++++++++++++------------------------- 1 file changed, 16 insertions(+), 25 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index f0b559d..10df839 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3722,10 +3722,22 @@ options_transition_allowed(const or_options_t *old, } if (sandbox_is_active()) { - if (! opt_streq(old->PidFile, new_val->PidFile)) { - *msg = tor_strdup("Can't change PidFile while Sandbox is active"); - return -1; - } +#define SB_NOCHANGE_STR(opt) \ + do { \ + if (! opt_streq(old->opt, new_val->opt)) { \ + *msg = tor_strdup("Can't change " #opt " while Sandbox is active"); \ + return -1; \ + } \ + } while (0) + + SB_NOCHANGE_STR(PidFile); + SB_NOCHANGE_STR(ServerDNSResolvConfFile); + SB_NOCHANGE_STR(DirPortFrontPage); + SB_NOCHANGE_STR(CookieAuthFile); + SB_NOCHANGE_STR(ExtORPortCookieAuthFile); + +#undef SB_NOCHANGE_STR + if (! config_lines_eq(old->Logs, new_val->Logs)) { *msg = tor_strdup("Can't change Logs while Sandbox is active"); return -1; @@ -3734,32 +3746,11 @@ options_transition_allowed(const or_options_t *old, *msg = tor_strdup("Can't change ConnLimit while Sandbox is active"); return -1; } - if (! opt_streq(old->ServerDNSResolvConfFile, - new_val->ServerDNSResolvConfFile)) { - *msg = tor_strdup("Can't change ServerDNSResolvConfFile" - " while Sandbox is active"); - return -1; - } if (server_mode(old) != server_mode(new_val)) { *msg = tor_strdup("Can't start/stop being a server while " "Sandbox is active"); return -1; } - if (! opt_streq(old->DirPortFrontPage, new_val->DirPortFrontPage)) { - *msg = tor_strdup("Can't change DirPortFrontPage" - " while Sandbox is active"); - return -1; - } - if (! opt_streq(old->CookieAuthFile, new_val->CookieAuthFile)) { - *msg = tor_strdup("Can't change CookieAuthFile while Sandbox is active"); - return -1; - } - if (! opt_streq(old->ExtORPortCookieAuthFile, - new_val->ExtORPortCookieAuthFile)) { - *msg = tor_strdup("Can't change ExtORPortCookieAuthFile" - " while Sandbox is active"); - return -1; - } } return 0;

1 0

[tor/master] sandbox: allow reading of hidden service configuration files.
by nickm＠torproject.org 23 May '14

23 May '14

commit cfd0ee514c279bc6c7b7c299e001693a5aeb1f5f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 22 20:39:10 2014 -0400 sandbox: allow reading of hidden service configuration files. fixes part of 12064 --- changes/bug12064_part2 | 5 +++++ src/or/main.c | 11 ++++++----- src/or/rendservice.c | 25 +++++++++++++++++++++++++ src/or/rendservice.h | 1 + 4 files changed, 37 insertions(+), 5 deletions(-) diff --git a/changes/bug12064_part2 b/changes/bug12064_part2 new file mode 100644 index 0000000..4fa86a6 --- /dev/null +++ b/changes/bug12064_part2 @@ -0,0 +1,5 @@ + o Minor bugfixes (seccomp sandbox): + - Avoid warnings when running with sandboxing enabled at the same + time as cookie authentication, hidden services or directory + authority voting. Fixes part of 12064; bugfix on 0.2.5.1-alpha. + diff --git a/src/or/main.c b/src/or/main.c index ba462dc..1c855d5 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2829,13 +2829,14 @@ sandbox_init_filter(void) ); { - smartlist_t *logfiles = smartlist_new(); - tor_log_get_logfile_names(logfiles); - SMARTLIST_FOREACH(logfiles, char *, logfile_name, { + smartlist_t *files = smartlist_new(); + tor_log_get_logfile_names(files); + rend_services_add_filenames_to_list(files); + SMARTLIST_FOREACH(files, char *, file_name, { /* steals reference */ - sandbox_cfg_allow_open_filename(&cfg, logfile_name); + sandbox_cfg_allow_open_filename(&cfg, file_name); }); - smartlist_free(logfiles); + smartlist_free(files); } { diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 5a81d07..631e2a0 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -656,6 +656,31 @@ rend_service_load_all_keys(void) return 0; } +/** Add to <b>lst</b> every filename used by <b>s</b>. */ +static void +rend_service_add_filenames_to_list(smartlist_t *lst, const rend_service_t *s) +{ + tor_assert(lst); + tor_assert(s); + smartlist_add_asprintf(lst, "%s"PATH_SEPARATOR"private_key", + s->directory); + smartlist_add_asprintf(lst, "%s"PATH_SEPARATOR"hostname", + s->directory); + smartlist_add_asprintf(lst, "%s"PATH_SEPARATOR"client_keys", + s->directory); +} + +/** Add to <b>lst</b> every filename used by a configured hidden service */ +void +rend_services_add_filenames_to_list(smartlist_t *lst) +{ + if (!rend_service_list) + return; + SMARTLIST_FOREACH_BEGIN(rend_service_list, rend_service_t *, s) { + rend_service_add_filenames_to_list(lst, s); + } SMARTLIST_FOREACH_END(s); +} + /** Load and/or generate private keys for the hidden service <b>s</b>, * possibly including keys for client authorization. Return 0 on success, -1 * on failure. */ diff --git a/src/or/rendservice.h b/src/or/rendservice.h index 4a810eb..e8a9536 100644 --- a/src/or/rendservice.h +++ b/src/or/rendservice.h @@ -71,6 +71,7 @@ struct rend_intro_cell_s { int num_rend_services(void); int rend_config_services(const or_options_t *options, int validate_only); int rend_service_load_all_keys(void); +void rend_services_add_filenames_to_list(smartlist_t *lst); void rend_services_introduce(void); void rend_consider_services_upload(time_t now); void rend_hsdir_routers_changed(void);

1 0

[tor/master] sandbox: allow access to cookie files, approved-routers
by nickm＠torproject.org 23 May '14

23 May '14

commit ffc1fde01fb4fc752aa54de0282cf027bdb738cf Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 22 19:56:56 2014 -0400 sandbox: allow access to cookie files, approved-routers fixes part of 12064 --- src/or/config.c | 10 ++++++++++ src/or/control.c | 9 ++++----- src/or/control.h | 1 + src/or/main.c | 11 +++++++++++ 4 files changed, 26 insertions(+), 5 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 0f7b1d2..f0b559d 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3750,6 +3750,16 @@ options_transition_allowed(const or_options_t *old, " while Sandbox is active"); return -1; } + if (! opt_streq(old->CookieAuthFile, new_val->CookieAuthFile)) { + *msg = tor_strdup("Can't change CookieAuthFile while Sandbox is active"); + return -1; + } + if (! opt_streq(old->ExtORPortCookieAuthFile, + new_val->ExtORPortCookieAuthFile)) { + *msg = tor_strdup("Can't change ExtORPortCookieAuthFile" + " while Sandbox is active"); + return -1; + } } return 0; diff --git a/src/or/control.c b/src/or/control.c index 2865d78..21504e6 100755 --- a/src/or/control.c +++ b/src/or/control.c @@ -160,7 +160,6 @@ static int write_stream_target_to_buf(entry_connection_t *conn, char *buf, size_t len); static void orconn_target_get_name(char *buf, size_t len, or_connection_t *conn); -static char *get_cookie_file(void); /** Given a control event code for a message event, return the corresponding * log severity. */ @@ -2944,7 +2943,7 @@ handle_control_protocolinfo(control_connection_t *conn, uint32_t len, } else { const or_options_t *options = get_options(); int cookies = options->CookieAuthentication; - char *cfile = get_cookie_file(); + char *cfile = get_controller_cookie_file_name(); char *abs_cfile; char *esc_cfile; char *methods; @@ -4639,8 +4638,8 @@ control_event_conf_changed(const smartlist_t *elements) /** Helper: Return a newly allocated string containing a path to the * file where we store our authentication cookie. */ -static char * -get_cookie_file(void) +char * +get_controller_cookie_file_name(void) { const or_options_t *options = get_options(); if (options->CookieAuthFile && strlen(options->CookieAuthFile)) { @@ -4664,7 +4663,7 @@ init_control_cookie_authentication(int enabled) return 0; } - fname = get_cookie_file(); + fname = get_controller_cookie_file_name(); retval = init_cookie_authentication(fname, "", /* no header */ AUTHENTICATION_COOKIE_LEN, &authentication_cookie, diff --git a/src/or/control.h b/src/or/control.h index 988c171..68a6c24 100644 --- a/src/or/control.h +++ b/src/or/control.h @@ -85,6 +85,7 @@ int control_event_buildtimeout_set(buildtimeout_set_event_t type, int control_event_signal(uintptr_t signal); int init_control_cookie_authentication(int enabled); +char *get_controller_cookie_file_name(void); smartlist_t *decode_hashed_passwords(config_line_t *passwords); void disable_control_logging(void); void enable_control_logging(void); diff --git a/src/or/main.c b/src/or/main.c index 8e241d4..ba462dc 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2838,6 +2838,16 @@ sandbox_init_filter(void) smartlist_free(logfiles); } + { + char *fname; + if ((fname = get_controller_cookie_file_name())) { + sandbox_cfg_allow_open_filename(&cfg, fname); + } + if ((fname = get_ext_or_auth_cookie_file_name())) { + sandbox_cfg_allow_open_filename(&cfg, fname); + } + } + // orport if (server_mode(get_options())) { sandbox_cfg_allow_open_filename_array(&cfg, @@ -2862,6 +2872,7 @@ sandbox_init_filter(void) get_datadir_fname2("stats", "buffer-stats.tmp"), get_datadir_fname2("stats", "conn-stats"), get_datadir_fname2("stats", "conn-stats.tmp"), + get_datadir_fname("approved-routers"), get_datadir_fname("fingerprint"), get_datadir_fname("fingerprint.tmp"), get_datadir_fname("hashed-fingerprint"),

1 0

[pups/master] Merge branch 'master' of https://github.com/SheriefAlaa/projectpups
by colin＠torproject.org 23 May '14

23 May '14

commit 57a54adf5fb2024e23861fac987edd162edf48fa Merge: 1414931 7b8d48d Author: Colin Childs <colin(a)torproject.org> Date: Thu May 22 19:36:22 2014 -0500 Merge branch 'master' of https://github.com/SheriefAlaa/projectpups webchat/templates/tokens.html | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-)

1 0

[pups/master] typo in tokens.html
by colin＠torproject.org 23 May '14

23 May '14

commit a185236c863fdbded2d9b5505782f35d65c5ca72 Author: Sherief Alaa <sheriefalaa.w(a)gmail.com> Date: Thu May 22 03:36:18 2014 +0300 typo in tokens.html --- webchat/templates/tokens.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webchat/templates/tokens.html b/webchat/templates/tokens.html index ed95254..b8aaf8c 100644 --- a/webchat/templates/tokens.html +++ b/webchat/templates/tokens.html @@ -40,7 +40,7 @@ {% for token in tokens %} <tr> <td><input name="selected_list" type="checkbox" value="{{token.token}}"></td> - <td>http://{{url}}/chat/{{token.token}}</td>  + <td>https://{{url}}/chat/{{token.token}}</td> <td>{{token.expires_at|date:"Y-m-d G:i"}}</td> <td>{{token.comment}}</td> </tr>

1 0

[pups/master] /stats now requires login
by colin＠torproject.org 23 May '14

23 May '14

commit d1ca8e7ba42ce7b2360050e56711bd73eb1f1ec3 Author: Sherief Alaa <sheriefalaa.w(a)gmail.com> Date: Sun May 18 01:36:48 2014 +0300 /stats now requires login --- stats/views.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/stats/views.py b/stats/views.py index 6b7c360..433d37a 100644 --- a/stats/views.py +++ b/stats/views.py @@ -22,8 +22,10 @@ from django.http import HttpResponse from django.shortcuts import render, redirect +from django.contrib.auth.decorators import login_required +@login_required def stats(request): return render(request, 'stats.html')

1 0

[pups/master] restricting comments in tokens.html
by colin＠torproject.org 23 May '14

23 May '14

commit 705ced583c61570bfba46f71e0e8745f5da44504 Author: Sherief Alaa <sheriefalaa.w(a)gmail.com> Date: Thu May 22 20:12:08 2014 +0300 restricting comments in tokens.html --- webchat/templates/tokens.html | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/webchat/templates/tokens.html b/webchat/templates/tokens.html index b8aaf8c..be24b3b 100644 --- a/webchat/templates/tokens.html +++ b/webchat/templates/tokens.html @@ -8,6 +8,18 @@ {% block script %} <script type="text/javascript" src="/static/js/jquery.min.js"></script> <script src="/static/js/bootstrap.min.js"></script> + <script type="text/javascript"> + $(document).ready (function (){ + $(".comment").html(function(){ + $(this).html($(this).text().substring(0,35) + + ' <span data-toggle="modal" data-target="#comment-modal" style="color:blue; font-size:80%;"> Read more..</span>'); + }); + }); + + function full_comment(id){ + $(".comment-modal-body").html($("#full-comment-" + id).val()); + } + </script> {% endblock script %} {% block content %} {% include "nav_bar.html" %} @@ -42,12 +54,30 @@ <td><input name="selected_list" type="checkbox" value="{{token.token}}"></td> <td>https://{{url}}/chat/{{token.token}}</td> <td>{{token.expires_at|date:"Y-m-d G:i"}}</td> - <td>{{token.comment}}</td> + <td class="comment" onclick="full_comment({{token.t_id}});">{{token.comment}}</td> </tr> + <input id="full-comment-{{token.t_id}}" type="hidden" value="{{token.comment}}"> {% endfor %} </table> <input name="revoke" type="submit" class="btn btn-default" value="Revoke Selected"> </form> +<div class="modal fade" id="comment-modal" tabindex="-1" role="dialog" aria-labelledby="Comment" aria-hidden="true"> + <div class="modal-dialog"> + <div class="modal-content"> + <div class="modal-header"> + <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> + <h4 class="modal-title" id="myModalLabel">Comment</h4> + </div> + <div> + <p class="comment-modal-body"></p> + </div> + <div class="modal-footer"> + <button type="button" class="btn btn-default" data-dismiss="modal">OK</button> + </div> + </div> + </div> +</div> + {% include "footer.html" %} {% endblock content %} \ No newline at end of file

1 0

[pups/master] fixed css error
by colin＠torproject.org 23 May '14

23 May '14

commit 7b8d48d0e78c9bd7186bd04893d1c68a1b30da5b Author: Sherief Alaa <sheriefalaa.w(a)gmail.com> Date: Fri May 23 00:30:07 2014 +0300 fixed css error --- webchat/templates/tokens.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webchat/templates/tokens.html b/webchat/templates/tokens.html index be24b3b..db6ab73 100644 --- a/webchat/templates/tokens.html +++ b/webchat/templates/tokens.html @@ -70,7 +70,7 @@ <h4 class="modal-title" id="myModalLabel">Comment</h4> </div> <div> - <p class="comment-modal-body"></p> + <p class="comment-modal-body" style="word-wrap:break-word;"></p> </div> <div class="modal-footer"> <button type="button" class="btn btn-default" data-dismiss="modal">OK</button>

1 0