Commit graph

6943 commits

Author SHA1 Message Date
Tom Hughes
781e80181e Restore templating to embed.js
The embed.js file is special because it is used standalone without the
rest of our javascript environment. Closes #909.
2015-02-24 12:42:18 +00:00
Tom Hughes
6d124f8012 Fix some more JSHint issues 2015-02-24 00:30:25 +00:00
Tom Hughes
bd2e999756 Move some javascript functions out of global scope 2015-02-24 00:19:08 +00:00
Tom Hughes
8568c93703 More fixes to fixture loading in tests 2015-02-23 22:34:04 +00:00
Tom Hughes
1596713871 Fix some JSHint complaints 2015-02-23 21:45:57 +00:00
Tom Hughes
6671a934bf Add JSHint support 2015-02-23 21:45:57 +00:00
Tom Hughes
e256c837b5 Eliminate templating from most javascript 2015-02-23 21:45:57 +00:00
Tom Hughes
2cb166cf33 Move querystring.js to vendor tree 2015-02-23 21:45:56 +00:00
Tom Hughes
711e1db5fe Load extra fixtures need for user controller tests 2015-02-22 21:54:22 +00:00
Tom Hughes
fa5c39d9bd Load user_roles fixtures so we know who is an administrator 2015-02-22 19:44:31 +00:00
Tom Hughes
c82c760e9d Load language fixtures before running the language tests 2015-02-22 19:26:53 +00:00
Tom Hughes
9e160ec176 Move memcached for caching if enabled regardless of environment 2015-02-22 19:21:34 +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
2c262b9bb4 Add travis configuration 2015-02-22 19:21:33 +00:00
Tom Hughes
724a988595 Install rubocop in the test environment 2015-02-22 15:47:23 +00:00
Tom Hughes
3ecfef49e9 Change OpenID fields to be text fields
Although technically a URL is required in practive a domain is
often enough, but browsers will reject that in a URL field.
2015-02-22 13:34:08 +00:00
Tom Hughes
8e404f3a46 Fix some more rubocop style issues 2015-02-20 20:39:52 +00:00
Tom Hughes
4f4180e4bd Standardise on "hash rocket" style for hashes 2015-02-20 19:53:13 +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
e1f79d84ad Add rubocop config with impressively large todo list 2015-02-20 08:56:15 +00:00
Minh Nguyễn
ab24163f45 Fixed a typo
Admininstration → Administration
2015-02-19 23:44:06 -08:00
Tom Hughes
27e0084e8f Rename new en-gb locale to en-GB 2015-02-19 16:14:58 +00:00
Siebrand Mazeland
8724ca1f9b Localisation updates from https://translatewiki.net. 2015-02-19 13:19:56 +01:00
Tom Hughes
816404ffe6 Avoid deprecation warning in migration 2015-02-16 22:53:52 +00:00
Tom Hughes
2b7529a3f1 Update example configuration 2015-02-16 22:14:05 +00:00
Tom Hughes
6e9a76e64d Avoid mixed content warnings for the MapQuest logo 2015-02-16 21:48:08 +00:00
Tom Hughes
098f8e98f2 Avoid mixed content warnings when routing queries Nominatim 2015-02-16 21:46:54 +00:00
Tom Hughes
250bb47cc2 Merge remote-tracking branch 'systemed/routing' 2015-02-16 08:30:29 +00:00
Bryan Housel
2dd2b1a6eb fix version in iD.js 2015-02-12 06:37:53 -05:00
Bryan Housel
eb61cc614f Update iD container to support iD 1.7.0 2015-02-12 05:57:12 -05:00
Bryan Housel
59a5b6d1c6 Update to iD v1.7.0 2015-02-12 05:41:04 -05:00
Tom Hughes
27179c8706 Wrap flash messages in a div instead of a paragraph
This allows more complex HTML in the message, closing #896.
2015-02-11 21:32:56 +00:00
Tom Hughes
d5e90c0d87 Add asset wrappers for iD 2015-02-11 19:18:13 +00:00
nebulon42
d371a1b38b update browse symbols changed in osm-carto 2.28.0 2015-02-08 14:54:46 +01:00
Richard Fairhurst
f57698494e Merge pull request #36 from danstowell/jsrouting-closeheaderlater
jsrouting: don't close the smallscreen header until both geocodes entered
2015-02-08 12:59:59 +00:00
Dan Stowell
91dac23254 jsrouting: don't close the smallscreen header until both geocodes entered 2015-02-08 11:11:53 +00:00
Richard Fairhurst
38b9f8f792 Merge pull request #35 from tomhughes/routing
Add basic tests for the directions controller
2015-02-07 12:34:38 +00:00
Tom Hughes
4cef51bcbe Add basic tests for the directions controller 2015-02-07 12:02:42 +00:00
nebulon42
e3b0b7813c update browse symbols changed in osm-carto 2.27.0 2015-02-05 22:05:28 +01:00
Richard Fairhurst
4179fbbbeb Merge pull request #34 from tomhughes/routing
Extend https support to all three routing engines
2015-02-02 14:21:08 +00:00
Richard Fairhurst
6b9e70573b Use document.location.protocol for OSRM 2015-02-02 01:32:48 +00:00
Richard Fairhurst
1add511c52 OSRM and Graphhopper support HTTPS 2015-02-02 01:31:08 +00:00
Tom Hughes
7d32e50e0a Extend https support to all three routing engines 2015-02-01 21:41:06 +00:00
Richard Fairhurst
1f0884a34c Merge pull request #33 from tomhughes/routing
Routing tweaks
2015-02-01 15:22:15 +00:00
Tom Hughes
4be0e9bd10 Merge branch 'master' into routing 2015-02-01 15:10:21 +00:00
Tom Hughes
8adb0846b4 Update to latest upstream polyline decoder 2015-02-01 15:09:15 +00:00