Commit graph

5563 commits

Author SHA1 Message Date
Tom Hughes
abd46402a7 Update Potlatch 2 to 2.3-502-g0247dab build 2012-10-18 19:02:31 +01:00
Grant Slater
749caaff73 Add SoTM Scotland banner 2012-10-18 19:00:25 +01:00
Tom Hughes
1b0028574a Update database schema 2012-10-18 18:59:39 +01:00
Tom Hughes
8cdd6b6a1c Improve the user image selection UI 2012-10-18 18:59:39 +01:00
Paweł Paprota
ad43499205 Implemented Gravatar support 2012-10-18 18:59:38 +01:00
Tom Hughes
9f560df39d Recover properly from a failed notes load
Patch OpenLayers so that it doesn't consider an area as loaded if
the HTTP request fails, so that it will try and load the area when
you zoom back in again.
2012-10-16 13:09:52 +01:00
Tom Hughes
c0ee3f65bb Disable buttons while form submission is in progress 2012-10-16 12:23:27 +01:00
Tom Hughes
e2f1d6017d Update list of filtered methods in notes controller 2012-10-16 12:15:37 +01:00
Tom Hughes
3fb931f9a8 Merge branch 'master' into notes 2012-10-15 22:38:13 +01:00
Tom Hughes
e54f9ed6af Replace htmlize call by rich text to_html call 2012-10-15 22:36:52 +01:00
Tom Hughes
654d22ed2e Return the body of a note comment as a rich text object 2012-10-15 22:34:55 +01:00
Tom Hughes
324c37a39b Fix links to user notes 2012-10-15 22:24:39 +01:00
Tom Hughes
44b084dc3a Update Potlatch 2 to 2.3-500-g740307e build 2012-10-15 19:28:30 +01:00
Tom Hughes
e166ff1303 Potlatch 2 localisation updates 2012-10-15 19:28:09 +01:00
Tom Hughes
bfcc3235c5 Remove SOTM US advert 2012-10-15 19:15:54 +01:00
Siebrand Mazeland
5c693d5471 Localisation updates from http://translatewiki.net. 2012-10-15 11:10:25 +00:00
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