cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2780 commits 4 branches 1 tag 499 MiB
Commit graph

1533 commits

Author SHA1 Message Date
Matt Amos
16b79f9964 Added a :display_name option for the changesets query code. 2009-10-12 10:12:12 +00:00
Tom Hughes
a8cc053bcc Add some administrator only actions to the user page. 2009-10-12 08:00:59 +00:00
Tom Hughes
921c150b63 Display user's email addresses and the IP address used to create 
their account to people that are logged in as administrators.
 2009-10-09 15:45:01 +00:00
Tom Hughes
0189bce496 Test that the user has cookies enabled at critical points where we 
are about to require them and warn the user if they are not enabled.
 2009-10-09 08:47:47 +00:00
Tom Hughes
fb9789929c Fix output of javascript strings - use english strings to walk the 
tree but output strings in the correct locale. Closes #2362.
 2009-10-08 12:25:55 +00:00
Matt Amos
137468f75f Fixed bug in _blocks partial when used by the index view. 2009-10-06 14:19:54 +00:00
Tom Hughes
2a9cacb6f1 Add parentheses to avoid warning. 2009-10-05 20:28:15 +00:00
Tom Hughes
7de5220090 Merge 17944:17988 from trunk. 2009-10-05 20:25:45 +00:00
Tom Hughes
f4dba81b64 Modify the existing i18n() javascript function to lookup strings in 
the javascript i18n array as well as expanding arguments, and make all
lookups go through it.
 2009-10-02 23:41:19 +00:00
Tom Hughes
596ab82461 Move javascript translations to a separate key based on the path to 
the javascript file that uses them and amend the layout to automatically
find and output all javascript strings.
 2009-10-02 23:33:17 +00:00
Tom Hughes
52126dc3c1 There is no need to translate the names of layers which are not shown 
in the layer switcher.
 2009-10-02 23:03:42 +00:00
Ævar Arnfjörð Bjarmason
4c84709c80 Follow up to [17948]: Make the layer switcher translatable too! 2009-10-02 20:39:47 +00:00
Ævar Arnfjörð Bjarmason
b0e1560875 Some of our JavaScript files have UI messages but we don't want to 
make them dynamic.

So I'm creating a globally scoped JavaScript array called rails_i18n
which holds some of these messages. It's loaded in <head> before any
of the JavaScript files so it should always be available.
 2009-10-02 20:19:28 +00:00
Matt Amos
17f05fdb13 Merging 17905:17944 from trunk. 2009-10-02 15:36:46 +00:00
Tom Hughes
d0f2288797 Add parentheses to avoid warnings. 2009-10-02 14:40:25 +00:00
Ævar Arnfjörð Bjarmason
8c1d3fdd6b Amend [17942]: 
* Center-align donation text
 * Add title="" to the donate link
 * Use an official cc_button.png from http://1.1.1.1/bmi/i.creativecommons.org/l/by-sa/2.0/88x31.png that doesn't include English text
 * Add rel=license to license link as suggested by CC
 * Add width/height to CC button
 2009-10-02 13:04:47 +00:00
Tom Hughes
968e6c417f Replace the donate button with a text version that can be translated. 2009-10-02 12:29:44 +00:00
Matt Amos
3429f016c2 Adding blocking to user auth bits of amf_controller. Or, at least, the bits I could find. 2009-10-02 10:49:03 +00:00
Matt Amos
1009788043 Fix wrong comment. 2009-10-02 10:46:19 +00:00
Ævar Arnfjörð Bjarmason
2dab83d57b use {{count}} instead of {{sent_count}} so rails plural forms will kick in 2009-10-02 10:41:47 +00:00
Tom Hughes
a549d33fdf Add "blocks on" and "blocks by" links to the user page when a logged 
in user is looking at their own page.
 2009-10-01 21:30:45 +00:00
Tom Hughes
5a2ad3655b Replace a couple calls to inject with more readble constructs. 2009-10-01 20:39:04 +00:00
Ævar Arnfjörð Bjarmason
efc2a3fa47 Set a limit on the new/edit block text area. Make it as big as diary 
comments instead of the insane default rails size of 40/20 cols/rows
 2009-10-01 20:29:17 +00:00
Tom Hughes
8217c55523 Correct comment. 2009-10-01 20:24:53 +00:00
Ævar Arnfjörð Bjarmason
df4267639d * The Back link in block/id/edit wasn't translatable 
* New text for back links to make them more understandable
 2009-10-01 20:24:36 +00:00
