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

493 commits

Author SHA1 Message Date
Tom Hughes
297b0a0e16 Merge remote-tracking branch 'upstream/pull/1987' 2018-09-10 19:09:31 +01:00
Wil
a182820139 Resolve 96 Rubocop Lint/AmbiguousRegexpLiteral conflicts 2018-09-10 11:28:16 +08:00
Andy Allan
4dd4831c0a Just pass the user object, rather than the display_name, to the user_path helper 2018-09-10 10:54:29 +08:00
Tom Hughes
983e21db2e Merge remote-tracking branch 'upstream/pull/1974' 2018-09-05 19:06:16 +01:00
Tom Hughes
70cca71f38 Merge remote-tracking branch 'upstream/pull/1973' 2018-09-05 19:01:24 +01:00
Andy Allan
de6aa3f015 Rename changeset#list to changeset#index 2018-09-05 15:17:11 +08:00
Andy Allan
5a06a3dffe Rename diary_entry#view to diary_entry#show 2018-09-05 14:52:36 +08:00
Andy Allan
19c26e70a3 Rename user#view to user#show 2018-09-05 14:21:01 +08:00
Tom Hughes
f70edc02f0 Return the "large" image from the user details API call 
Closes #1923
 2018-07-09 20:26:37 +01:00
Tom Hughes
6c225bd01c Only include issues visible to the current user in the count 2018-06-17 01:01:24 +01:00
Tom Hughes
1392e63272 Show count of open issues in the header 2018-06-16 12:40:15 +01:00
Tom Hughes
f7d0a60fc1 Make reportable item titles translatable 2018-06-10 17:05:21 +01:00
Tom Hughes
d3700e6201 Merge branch 'master' into next 2018-06-10 17:02:12 +01:00
David Abián
ed1f441ef3 Concept URIs for Wikidata entities 
Wikidata entities should be linked using concept URIs, which are
permanent. This is the right way of linking web resources according
to the Linked Data principles.

Closes #1884
 2018-05-28 13:02:47 +01:00
Andy Allan
e1c62f1bf2 Remove if_user and similar methods 
Rather than hiding features based on CSS, just avoid including them
in the output. Fixes #1862
 2018-05-16 13:05:20 +08:00
Andy Allan
a0de9b780d Use lazy lookups for user_blocks translations 2018-04-25 12:03:58 +08:00
Andy Allan
7dbf8d8336 Merge branch 'master' into moderation 2018-04-11 09:54:04 +08:00
Andy Allan
32d1afbb18 Create a report_link helper, and use text instead of a flag icon 2018-03-28 11:05:46 +08:00
Štefan Baebler
36a382bb43 Added support for 2 more secondary wikidata tag links 
Listed on in https://wiki.openstreetmap.org/wiki/Key:wikidata :
* name:etymology:wikidata
* network:wikidata
 2018-03-05 08:38:50 +00:00
Andy Allan
424b6ef1cf Merge branch 'master' into moderation 2018-02-28 15:46:25 +08:00
Andy Allan
3006ce9713 Remove reporting of changesets 2018-02-28 14:39:40 +08:00
Andy Allan
3bd06529c7 Refactor reportable_url to just return the url 
Allows removal of the largely duplicate instance_url helper (which
returned the same urls, but with a hard-coded title).
 2018-02-28 13:30:17 +08:00
Andy Allan
2a89bf2e6c Refactor reportable_url helper to focus on just the title choices. 2018-02-28 11:53:43 +08:00
Andy Allan
38efcc2f33 Remove the report_type helper and use the model_name.human to look up translations. 2018-02-28 11:40:00 +08:00
Andy Allan
b955a7e78e Link to diary comments using anchors, rather than showing them alone 
Neither way is perfect, but this is less surprising than seeing a diary
entry with only one comment visible.
 2018-02-28 11:24:00 +08:00
Tom Hughes
a83030dab7 Fix new rubocop warnings 2018-01-22 18:55:45 +00:00
Andy Allan
ae44879213 Merge branch 'master' into moderation 2018-01-21 11:20:19 +00:00
Tom Hughes
be86e4824f Convert various URLs to https 2018-01-08 20:18:21 +00:00
Andy Allan
3276063fcf Remove column sorting 
It's not tested, not working, and so it can come later in a separate PR.
 2017-11-29 17:28:09 +00:00
Andy Allan
effb1b7f41 Merge branch 'master' into moderation 2017-11-29 12:18:39 +00:00
Andy Allan
1b181d4c1d Put specific page titles at the start 
The makes the shortened titles commonly shown on browser tabs more
useful.
 2017-11-22 14:57:26 +00:00
Andy Allan
cb87f02642 Merge branch 'pull/843' into titles 2017-11-22 14:42:16 +00:00
Tom Hughes
b6b9d543ac Fix rubocop warnings 2017-10-29 19:43:02 +00:00
Tom Hughes
f773f67958 Update to rails 5.1.4 2017-10-17 18:49:55 +01:00
Tom Hughes
e16311125e Use Hash#dig to simplify code 2017-10-05 20:22:24 +01:00
Tom Hughes
8dae890a76 Fix rubocop warnings 2017-10-05 19:18:38 +01:00
Andy Allan
e31376e28d Merge branch 'master' into moderation 2017-08-02 12:12:57 +01:00
Tom Hughes
2c9c427587 Convert @user to current_user in helpers 2017-07-27 19:27:17 +01:00
Andy Allan
6f375ef493 Get tests passing. Use factories instead of fixtures. 2017-07-12 11:38:50 +01:00
Andy Allan
dbd88d893f Merge branch 'master' into moderation 2017-07-12 10:16:11 +01:00
Tom Hughes
87a7829eb8 Add some tests for the user helper 2017-07-06 19:11:21 +01:00
Tom Hughes
2357118c46 Avoid using format as a URL parameter name 
This prevents rails confusing it with the builtin format
parameter derived from the URL extension.
 2017-06-03 12:08:35 +01:00
Tom Hughes
5b33f3f8e3 Fix rubocop warnings 2017-06-02 00:08:30 +01:00
Tom Hughes
d7b4f88d5e Remove inline javascript from page header 2017-03-01 21:19:32 +00:00
Tom Hughes
392b68a65f Merge remote-tracking branch 'openstreetmap/pull/1436' 2017-02-23 10:06:42 +00:00
Simon Poole
998a84a1b4 Small improvement to block status display 2017-02-18 18:08:25 +01:00
Herve Saint-Amand
cc65b2d126 Fixed quote style to please rubocop 2017-02-13 12:08:41 +00:00
Herve Saint-Amand
852cc97707 Fixed alignment & underlining bugs in Outlook / WinMail 2017-02-09 20:38:02 +00:00
Herve Saint-Amand
f3941b7ee0 Force the font on every <p> tag 
Without this Outlook and Windows Mail don't honour the font set at the top level. Note that this change predates all the screenshots I uploaded to the wiki on 2017-02-02, I'd just forgotten to commit them.
 2017-02-08 21:34:10 +00:00
Herve Saint-Amand
a371aad9ac Renamed apply_inline_css to style_message as suggested 2017-01-28 23:08:25 +00:00