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

2906 commits

Author SHA1 Message Date
Yuki Shira
a65125e93a Replace trace.trace_paging_nav.previous/next by older/newer 2013-04-28 10:36:42 +01:00
Tom Hughes
a14abfe90b Tone down the anonymous edit warning for notes 
Increase the saturation of our standard warning colour a little so
that it is more visible, and then switch notes to using the warning
colour instead of the error colour.
 2013-04-27 16:47:25 +01:00
Tom Hughes
d48b1ccdf2 Replace the title in the note popup with a permalink 2013-04-27 11:51:51 +01:00
Tom Hughes
4a69512ce4 Reduce corner radius on all leaflet popups 2013-04-27 11:31:02 +01:00
Tom Hughes
e2b364d002 Increase whitespace between comments in the note popup 2013-04-27 11:23:58 +01:00
Tom Hughes
899dab08f9 Cancel any existing object load before starting a new one 2013-04-27 11:15:32 +01:00
Tom Hughes
e932418998 Remove the flatten_comment methd from the Note model 2013-04-26 19:35:20 +01:00
Tom Hughes
5dda4196d5 Rework the generation of descriptions in the notes RSS feed 2013-04-26 19:34:32 +01:00
Tom Hughes
b1308a87be Show OSM objects for Nominatim search results as map overlays 2013-04-26 00:39:26 +01:00
Tom Hughes
aeeb30ce3c Improve wrapping in the data browse on narrow windows 2013-04-25 17:44:40 +01:00
John Firebaugh
66ce4c3b93 Fix P2 interaction with search links 
Need to prevent the default action so that the page isn't
reloaded.

Also, since the click event binding uses delegation, it isn't
necessary to wrap it in $(document).ready().
 2013-04-25 17:37:57 +01:00
Tom Hughes
47a75be1c7 Use the correct longitude for links when browsing changesets 2013-04-25 17:27:01 +01:00
Tom Hughes
6e33cf0871 Fix exception with GPX and RSS notes#index when no notes are found 2013-04-24 19:17:13 +01:00
Tom Hughes
273ae4c729 Wrap XML notes responses in an <osm> wrapper 2013-04-24 18:18:20 +01:00
Tom Hughes
b0a84cf1bf Explicitly set text/plain as the type for error responses 2013-04-24 17:46:45 +01:00
Tom Hughes
95c3a4439e Call set_locale for all notes actions 2013-04-24 10:51:37 +01:00
Tom Hughes
36bd2468e0 Fix exeption in GeoRSS formatting for notes 2013-04-24 10:20:35 +01:00
Tom Hughes
925bd812a2 Fix exception with XML notes#index when no notes are found 2013-04-24 09:41:08 +01:00
Tom Hughes
0c8ad2f86e Merge branch 'notes' 
Conflicts:
	Vendorfile
 2013-04-23 22:40:21 +01:00
John Firebaugh
32959aed76 Don't display empty changeset comments 
See systemed/iD#1360. We will also change iD to omit empty comments.
 2013-04-22 11:26:58 -07:00
Tom Hughes
1f8bbc2574 Stop text overflowing the richtext preview pane 2013-04-17 22:39:40 +01:00
Tom Hughes
92210a5be1 Allowing wrapping inside the content of a richtext editor 
We disable wrapping on the container to keep the editor and the
help on the same line, but need to turn it back on again inside
the editor so that autogrow can work.
 2013-04-17 22:38:20 +01:00
Tom Hughes
52611a5bfa Merge branch 'master' into notes 2013-04-16 18:22:47 +01:00
Saman Bemel-Benrud
7614534bdb Diary cleanup 
This commit includes a few basic changes to make the user diaries
friendlier and easier to read. I adjusted the text styles and added
a maximum width, to keep the line length under control.
 2013-04-14 17:26:27 +01:00
Tom Hughes
7f598ab412 Merge branch 'master' into notes 
Conflicts:
	Gemfile.lock
	app/views/diary_entry/list.html.erb
 2013-04-08 22:34:37 +01:00
Tom Hughes
979822f697 Add a "Hide" button to notes when viewed by moderators 2013-04-08 22:32:20 +01:00
Tom Hughes
4b669ec1ae Return an updated copy of the note from the delete call 2013-04-08 22:00:26 +01:00
Tom Hughes
030bb31ec1 Allow a comment to be supplied when hiding a note 2013-04-08 21:29:41 +01:00
Tom Hughes
f4b599e8fd Restriction note deletion to moderators 2013-04-08 21:21:31 +01:00
Tom Hughes
c9ec4895ea Fix next/previous links on diary pages properly 2013-04-07 23:09:19 +01:00
Tom Hughes
8baddcb26c Correct next/previous links on diary list page 2013-04-07 18:41:00 +01:00
Matt Amos
3822e8de77 Added database, API and GPX status to capabilities. 2013-04-02 15:05:20 +01:00
Tom Hughes
b92a2de9ec Use changeset and user caches in Changeset#download 2013-04-01 14:18:21 +01:00
Tom Hughes
e6a1003509 Avoid reading nodes twice in WayController#full 2013-04-01 14:18:21 +01:00
Tom Hughes
369d5a0bfd Optimise database reads in DiaryEntry#list 2013-04-01 14:18:21 +01:00
Tom Hughes
4fd89f9f23 Improve selection logic in DiaryEntry#rss 2013-04-01 14:18:21 +01:00
Tom Hughes
8ed6d80b0d Reimplement User#is_friends_with? in a non-insane way 2013-04-01 14:18:21 +01:00
Tom Hughes
a5121f8910 Preload sender/recipient details for messages 2013-04-01 14:18:20 +01:00
Tom Hughes
97e0d5ad1f Add a new write_notes permission needed for OAuth access to notes 2013-03-28 18:50:18 +00:00
Tom Hughes
0a4b860480 Focus on the text field when a note is opened 2013-03-28 15:12:53 +00:00
Tom Hughes
d00994d151 Fix display of updates on newly loaded notes 2013-03-28 14:43:07 +00:00
Tom Hughes
84f7d322d0 Don't try and use OAuth if we don't have a token 2013-03-28 14:29:38 +00:00
Tom Hughes
00a4d9fe49 Tidy up javascript OAuth code 2013-03-28 11:18:58 +00:00
Tom Hughes
15be6b3ffc Add missing padding at right hand end of greeting menu 2013-03-28 00:40:07 +00:00
Tom Hughes
898cc828dd Merge branch 'master' into notes 
Conflicts:
	Gemfile.lock
 2013-03-28 00:36:07 +00:00
Tom Hughes
38255f9f8d Use OAuth for notes API calls and require authentication to close 2013-03-28 00:34:23 +00:00
Tom Hughes
e8d32637c1 Add javascript OAuth support 2013-03-28 00:34:09 +00:00
Tom Hughes
78e8828741 Use changeset and user caches in Changeset#download 2013-03-24 09:52:03 +00:00
Tom Hughes
6300fa2a4f Avoid reading nodes twice in WayController#full 2013-03-24 09:52:03 +00:00
Tom Hughes
9717b81a47 Optimise database reads in DiaryEntry#list 2013-03-24 09:52:03 +00:00