Tom Hughes
54649a39a0 Correct comment. 2009-10-01 20:22:52 +00:00
Ævar Arnfjörð Bjarmason
7dbf68aa52 * <title> for /blocks/new/* 
* use h() to escape usernames
 2009-10-01 20:18:24 +00:00
Ævar Arnfjörð Bjarmason
78e0ec74f7 use h() to avoid XSS in usernames 2009-10-01 20:02:54 +00:00
Ævar Arnfjörð Bjarmason
e0ece00738 title/links for revoke page 2009-10-01 19:59:02 +00:00
Ævar Arnfjörð Bjarmason
2ea77833cd Oops. Mixed up heading/title 2009-10-01 19:55:25 +00:00
Ævar Arnfjörð Bjarmason
1cea0df3d8 title/heading & XSS fix for /edit 2009-10-01 19:45:36 +00:00
Ævar Arnfjörð Bjarmason
c6f844603d Add <title> to /blocks and don't Camel Case headings 2009-10-01 19:27:15 +00:00
Ævar Arnfjörð Bjarmason
1a2ccfbb8f Set title on /blocks/:id and link to usernames 2009-10-01 19:18:23 +00:00
Ævar Arnfjörð Bjarmason
8d6d7b51e8 When a user hasn't made any blocks or been blocked don't display a 
skeleton table. Just a <p> saying there's nothing here.
 2009-10-01 19:04:38 +00:00
Ævar Arnfjörð Bjarmason
268a2cd474 * use h() on username to avoid XSS 
* Link to username in <h1>
 * Set <title> on /blocks and /blocks_by
 2009-10-01 18:49:38 +00:00
Matt Amos
9b82acded9 Adding title for role icons when viewing user isn't an admin, re-adding translations for those. 2009-10-01 18:09:31 +00:00
Ævar Arnfjörð Bjarmason
8a7040e155 Set title/h1 to something sensible when granting/revoking roles 2009-10-01 18:02:08 +00:00
Ævar Arnfjörð Bjarmason
1d59359202 Add title="" to the revoke/grant icons that indicate what they're about to do 2009-10-01 17:57:20 +00:00
Matt Amos
1e3b3c1f10 Refactored user_role and controller. Now much more DRY. 2009-10-01 17:15:34 +00:00
Matt Amos
77851bac7b Added better messages and error handling in a couple of places. Added integration checks to ensure that the blocking is actually working. Tests FTW. 2009-09-30 17:39:42 +00:00
Matt Amos
95c3d640a4 Tried to DRY the user_blocks controller. Moved the configuration of the blocking periods into application.yml. 2009-09-30 15:44:29 +00:00
Matt Amos
ca06b3c7b1 New migration to add better auditing to user_roles and better column names there and on user_blocks. Added a helper for displaying block status messages. 2009-09-29 16:44:03 +00:00
Matt Amos
09c5740b5b Merging 17824:17845 from trunk to blocking branch. 2009-09-29 10:23:31 +00:00
Ævar Arnfjörð Bjarmason
801182d2ea Actually make the last commit work. I thought Ruby's string interpolation syntax worked differently 2009-09-29 10:12:01 +00:00
Ævar Arnfjörð Bjarmason
0197460689 Escape user-supplied JavaScript. Fixes http://lists.openstreetmap.org/pipermail/talk/2009-September/042846.ht 2009-09-29 09:23:11 +00:00
Thomas Wood
ec26e06706 5 character patch to only output duplicated nodes once in a way/full call 
Unit tests not run - problems on this system
Fixes #2327
 2009-09-29 02:55:35 +00:00
Matt Amos
30d5e783e4 Added a confirmation step to the process of granting and revoking user roles. 2009-09-28 17:35:39 +00:00
Matt Amos
ab1444f338 Truncate long reason texts to not overwhelm the browser window. 2009-09-28 17:30:10 +00:00
Matt Amos
daa2496024 First version of blocking feature. Allows both time-based (for map protection) and notice-based (for education) blocks on users. Also introduces user roles and a simple UI for displaying and administering these. 2009-09-28 16:01:00 +00:00
Tom Hughes
b8afd4fbf3 Fix comment typo. 2009-09-24 23:27:45 +00:00