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

1043 commits

Author SHA1 Message Date
Tom Hughes
6fb8570200 Merge branch 'master' into openstreetbugs 
Conflicts:
	config/environment.rb
	config/routes.rb
 2010-09-06 12:51:50 +01:00
Tom Hughes
b3d92954d3 Use normal notice system to display login banner 2010-08-13 15:13:30 +01:00
Matt Amos
047027c95d Added login banner letting users more aware of the license change 2010-08-13 15:13:30 +01:00
Tom Hughes
6c2089da2d Don't refer to the decline button when there isn't one 2010-08-12 18:09:36 +01:00
Frederik Ramm
9aaafcb425 Add new <contributor-terms> element to user details 2010-08-12 17:47:51 +01:00
Tom Hughes
a99b516962 Allow existing users to voluntarily sign up for the contributor terms 
Based on a patch from Frederik Ramm this change allows users to make a
voluntary decision to sign up for the new contributor terms.
 2010-08-10 18:08:11 +01:00
Tom Hughes
2adcfc1a72 Don't allow paging of the changeset atom feed 
Make any request for a changeset feed with a page argument redirect
to the version with no page argument and ensure that any RSS links on
the HTML version of the changeset list don't have a page argument.
 2010-08-09 13:47:21 +01:00
Tom Hughes
4633838e21 Make sure the trace tab always links to the global trace list 2010-08-06 10:40:00 +01:00
Tom Hughes
f07819d81a Rework application configuration 
Use a preinitializer to load the settings from application.yml so
that they are available as early as possible. All settings can also
be overridden using environment variables.

The ad-hoc settins in environment.rb are then moved to this new
system so we have one consistent location for settings.
 2010-08-04 22:06:05 +01:00
Tom Hughes
52395b3cdf Merge branch 'master' into openstreetbugs 2010-07-28 21:30:55 +01:00
Tom Hughes
9f83acfb44 Move the trace upload form from the list to a create trace page 2010-07-22 21:00:39 +01:00
Tom Hughes
b551fef0b7 Present "too many pending traces" message as a warning box 2010-07-22 20:47:34 +01:00
Tom Hughes
5a2ffa227c Convert trace views to use CSS based user specific components 2010-07-22 20:47:29 +01:00
Tom Hughes
6f73468f18 Convert diary views to use CSS based user specific components 2010-07-21 22:24:35 +01:00
Tom Hughes
51195c450d Add support for CSS based control of user specific components 
Define some helper routines which can be used to make page elements
only display when the logged in user matches certain conditions and
add style rules to the layout to trigger those elements based on the
logged in user.
 2010-07-21 21:49:20 +01:00
Tom Hughes
84b39122f1 Make the suspended user view work again 
The suspended user view was broken in 2a2818d so it threw an error
instead of rendering a friendyish message.
 2010-07-20 08:55:08 +01:00
Tom Hughes
f7aeff3dd6 Revert "Add advert for SOTM 2010 to sidebar" 
This reverts commit 3590335221.

Conflicts:

	app/views/layouts/site.html.erb
	config/locales/en.yml
 2010-07-12 22:40:46 +01:00
Tom Hughes
136d6508c2 Remove maintenance notice 2010-07-03 07:44:24 +01:00
Tom Hughes
a7a4dadbd5 Add a notice about the downtime 2010-06-30 12:51:22 +01:00
Tom Hughes
02ad2f5a51 Merge branch 'master' into openstreetbugs 2010-06-27 16:29:52 +01:00
Tom Hughes
e7303fe287 Add language codes to diary bodies 
Wrap diary bodies in a div with the correct language code for the
entry set on the div. Closes #2572.
 2010-06-26 16:35:25 +01:00
