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

1159 commits

Author SHA1 Message Date
Ævar Arnfjörð Bjarmason
9448eab143 Merge branch 'master' into openID 2010-04-20 23:41:14 +00:00
Tom Hughes
546250f60b Load wiki link data at startup and shorten some file names 2010-04-20 21:05:22 +01:00
Tom Hughes
d6755356e0 Improve the browse helper code use to generate wiki links 2010-04-20 19:04:12 +01:00
Tom Hughes
da74fbb769 Fix wiki scraper to find tag pages as well as key pages 2010-04-20 18:48:59 +01:00
Ævar Arnfjörð Bjarmason
8eead8a870 Ticket #2245: Link from /browse/* pages to the wiki key/value pages 2010-04-20 12:55:14 +00:00
Tom Hughes
d36fab2913 Merge branch 'master' into openid 
Conflicts:
	app/controllers/user_controller.rb
	app/views/user/login.html.erb
	config/locales/en.yml
 2010-04-20 00:41:03 +01:00
Tom Hughes
ec24889541 Ignore some files which aren't committed. 2010-04-19 15:20:13 +01:00
Tom Hughes
a36185b22f Normalise line endings. 2010-04-19 15:17:18 +01:00
Translatewiki
3513138b99 Localisation updates from translatewiki.net (2010-04-18) 2010-04-19 14:28:03 +01:00
Translatewiki
b7ceec9c88 Localisation updates from translatewiki.net (2010-04-18) 2010-04-19 14:28:03 +01:00
Translatewiki
45152a8ddf Localisation updates from translatewiki.net (2010-04-14) 2010-04-19 14:28:03 +01:00
Translatewiki
3c8e55e7ae Localisation updates from translatewiki.net (2010-04-14) 2010-04-19 14:28:03 +01:00
Translatewiki
7e837dd558 Localisation updates from translatewiki.net (2010-04-09) 2010-04-19 14:28:02 +01:00
Translatewiki
a1654ef19c Localisation updates from translatewiki.net (2010-04-09) 2010-04-19 14:28:02 +01:00
Richard Fairhurst
4e7ccfd9d8 always forget this one 2010-04-19 14:28:02 +01:00
Translatewiki
4ab5438485 Localisation updates from translatewiki.net (2010-04-08) 2010-04-19 14:28:02 +01:00
Translatewiki
ab2f4308ef Localisation updates from translatewiki.net (2010-04-08) 2010-04-19 14:28:02 +01:00
Tom Hughes
aab8b230ec Load timecop in the test environment only. 2010-04-19 14:27:51 +01:00
Tom Hughes
db691133d3 Revert copyright page from the trunk for now. 2010-04-07 09:45:41 +00:00
Translatewiki
159860eeb4 Localisation updates from translatewiki.net (2010-04-07) 2010-04-06 22:32:09 +00:00
Translatewiki
e51fd7758d Localisation updates from translatewiki.net (2010-04-07) 2010-04-06 22:30:21 +00:00
Translatewiki
9ad6634823 Localisation updates from translatewiki.net (2010-04-07) 2010-04-06 22:25:20 +00:00
Translatewiki
3374c0751f Localisation updates from translatewiki.net (2010-04-07) 2010-04-06 22:20:45 +00:00
Tom Hughes
97f294076f Tweak the new copyright page a bit. 2010-04-06 20:11:33 +00:00
Richard Fairhurst
da059269f9 add OS StreetView (and a D keypress for the Ubuntu types) 2010-04-06 14:22:21 +00:00
Richard Fairhurst
ecbd526956 New, more helpful and compliant copyright page 2010-04-06 13:55:33 +00:00
Shaun McDonald
a2c4462db2 Seems that the Rails.env doesn't consistently work. Removing condition in config/environment.rb 2010-04-03 21:31:35 +00:00
Shaun McDonald
9dabe69032 Adding timecop as a gem dependency when in development env. This allows for time based tests to be accurate/consistent. It will stop the random error on the api_controller_test#test_changes_simple, when you are on a slow machine/have bad timing. 2010-04-03 21:02:20 +00:00
Translatewiki
6e14bf5ec7 Localisation updates from translatewiki.net (2010-04-03) 2010-04-03 13:36:40 +00:00
Translatewiki
a2a75fd102 Localisation updates from translatewiki.net (2010-04-03) 2010-04-03 13:35:56 +00:00
Translatewiki
fe11898c3a Localisation updates from translatewiki.net (2010-03-23) 2010-03-23 20:21:01 +00:00
Translatewiki
81c89e8547 Localisation updates from translatewiki.net (2010-03-23) 2010-03-23 20:20:45 +00:00
Tom Hughes
aa90ace7b4 Add placeholder file for nb translations and arrange to merge nb and 
no translations at startup.
 2010-03-18 22:33:05 +00:00
Translatewiki
a2b438f0d7 Localisation updates from translatewiki.net (2010-03-17) 2010-03-17 21:48:01 +00:00
Translatewiki
3e2d5275a8 Localisation updates from translatewiki.net (2010-03-17) 2010-03-17 21:47:18 +00:00
Tom Hughes
a7d304d20f Require the session ID to log somebody out - if it isn't given we just 
show a confirmation page. Closes #2792.
 2010-03-14 15:29:53 +00:00
Translatewiki
1f9183aa8d Localisation updates from translatewiki.net (2010-03-13) 2010-03-12 23:54:23 +00:00
Translatewiki
2e8ac3ff18 Localisation updates from translatewiki.net (2010-03-13) 2010-03-12 23:53:51 +00:00
Tom Hughes
dcbc807526 Improve user popups on friend/nearby mapper maps. 2010-03-11 18:23:22 +00:00
Richard Fairhurst
8434fb53b7 couple of little fixes 2010-03-07 23:09:26 +00:00
Translatewiki
12e2965342 Localisation updates from translatewiki.net (2010-03-07) 2010-03-06 23:57:17 +00:00
Translatewiki
47cd868404 Localisation updates from translatewiki.net (2010-03-07) 2010-03-06 23:56:16 +00:00
Tom Hughes
94f19ce3b3 Use a better HTML sanitizer that makes sure the HTML is well formed and 
can add rel="nofollow" to links.
 2010-03-06 15:38:13 +00:00
Tom Hughes
5e9ae68fb2 Make friend notification messages include a link to add a reciprocal 
friendship if it doesn't already exist. Closes #2754.
 2010-03-01 12:08:11 +00:00
Tom Hughes
07172166da Monkey patch rails to work around stupid I18n bug where it looks up 
time.formats in the locale and then looks for the requested format in
that hash, thereby not doing fallback correctly. To make things worse
it then defaults to just using the requested format name as the format...
 2010-03-01 00:55:27 +00:00
Translatewiki
32326df602 Localisation updates from translatewiki.net (2010-02-28) 2010-02-28 23:07:43 +00:00
Translatewiki
f9e2447013 Fix typo 2010-02-28 21:08:48 +00:00
Tom Hughes
9d35062ba3 Add a "friendly" date/time format and use it whenever we are printing 
dates and times on the web site.

Also try and improve formatting of message pages a but, and include the
image of the recipient when viewing a sent message.
 2010-02-28 16:57:22 +00:00
Tom Hughes
b90567e197 Tidy up error handling in the message controller, and make it redirect to 
the login page if you are logged in as the wrong user. Closes #1569.
 2010-02-28 15:13:06 +00:00
Tom Hughes
98c471c485 Commit missing resource for user image hint. 2010-02-28 14:23:51 +00:00