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

3844 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tom Hughes
4b20afd51e Preserve the referer at the end of account creation 2011-04-03 13:46:18 +01:00
Tom Hughes
097fb390b8 Only show login/signup in slim mode when used from oauth 2011-04-03 13:46:18 +01:00
Tom Hughes
98f34e4534 Make CTs full width in slim mode 2011-04-03 13:46:17 +01:00
Tom Hughes
bb83f28a5e Factor out comment code from layouts into partials 2011-04-03 13:46:17 +01:00
Andy Allan
59bfcb161d Tweaks to the contributor terms styling 
The 60% trick doesn't work now that the terms are what defines the height (rather than the sidebar). Also, add a margin to bring the floating buttons within range of the slim container.
 2011-04-03 13:46:17 +01:00
Andy Allan
9a25d85e25 No longer needed, and messes up the login page 2011-04-03 13:46:17 +01:00
Andy Allan
54a5aabcac Change around how this works - the container adjusts to the right height, and it's the (fixed-size) header that's absolute positioned instead of the content 2011-04-03 13:46:17 +01:00
Andy Allan
6edbcc12df Use slim layout for OAuth pages too 2011-04-03 13:46:17 +01:00
Andy Allan
f272381828 Add a grey box around login dialog 2011-04-03 13:46:17 +01:00
Andy Allan
7d7416894a New version of slim layout with grey background and centered, auto-adjusting page 2011-04-03 13:46:17 +01:00
Andy Allan
7b57119146 Another approach, but this time without scattering stuff all over the methods 2011-04-03 13:46:17 +01:00
Andy Allan
0531a7dfa1 Ah, that doesn't work due to 'bugs' in the way layouts work - only the last command has any effect 2011-04-03 13:46:17 +01:00
Andy Allan
5531c0bf34 Use the slim layout on the login page 2011-04-03 13:46:16 +01:00
Andy Allan
873fe81f71 Try a different approach - grab the layout and stylesheet from slim1, and ditch the rest 2011-04-03 13:46:16 +01:00
Tom Hughes
aa8fef0f94 Don't display deleted marker for nodes 2011-04-03 13:46:16 +01:00
Frederik Ramm
935c238626 Show the position of a deleted node in browse mode 2011-04-03 13:46:16 +01:00
Tom Hughes
0169453855 Make sure the user is redirect correctly after seeing the terms 2011-04-03 13:46:16 +01:00
Tom Hughes
7fd956260e Default REQUIRE_TERMS_SEEN to false for now 2011-04-03 13:46:16 +01:00
Tom Hughes
452879ee03 Don't run the user terms tests unless REQUIRE_TERMS_SEEN is set 2011-04-03 13:46:16 +01:00
Tom Hughes
392aa71015 Tidy up a few things 2011-04-03 13:46:16 +01:00
Tom Hughes
b3bcbbeb3b Move SOTM advert above the optionals 2011-04-03 13:46:16 +01:00
Matt Amos
8b12abd5bb Phase 2 CTs implementation and tests, with config parameter 2011-04-03 13:46:16 +01:00
Matt Amos
82db7eccc8 Added SOTM 2011 banner to the side bar 2011-04-03 13:46:15 +01:00
Tom Hughes
aa121fa046 Make diary locations into a link and drop the separate view link 2011-04-03 13:46:15 +01:00
Harry Wood
53fc3e8919 Remove edit links from geo-located diary entries 
Jumping straight into the editor from a diary entry is not a
particularly useful thing to do. Fixes trac ticket #3626.
 2011-04-03 13:46:06 +01:00
Tom Hughes
2512337cf5 Add a marker to the edit tab to indicate that it has a menu 2011-04-02 15:40:12 +01:00
Tom Hughes
432852c041 Rebuild OpenLayers with patch for OpenLayers ticket #2848 
OpenStreetMap ticket #3399 reports than the transition effects are
not working properly on the map - brining in this upstream patch is
an attempt to fix that.
 2011-04-01 08:50:31 +01:00
Tom Hughes
481c8f04e9 Update Potlatch 2 to 0.5-295-g3fdb3c2 build 2011-03-29 15:11:28 +01:00
Tom Hughes
bebacced34 Update Potlatch 2 to 0.5-294-g58c9d2c build 2011-03-29 11:56:02 +01:00
Tom Hughes
ba639159dd Handle changesets with an empty string as the comment 2011-03-25 22:51:39 +00:00
Tom Hughes
3fbf7891cc Update Potlatch 2 to 0.5-293-g6780e5b build 2011-03-15 14:39:11 +00:00
Matt Amos
f3ff36418b Fixed bug in changeset queries 
The 'or' condition needed to be bracketed within larger 'and' expression.
 2011-03-15 13:56:55 +00:00
Tom Hughes
4e156fb9d1 Update Potlatch 2 to 0.5-291-g0c68ba6 build 2011-03-09 14:52:51 +00:00
Tom Hughes
ecb9240650 Update Potlatch 2 to 0.5-289-g1aefc1d build 2011-03-09 12:45:43 +00:00
Tom Hughes
21a73f2d2c Update Potlatch 2 to 0.5-288-ge6767fa build 2011-03-09 11:34:17 +00:00
Tom Hughes
27809a2c54 Update Potlatch 2 to 0.5-288-g9cbfeb6 build 2011-03-08 20:36:49 +00:00
Siebrand Mazeland
b770bc1661 Localisation updates from http://translatewiki.net. 2011-03-06 13:15:58 +01:00
Siebrand Mazeland
04efc39a49 Localisation updates from http://translatewiki.net. 2011-02-24 12:28:42 +01:00
Siebrand Mazeland
b2e490e6fa Localisation updates from http://translatewiki.net. 2011-02-14 19:35:23 +01:00
Tom Hughes
11aff90f63 Merge branch 'master' into openid 
Conflicts:
	app/controllers/user_controller.rb
	app/views/user/login.html.erb
	public/stylesheets/common.css
 2011-02-10 14:10:19 +00:00
Siebrand Mazeland
e37a9ec0b5 Localisation updates from http://translatewiki.net. 2011-02-03 01:16:13 +01:00
Tom Hughes
7d60707647 Update Potlatch 2 to r25217 build 2011-02-02 19:47:53 +00:00
Tom Hughes
984d73d61b Interpolation variables should not be translated... 2011-01-31 11:06:02 +00:00
Andy Allan
7b8b9104cc Already got -> already have 2011-01-31 11:02:38 +00:00
Tom Hughes
e34ce3cb4c Update Potlatch 2 to r25177 build 2011-01-29 12:19:37 +00:00
Tom Hughes
a28b987212 Update Potlatch 2 to r25171 build 2011-01-28 17:04:32 +00:00
Siebrand Mazeland
adbee9a552 Localisation updates from http://translatewiki.net. 2011-01-22 20:02:20 +01:00
Patrick Kilian
8c4419412f Improve the Osmarender key 2011-01-17 10:16:52 +00:00
Tom Hughes
5a5db3932f Update Potlatch 2 to r25074 build 2011-01-16 17:33:18 +00:00
Tom Hughes
65be0e3158 Escape remote control failed message 2011-01-16 17:12:47 +00:00