Commit graph

339 commits

Author SHA1 Message Date
Tom Hughes
460a8a106b Update Potlatch 2 to 2.4-46-gea38865 build 2017-03-02 10:33:49 +00:00
Tom Hughes
c8671c137a Update rubocop 2017-02-05 11:12:37 +00:00
Tom Hughes
c985c2d4ce Update Potlatch 2 to 2.4-32-gecf1e0b build 2017-01-19 15:03:56 +00:00
Han Chao
ade561d3e6 Fix clang build error
By default, Clang builds C code in GNU C11 mode, so it uses
standard C99 semantics for the inline keyword:

http://clang.llvm.org/compatibility.html#inline

Closes #1399
2016-12-30 07:38:28 +00:00
Tom Hughes
69b967c9ff Add support for Wikimedia authentication
Closes #1146
2016-12-20 22:32:25 +00:00
Tom Hughes
44e778aedd Increase password stretching to 10000 interations
This is in line with current reccomendations from various sources.
2016-11-25 08:54:57 +00:00
Tom Hughes
2f722fc281 Merge remote-tracking branch 'openstreetmap/pull/1350' 2016-11-09 20:32:54 +00:00
Tom Hughes
282ff4936c Fix rubocop warnings 2016-10-31 21:24:10 +00:00
Andy Allan
5e86393f72 Use webmock to power the with_http_stubs helper
This involves a small amount of changing the fixtures since we're
using the regexp and not the full url matching powers of webmock.
2016-10-30 10:29:16 +01:00
Tom Hughes
e17b89e89f Fix rubocop warnings 2016-10-20 22:35:51 +01:00
Tom Hughes
9d106676b8 Replace quova with support for local Maxmind GeoIP lookups 2016-10-20 21:40:03 +01:00
Tom Hughes
5f4dcd34ff Fix some rubocop warnings 2016-09-15 22:41:07 +01:00
Tom Hughes
d82f9d12ce Fix new rubocop warnings 2016-09-15 19:21:00 +01:00
Tom Hughes
c70a1fe933 Add support for GitHub authentication 2016-07-14 09:40:45 +01:00
Tom Hughes
72e71b9972 Fix rubocop warnings 2016-06-09 22:18:28 +01:00
Tom Hughes
4e95ff1707 Allow redcarpet to add nofollow to links
This, using a new feature in redcarpet, allows us to avoid having
to subclass the renderer and implement links ourselves, which in
turn means that redcarpet's link sanitisation works.
2016-03-24 08:36:32 +00:00
Tom Hughes
5d3ecffa28 Fix new rubocop warnings 2016-02-05 13:35:26 +00:00
Tom Hughes
8fe1899596 Fix rubocop warnings 2016-01-19 09:51:24 +00:00
Tom Hughes
213fa728ea Discard and locale tags that fail to parse 2016-01-07 09:10:19 +00:00
Tom Hughes
4028f4cdb9 Rework locale selection
Implement our own matching algorithm rather than trying to
patch the http_accept_language one and make sure everything is
using it in a consistent way.

Fixes #1125
2016-01-06 18:43:25 +00:00
Tom Hughes
081ac24295 Fix rubocop warnings 2015-11-19 21:41:33 +00:00
Tom Hughes
1dbc655235 Update Potlatch 2 to 2.4-12-g7158c69 build 2015-09-28 08:38:02 +01:00
Tom Hughes
c9d35839be Fix new rubocopy warnings 2015-08-18 20:57:14 +01:00
Tom Hughes
674aef0d3f Update Potlatch 2 to 2.4-4-g37a0924 build 2015-07-05 13:17:24 +01:00
Tom Hughes
957d75295b Fix warnings from rubocop update 2015-06-08 15:59:17 +01:00
Tom Hughes
2b2264ddab Add support for Windows Live authentication 2015-05-19 14:04:09 +01:00
Tom Hughes
c9893e186b Add support for Facebook authentication 2015-05-19 14:04:08 +01:00
Tom Hughes
eeb9866d50 Add support for Google OAuth2 authentication
This replaces OpenID authentication, which is going away soon, but
provides an upgrade path where we can migrate users that already have
a Google OpenID setup to the new system transparently.
2015-04-14 10:08:07 +01:00
Tom Hughes
2af0840ff3 Fix style issues found by new rubocop version 2015-04-14 09:38:24 +01:00
Tom Hughes
33790824d6 Use Faraday in place of Net::HTTP so we can mock responses 2015-03-01 19:22:46 +00:00
Tom Hughes
9fb8f5a84b Drop the old output_compression plugin
The production servers all have mod_deflate enabled anyway, which
almost certainly does a better job of compression than this.
2015-03-01 10:52:28 +00:00
Tom Hughes
f04211b172 Improve test coverage 2015-02-27 00:40:37 +00:00
Tom Hughes
dbe165bbb3 Fix some rubocop rails style issues 2015-02-26 00:12:54 +00:00
Tom Hughes
a6b84a0294 Fix more rubocop style issues 2015-02-24 23:12:02 +00:00
Tom Hughes
00e1deeb86 Drop iconv which is deprecated and only needed for ruby 1.8 support 2015-02-22 19:21:34 +00:00
Tom Hughes
8e404f3a46 Fix some more rubocop style issues 2015-02-20 20:39:52 +00:00
Tom Hughes
dc2a2c8ebd Standardise on double quoted strings 2015-02-20 19:47:26 +00:00
Tom Hughes
5cbd4038ed Fix rubocop style issues 2015-02-20 08:56:16 +00:00
Tom Hughes
baf10cd392 Fix rubocop lint issues 2015-02-20 08:56:16 +00:00
Tom Hughes
ef7f3d800c Fix most auto-correctable rubocop issues 2015-02-20 08:56:16 +00:00
Tom Hughes
34e3e51456 Cleanup trailing whitespace 2015-02-20 08:56:16 +00:00
Tom Hughes
ac7bb003ec Cleanup migrations
Cleanup our migrations, replacing as much of our custom code
and monkey patching with modern standard rails methods.
2015-01-11 12:53:01 +00:00
Bryan Housel
068471fc0e Don't raise APIAlreadyDeletedError when deleting with if-unused
related: openstreetmap/iD#2475
2014-12-15 23:39:46 -05:00
Łukasz Gurdek
14ac1babc2 Changeset discussions
Add support for commenting on changesets with RSS feeds and email
notification of comments to other commenters and people that have
chosen to subscribe to a changeset.
2014-10-23 21:24:51 +01:00
Tom Hughes
366ba78901 Update Potlatch 2 to 2.3-645-g81e8bcb build 2014-10-14 11:10:06 +01:00
Tom Hughes
b6af236b05 Update Potlatch 2 to 2.3-632-g1a1f24a build 2014-08-06 08:53:03 +01:00
Tom Hughes
17ce58df35 Update postgres connection adaptor patches 2014-07-04 19:24:25 +01:00
Tom Hughes
098c2675ba Add support for ACL blocks on note commenting 2014-06-03 20:59:25 +01:00
Tom Hughes
28b8863627 Remove unused (and non-functioning) code 2014-02-26 18:53:25 +00:00
Tom Hughes
98184dfb9c Reorganise tests to match modern rails test layout 2014-02-26 00:13:19 +00:00