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

137 commits

Author SHA1 Message Date
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
52d7cae438 Update bundle 2015-04-14 09:22:44 +01:00
Tom Hughes
1801419d9d Update to rails 4.2.1 2015-03-23 08:26:30 +00: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
f8f921e09d Add Coveralls support 2015-02-26 19:20:17 +00:00
Tom Hughes
b0150caee6 Convert OpenID authentication to use OmniAuth 2015-02-25 01:07:23 +00:00
Tom Hughes
6671a934bf Add JSHint support 2015-02-23 21:45:57 +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
724a988595 Install rubocop in the test environment 2015-02-22 15:47:23 +00:00
Tom Hughes
dc2a2c8ebd Standardise on double quoted strings 2015-02-20 19:47:26 +00:00
Tom Hughes
e65e41a694 Update to rails 4.2.0 2015-01-10 17:46:58 +00:00
Tom Hughes
3058135d9a Update to rails 4.1.9 2015-01-08 10:06:22 +00:00
Tom Hughes
dc9f779c30 Update to rails 4.1.8 2014-11-17 19:09:22 +00:00
Tom Hughes
ac2f9308b9 Update to rails 4.1.7 2014-11-09 22:41:12 +00:00
Tom Hughes
dae66c21d5 Update to CPK 7.0.11 and drop monkey patch 2014-10-10 12:32:25 +01:00
Tom Hughes
96e1665c01 Update to rails 4.1.6 2014-10-02 19:54:21 +01:00
Tom Hughes
ebe82bbb5d Update to rails 4.1.5 2014-08-19 09:26:34 +01:00
Tom Hughes
87d9ef8ea5 Use autoprefixer to generate CSS prefixes 2014-07-25 19:38:03 +01:00
Tom Hughes
e9fa0055a5 Update to rails 4.1.4 2014-07-04 19:24:26 +01:00
Tom Hughes
bd402599f5 Update to rails 4.1.1 2014-07-04 19:24:25 +01:00
Tom Hughes
bdc3917f20 Update to rails 4.0.5 2014-05-11 10:03:05 +01:00
Tom Hughes
faa77f7bcd Update to rails 4.0.4 2014-03-14 18:58:02 +00:00
John Firebaugh
665abc501c Use Konacha for testing JavaScript 2014-02-27 16:03:22 +00:00
Tom Hughes
60fd6e2f5b Update to rails 4.0.3 2014-02-18 21:38:43 +00:00
Tom Hughes
e36aa53f49 Update to paperclip 4.x and add content type validation 2014-02-10 00:34:23 +00:00
Tom Hughes
3ec53f38a6 Remove version lock on dalli now that ruby-openid is updated 2014-01-29 22:47:17 +00:00
Tom Hughes
58381bbfd4 Stick with dalli 2.6.x for now until ruby-openid is updated 
https://github.com/openid/ruby-openid/pull/67
https://github.com/mperham/dalli/issues/424
 2014-01-18 16:54:20 +00:00
Tom Hughes
d35403f1c7 Load soap4r so IP geolocation works 2014-01-17 19:57:20 +00:00
Tom Hughes
4bd573b0ae Require i18n-js 3.0.0.rc5.3 for proper dependency on configuration 2013-12-09 10:18:31 +00:00
Tom Hughes
cc4bca22b0 Update to rails 4.0.2 2013-12-03 21:09:10 +00:00
Tom Hughes
d375caf7a3 Update to CPK 6.0.1 and drop monkey patch 2013-11-30 10:28:41 +00:00
Tom Hughes
312bc4e72c Drop ejs as we aren't using it anymore 2013-11-24 16:43:06 +00:00
Tom Hughes
21d713005f Update to rails 4.0.1 2013-11-01 22:34:18 +00:00
Tom Hughes
05a69b3d25 Update rails-i18n 2013-10-05 10:44:30 +01:00
Tom Hughes
0e9e6e6f8f Upgrade to http_accept_language 2.x 2013-09-24 20:22:44 +01:00
Tom Hughes
0be82cbfb5 Revert back to the upstream oauth-plugin 2013-09-24 15:40:38 +01:00
Tom Hughes
3ba48b313a Upgrade to paperclip 3.x 2013-09-23 14:41:52 +01:00
Tom Hughes
c962b8acfc Remove commented out load of therubyracer 2013-09-22 16:06:50 +01:00
Tom Hughes
255b0b9425 Drop memcached and use dalli as the memcache client 2013-09-22 15:57:22 +01:00
Tom Hughes
0649b0ff5e Update bundle 2013-09-22 10:33:31 +01:00
Tom Hughes
984c6dc114 Update to rails 4.0.0 2013-09-21 11:35:45 +01:00
Tom Hughes
377bdbac83 Stick with bigdecimal 1.1 for ruby 1.9 compatibility 2013-06-30 22:09:33 +01:00
Tom Hughes
694ffd7281 Update bundle 2013-06-30 21:42:39 +01:00
Tom Hughes
61dd2af0a0 Update bundle 2013-05-13 21:18:40 +01:00
Andy Allan
55214bc90b Add vendorer gem to Gemfile 
It's not needed for deployment, so create a development group for it.
 2013-05-13 20:20:01 +01:00
Tom Hughes
898cc828dd Merge branch 'master' into notes 
Conflicts:
	Gemfile.lock
 2013-03-28 00:36:07 +00:00
Tom Hughes
471bc10c0c Lock iconv to version 0.1 as later ones need ruby 1.9 2013-03-24 09:52:00 +00:00
Tom Hughes
42cab8d852 Update to rails 3.2.12 2013-02-11 21:02:26 +00:00
Tom Hughes
3d7eb387a7 Merge branch 'master' into notes 
Conflicts:
	Gemfile.lock
	app/assets/stylesheets/common.css.scss
	app/views/browse/_map.html.erb
	app/views/user/view.html.erb
	config/locales/en.yml
 2013-01-15 21:11:35 +00:00
Tom Hughes
355d62bcf8 Update to rails 3.2.11 2013-01-08 20:37:03 +00:00