Tom Hughes
7bfcadd385 Add version number based ids to browser history pages 2010-06-26 15:43:17 +01:00
Tom Hughes
b9c9d6c1aa Merge branch 'master' into openstreetbugs 2010-06-16 21:19:12 +01:00
Tom Hughes
b43f9c4714 Link SOTM advert to the landing page 2010-06-16 21:16:42 +01:00
Tom Hughes
180228b7e3 Rename layouts.sotm resource to avoid using stale translations 2010-06-08 18:01:21 +01:00
Tom Hughes
3590335221 Add advert for SOTM 2010 to sidebar 2010-06-08 17:09:21 +01:00
Tom Hughes
50224b473b Merge branch 'master' into openstreetbugs 
Conflicts:
	app/controllers/browse_controller.rb
 2010-06-07 22:26:33 +01:00
Tom Hughes
cf682f49b3 Add a timeout to the change list pages 2010-05-21 20:21:41 +01:00
Ævar Arnfjörð Bjarmason
2a2818d055 Change user.suspended.body so translators don't have to type out anchors 2010-05-17 00:10:27 +01:00
Tom Hughes
4b17b92da0 Merge branch 'master' into openstreetbugs 2010-05-16 14:50:06 +01:00
Tom Hughes
abb2bb74a7 Tidy up addition of icons to relation members 2010-05-16 13:07:25 +01:00
Tom Hughes
6e145a2f38 Rename css_class to link_class for consistency 2010-05-16 12:57:00 +01:00
Tom Hughes
7f1ce59f32 Rename browser-icons to browse everywhere and only load CSS when needed 2010-05-16 12:32:51 +01:00
Dan Karran
10dca1b6df Patch from bug #2787 to add icons to data browser pages 2010-05-16 12:12:59 +01:00
Tom Hughes
959442d087 Merge branch 'master' into openstreetbugs 2010-05-11 19:53:57 +01:00
Tom Hughes
160429e62d Merge branch 'master' into openstreetbugs 
Conflicts:
	lib/osm.rb
 2010-05-07 22:29:09 +01:00
Tom Hughes
303e5d3eb9 Merge branch 'master' into terms 
Conflicts:
	config/application.yml
	lib/osm.rb
	public/stylesheets/common.css
 2010-05-07 22:23:20 +01:00
Tom Hughes
d50cf2b102 Preserve parameters in pagination links 2010-05-07 14:08:07 +01:00
Tom Hughes
c86e52dee9 Preserve the page number when submitting the form 2010-05-07 14:07:39 +01:00
Tom Hughes
9230721a1f Redirect suspended users to an information page 
If the current session is for a logged in user and that user has
been suspended then log them out and redirect them to a page
explaining that their account has been suspended.
 2010-05-07 10:00:24 +01:00
Tom Hughes
7211872790 Don't try and display IP address for users without one 2010-05-07 09:29:38 +01:00
Tom Hughes
b9deb68de1 Display total user count correctly in user list 2010-05-07 09:05:55 +01:00
Tom Hughes
fc7488f28a Link the username in the user list to their profile 2010-05-07 09:03:12 +01:00
Tom Hughes
ae8c0b3baf Add a user list view for administrators 2010-05-06 20:55:02 +01:00
Tom Hughes
552a647810 Merge all the user status changing methods into one 2010-05-06 17:18:34 +01:00
Tom Hughes
200a1ab5c7 Show administrators the status and spam score for a user 2010-05-06 17:18:34 +01:00
Tom Hughes
5a54630b57 Add support for suspended and confirmed users 
Replace the existing "active" and "visible" with an enumerated status
that allows for extra cases. Currently we have "suspended" for users
who hve triggered the spam detector and "confirmed" for users that have
triggered the detector but have been confirmed as vald by an admin.
 2010-05-06 17:18:34 +01:00
Tom Hughes
ffd7b02b0c Merge branch 'master' into terms 2010-05-05 15:29:48 +01:00
Kai Krueger
5898b494df Merge branch 'master' of git://git.openstreetmap.org/rails into openstreetbugs 2010-05-02 11:42:58 +01:00
Tom Hughes
feb9582b07 Tweak the copyright page translation 2010-04-27 16:00:10 +01:00