Commit graph

5497 commits

Author SHA1 Message Date
Tom Hughes
e6c400bd14 Correct field name 2012-10-14 16:27:21 +01:00
Tom Hughes
c6be5f3a6f Fix up issues with notes in the data browser 2012-10-14 16:01:37 +01:00
Tom Hughes
5cb9f2b022 Remove unused stylesheet rules 2012-10-14 16:01:36 +01:00
Tom Hughes
9d90474675 Remove unused translations 2012-10-14 16:01:36 +01:00
Tom Hughes
352d9365e4 Improve styling of notes popups 2012-10-14 16:01:36 +01:00
Tom Hughes
513bec8044 Set attributes on newly created notes 2012-10-14 16:01:36 +01:00
Tom Hughes
89fc5a7fdc Refactor note add/update code 2012-10-14 16:01:35 +01:00
Tom Hughes
d57755b737 Allow commenting on, and closing of, notes from the web site 2012-10-14 16:01:35 +01:00
Tom Hughes
8b917ccd60 Allow an optional comment to be given when closing a note 2012-10-14 16:01:35 +01:00
Tom Hughes
f48d8f41d8 Return a copy of the note data on creation and update 2012-10-14 16:01:34 +01:00
Tom Hughes
92ce228cbe Get note comment notification working again 2012-10-14 16:01:34 +01:00
Tom Hughes
91b3d1a83f Include useful URLs in note responses 2012-10-14 13:52:58 +01:00
Tom Hughes
28b4c624b8 Use named routes in note RSS builder 2012-10-14 13:52:58 +01:00
Tom Hughes
361906af9e Localise notes interface 2012-10-14 13:52:54 +01:00
Tom Hughes
73b59c5859 Use EJS templates for notes 2012-10-14 10:17:17 +01:00
Tom Hughes
e3d5e3da52 Refactor notes code to work with recent site changes 2012-10-13 17:16:07 +01:00
Tom Hughes
0037502426 Merge branch 'master' into notes
Conflicts:
	Gemfile.lock
	app/views/browse/_map.html.erb
	app/views/site/index.html.erb
2012-10-13 15:55:34 +01:00
John Firebaugh
14bc538681 Use ejs templates in browse JS 2012-10-13 13:01:00 +01:00
John Firebaugh
24c0bb1c88 Use proj/unproj consistently 2012-10-13 12:58:18 +01:00
John Firebaugh
b95f9115d7 Move browse-related JS to browse.js 2012-10-13 12:57:59 +01:00
John Firebaugh
52daf1dbc4 Move export-related JS to export.js 2012-10-13 12:57:09 +01:00
Tom Hughes
4377418d53 Update database schema 2012-10-13 11:49:52 +01:00
Tom Hughes
99a2b549d4 Drop renaming of sequences
Rails seems to rename sequences automatically now when the
corresponding table is renamed, so we don't need to do it.
2012-10-13 11:49:37 +01:00
Tom Hughes
a63b22a9af Fix require paths in migrations 2012-10-13 11:33:16 +01:00
Richard Fairhurst
012d5b69c6 Provide example of correct attribution 2012-10-12 21:06:56 +01:00
Richard Fairhurst
8438ce7779 Remove Potlatch 1 from edit menu 2012-10-12 21:05:29 +01:00
Tom Hughes
93f6a35bf2 Update Potlatch 2 stylesheet and presets 2012-10-12 21:05:29 +01:00
Tom Hughes
dc079a6b15 Potlatch 2 localisation updates 2012-10-12 21:05:28 +01:00
Siebrand Mazeland
d20cbd3c5c Localisation updates from http://translatewiki.net. 2012-10-07 22:08:10 +00:00
Tom Hughes
68e920a31f Update Potlatch 2 to 2.3-491-gc7ccf78 build 2012-10-07 16:17:01 +01:00
Paweł Paprota
67a03d44a1 Display a diary entry count on the user page 2012-10-07 16:17:01 +01:00
Paweł Paprota
067ff20504 Match wikipedia language prefixes case insensitively
Without this values like "PL:Article" are linked to the English Wikipedia.
2012-10-07 16:03:10 +01:00
Paweł Paprota
8688edf992 Don't remove language prefixes from wikipedia tags
Removing the language prefix from the displayed value of a wikipedia
tag is confusing, so don't do it. Fixes trac #4135.
2012-10-07 16:01:50 +01:00
Tom Hughes
32a9bb9f47 Split long line 2012-10-06 00:13:54 +01:00
John Firebaugh
8d13c39400 Clean up diary_entry.js 2012-10-06 00:07:50 +01:00
John Firebaugh
7f6320ed10 Move diary entry JS to page-specific script file 2012-10-06 00:03:24 +01:00
John Firebaugh
04887011d4 Eliminate interpolation in diary entry JS 2012-10-06 00:02:42 +01:00
Tom Hughes
0858a1a054 Update Potlatch 2 to 2.3-486-g109b096 build 2012-10-05 22:47:19 +01:00
John Firebaugh
237d2ad60d Simplify further by using OSM.home 2012-10-05 22:37:21 +01:00
John Firebaugh
d9d515bf18 Remove unused params code 2012-10-05 22:32:50 +01:00
John Firebaugh
97eee60c99 Remove unnecessary call to closeMapPopup()
In the 'set_location' case no popups are ever opened.
2012-10-05 22:32:05 +01:00
John Firebaugh
330ddc1666 Use jQuery 2012-10-05 22:31:17 +01:00
John Firebaugh
dd1ec4eb9b Move user JS to page-specific script file
In this case it was difficult to eliminate interpolation
in a separate step, so I didn't bother.
2012-10-05 22:24:41 +01:00
John Firebaugh
4f552430b4 Remove unnecessary delete statement 2012-10-05 19:37:21 +01:00
Tom Hughes
762d615859 Don't try and dereference an object that may not exist 2012-10-05 18:01:02 +01:00
Tom Hughes
824a474d93 Refactor updatelinks to avoid exceptions in updateLocation 2012-10-05 16:02:26 +01:00
John Firebaugh
3cf3d888b2 Refactor mapParams to compose better with apiUrl 2012-10-05 15:36:07 +01:00
John Firebaugh
e4ef507c5c Extract OSM.apiUrl 2012-10-05 15:26:54 +01:00
John Firebaugh
c3d1123965 Merge globals.js.erb and params.js 2012-10-05 15:21:47 +01:00
John Firebaugh
e73ab4049f Remove unused assign of @bbox which is no longer used 2012-10-05 15:21:09 +01:00