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

3852 commits

This branch
This branch
All branches
Author SHA1 Message Date
Harry Wood
41589b6ef9 fixes http://trac.openstreetmap.org/ticket/3645 . Can now pass in show_other_users and setting_location to the map partial 2011-04-03 15:43:41 +01:00
Tom Hughes
cb6d6c2463 Report a friendly(ish) error if no OAauth key is set for Potlatch 2 2011-04-03 15:40:05 +01:00
Dan Karran
d62da73ad7 Add a smaller version of the site logo and title for small screens 2011-04-03 15:16:35 +01:00
Tom Hughes
5777c5e925 Tidy up the data browser javascript 2011-04-03 14:59:43 +01:00
Frederik Ramm
59dcc8b253 Add 'hide areas' button to data view 2011-04-03 14:54:32 +01:00
Tom Hughes
62d9dbdc23 Make Potlatch 2 the default editor in the example configuration 2011-04-03 14:40:51 +01:00
Tom Hughes
6cfa483e8b Update Potlatch 2 to 2.0 build 2011-04-03 14:33:55 +01:00
Harry Wood
940995c816 Make home location setting map default to the whole world 
Defaulting to western europe doesn't seem very reasonable these
days as we have users all over the world now.
 2011-04-03 13:46:18 +01:00
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