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

882 commits

Author SHA1 Message Date
Matt Amos
838b1ee7e9 Fixed AMF controller to validate changeset comments 
Fixed AMF controller so that it doesn't accept non-UTF8 comments, and
throws away non-XML characters.
 2010-08-08 16:23:11 +01:00
Tom Hughes
c5b35406a6 More fixed to trace redirection 
Redirect to list on a delete, not view. Also reorder the routes so
the more specific ones are first.
 2010-08-06 10:31:20 +01:00
Tom Hughes
1ba40521af Really fix the redirect on trace deletion 2010-08-06 09:59:11 +01:00
Tom Hughes
289ab7c19d Fix redirect on deleting a trace 2010-08-06 09:56:49 +01:00
Tom Hughes
cf9cfd10a1 Fix redirect after a trace is uploaded 2010-08-06 09:53:53 +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
f30dcd1a62 We can cache the trace list for logged in users now 2010-07-22 20:47:35 +01:00
Tom Hughes
af70363d02 Don't cache actions with a page number 2010-07-22 20:47:35 +01:00
Tom Hughes
0e19a9290d Remove use of wildcard cache expiry 
Instead of doing wildcard cache expiry, just iterate over the
available locales, expiring the requested entry in each locale.
 2010-07-22 20:47:34 +01:00
Tom Hughes
cd3fc33171 Remove the user type from cache keys 2010-07-22 20:47:34 +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
0e40a4f1c4 Make changeset browser show an error when the database is offline 2010-06-27 14:42:47 +01:00
Tom Hughes
f973bee52b Make database offline work in production 2010-06-15 10:40:47 +01:00
Tom Hughes
cf682f49b3 Add a timeout to the change list pages 2010-05-21 20:21:41 +01:00
Tom Hughes
b3ce6fdeec Convert lat and lon values to integers 
Make sure the lat and lon values in changeset bounding box queries
are integers or Postgres will refuse to use the index.
 2010-05-21 19:51:30 +01:00
Tom Hughes
798cdc1d19 Tweak resource names to make them fit the normal naming scheme 2010-05-18 00:09:29 +01:00
Ævar Arnfjörð Bjarmason
0fd4a61759 Allow for formatting of the nominatim prefix in the i18n system 
It's a pain to translate nominatim as-is because the context forces me
to translate things in the accusative case. Now I can change
"{{name}}" into "{{name}}:" and translate things in the nominative
case.

Not putting the message in search_osm_nominatim so I don't infringe
upon its namespace.
 2010-05-18 00:06:43 +01:00
Ævar Arnfjörð Bjarmason
fe8a330fd6 user.login.account suspended so translators don't have to type out anchors 2010-05-17 00:10:41 +01:00
Tom Hughes
07f0dddc63 Add parentheses to avoid warning 2010-05-11 19:13:38 +01:00
Tom Hughes
61e51f88cc Merge branch 'master' into terms 2010-05-09 17:16:43 +01:00
Tom Hughes
7e5c998a87 Only set pending users to active on a password reset 
When resetting a password only activate pending users, otherwise a
confirmed user's account gets set back to active and may then get
suspended by the spam scorer.
 2010-05-09 08:44:17 +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
1eba060929 Redirect after processing user changes 
After we have processed the requested user changes, redirect back
to the list so that the resulting page is reloadable without getting
resubmission warnings from the browser.
 2010-05-07 14:27:52 +01:00
Tom Hughes
7774237a11 Redirect back to settings after updating user settings 
When we've saved a user's settings, redirect back to their settings
page instead of just rerendering so that a suspended user check will
be done.
 2010-05-07 10:01:24 +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
3026da0cb0 Fix user visibility check 2010-05-06 22:11:38 +01:00
Tom Hughes
97c2406ae4 Fix user visibility check 2010-05-06 21:52:27 +01:00
Tom Hughes
ae8c0b3baf Add a user list view for administrators 2010-05-06 20:55:02 +01:00
Tom Hughes
5d3992daca Tell users their account has been suspended when they try and login 2010-05-06 17:18:34 +01:00
Tom Hughes
552a647810 Merge all the user status changing methods into one 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
276c29cb31 Make the decline button a real button 
Make the decline button on the terms page a real form submit button
and have the server redirect to the wiki as it's the only way to get
something that will actually look the same as a button on all the
different browsers.
 2010-04-27 10:45:49 +01:00
Tom Hughes
adb0883d17 Ajaxify the country selection on the terms page 2010-04-27 10:01:40 +01:00
Matt Amos
972278a223 Some styling changes. Changed drop-down into radio buttons. Tried, and failed, to get the 'decline' link to look like a button. 2010-04-27 00:36:44 +01:00
Tom Hughes
4b2ac2ea2b Merge branch 'master' into terms 2010-04-19 21:05:54 +01:00
Tom Hughes
ae4ece2450 Don't send "408 Request timeout" responses from the data browser as it 
seems to make some browsers automatically retry.
 2010-04-19 14:28:02 +01:00
Matt Amos
9a9e13af90 Bit more work on the contributor terms page - still very much a work-in-progress. 2010-04-12 23:55:05 +00:00
Tom Hughes
898c47e647 Present the contributor terms as part of the initial signup instead of 
during the account confirmation step.
 2010-03-26 18:55:17 +00:00
Matt Amos
b99e870291 Initial version of contributor terms changes. 2010-03-22 22:51:09 +00:00
Tom Hughes
7f1691e878 Update the inbox link in the greeting bar when messages are marked 
as read or unread.
 2010-03-14 16:02:30 +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
Tom Hughes
74852271c9 Fix the selection of the message to be deleted. 2010-03-06 00:26:32 +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
938cbcd862 Allow a logged in user to relogin as a different user just by visiting 
the login page.
 2010-02-28 14:36:07 +00:00
Tom Hughes
acd72861ed Rework the user details screen to be less crap... Highlights include: 
- Map is smaller and placed to the side with lists of friends
    and nearby users (now excluding friends) beside it.

  - Map includes friends as well as nearby users.

  - Friend and nearby user lists include photos and links to
    friend/unfriend as appropriate.

  - OAuth settings link moved up with all the other links in the
    main navigation bar.

The addition of friends to the map also carries through to the user
settings page.
 2010-02-27 18:11:04 +00:00
Tom Hughes
e076d824bf Make sure we report "no results" when Nominatim's reverse geocoder fails 
to find any results.
 2010-02-27 12:52:30 +00:00
Tom Hughes
fbe529d87e Remove unused set_home method from user controller. 2010-02-27 00:02:22 +00:00
Tom Hughes
c55490d24e Move support for adding and deleting user images to the user settings 
page and reposition the user image ont he user page in the top right
corner of the page.
 2010-02-26 23:44:43 +00:00
Tom Hughes
3851a672e2 Ajaxify the mark read/unread function for messages so it doesn't 
reload the whole page each time.
 2010-02-26 16:35:36 +00:00