Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

kamis3ci #1237

Closed
wants to merge 1,772 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
1772 commits
Select commit Hold shift + click to select a range
af0ae25
Revert e04cab86 and add explicit small screen rules for overlay sidebar
tomhughes Jul 28, 2015
63dbfc1
Validate page numbers in URLs
tomhughes Jul 28, 2015
81d79f5
Simplify new-note marker placement - always in the centre
danstowell Aug 9, 2015
166dc76
Make notes GPX valid and add useful official elements
marcows Aug 10, 2015
1b6c214
Add tests for new note GPX elements
tomhughes Aug 10, 2015
caa1a01
Hide hidden notes and comments correctly in the data browser
tomhughes Aug 12, 2015
5dc3e5b
Don't show hidden notes to non-moderators in the user notes list
tomhughes Aug 12, 2015
6f5acd2
Enable https for thunderforest layers
tomhughes Aug 13, 2015
ea4e33e
Update html5shiv to 3.7.3
tomhughes Aug 13, 2015
05fb8b3
Update leaflet polyline plugin
tomhughes Aug 13, 2015
bd1a466
Update jquery.cookie
tomhughes Aug 13, 2015
6910434
Apply a timeout to most changeset API calls
tomhughes Aug 14, 2015
0d01d06
added missing wording for note "not found" and "timeout"
HolgerJeromin Aug 18, 2015
ad3ba42
Fix double XML declaration on trace RSS feeds
tomhughes Aug 18, 2015
4f31859
Make button on OAuth authorization screen translatable
tomhughes Aug 18, 2015
7ce7700
Update bundle
tomhughes Aug 18, 2015
c9d3583
Fix new rubocopy warnings
tomhughes Aug 18, 2015
036519a
Add missing parenthesis
tomhughes Aug 19, 2015
41eb7a1
Test rendering of OAuth authorization page
tomhughes Aug 19, 2015
618526b
Don't treat flash messages as raw
tomhughes Aug 24, 2015
ee9ac19
Update to rails 4.2.4
tomhughes Aug 24, 2015
20139c0
Notes: show first comment as marker tooltip
simon04 Apr 14, 2015
6d511fb
Directions, read "to" location in URL - fixes #998
simon04 Aug 26, 2015
2520bdb
Close layers panel on double-clicking a layer
simon04 Aug 26, 2015
91bd0b4
Display number of comments in changeset list
simon04 Aug 27, 2015
e479a82
Mark some flash messages as html safe
tomhughes Aug 27, 2015
d0998f3
Merge remote-tracking branch 'openstreetmap/pull/1043'
tomhughes Aug 27, 2015
dca0be1
Merge remote-tracking branch 'openstreetmap/pull/1045'
tomhughes Aug 27, 2015
db7374f
Merge remote-tracking branch 'openstreetmap/pull/1040'
tomhughes Aug 27, 2015
037585d
Merge remote-tracking branch 'openstreetmap/pull/903'
tomhughes Aug 27, 2015
9a9b045
Merge remote-tracking branch 'openstreetmap/pull/891'
tomhughes Aug 27, 2015
fe4d505
Update test for changes in #903
tomhughes Aug 27, 2015
9ceb077
Update to Leaflet 0.7.4
tomhughes Sep 1, 2015
e3de1c4
Update to Leaflet 0.7.5
tomhughes Sep 2, 2015
ec9b21b
Localisation updates from https://translatewiki.net.
siebrand Sep 10, 2015
66285e2
Fix interpolation errors
tomhughes Sep 10, 2015
46d2e4c
Update bundle
tomhughes Sep 13, 2015
284b56b
Use image_optim to optimize SVG assets with svgo
tomhughes Sep 13, 2015
ecc4b64
Use HTML5 picture element to prefer SVG logo
HolgerJeromin Sep 12, 2015
d27eb63
Disable jpegtran
tomhughes Sep 13, 2015
a0aa5a1
Removed bogus filter:url(#filter6591-2); from sprite
HolgerJeromin Sep 12, 2015
d377e8b
Use picture elements to render some more graphics as SVG
tomhughes Sep 13, 2015
0d0498d
Use SVG for sprites for better high DPI support
tomhughes Sep 13, 2015
9aaea24
Converted inkscape font info to font-family
HolgerJeromin Sep 14, 2015
37a4fc6
Add srcset to img tags inside picture elements
HolgerJeromin Sep 14, 2015
92d284a
Update to iD v1.7.4
bhousel Sep 16, 2015
8140814
Allow iD in iframe to request fullscreen
bhousel Sep 16, 2015
bafadbd
Localisation updates from https://translatewiki.net.
siebrand Sep 25, 2015
36cbda3
Sprockets 3 seems to be OK now
tomhughes Sep 18, 2015
1dbc655
Update Potlatch 2 to 2.4-12-g7158c69 build
tomhughes Sep 28, 2015
7dd23a4
Move the MapQuest API key to the configuration file
tomhughes Sep 28, 2015
2d6fb57
Make MapQuest API key conditional
tomhughes Sep 28, 2015
38213ab
Allow jQuery to construct the routing URLs
tomhughes Sep 28, 2015
31c80f6
Use jsonp for MapQuest as CORS doesn't seem to be working
tomhughes Sep 28, 2015
24eaeb2
Fix jshint warning
tomhughes Sep 28, 2015
e54eade
Add support for Mapzen's Valhalla routing engine
tomhughes Sep 29, 2015
8df1212
Scale total distance to metres for Mapzen
tomhughes Sep 30, 2015
d1d784b
Ensure assets are recompiled when configuration changes
tomhughes Sep 30, 2015
3f93341
Make travis copy example.application.yml to application.yml
tomhughes Sep 30, 2015
3c771a7
Improve error handling for routing engines
tomhughes Sep 30, 2015
509f07b
Switch back to the upstream omniauth-google-oauth2 gem
tomhughes Oct 2, 2015
f4a43c3
Close html <source> tags
balrog-kun Oct 4, 2015
ee5e4ac
Add ferry routing information for OSRM
simon04 Oct 6, 2015
d2765cb
Merge remote-tracking branch 'openstreetmap/pull/1068'
tomhughes Oct 12, 2015
3932c6b
User ferry icon for kFerryEnter with Mapzen routing
tomhughes Oct 12, 2015
6078c3e
Localisation updates from https://translatewiki.net.
siebrand Oct 14, 2015
91d2271
Localisation updates from https://translatewiki.net.
siebrand Oct 22, 2015
57a9c0d
Remove inline property of secondary links on diary page
sonalkr132 Oct 26, 2015
2b015ff
Update leaflet to 0.7.7
tomhughes Oct 26, 2015
447fef4
Merge remote-tracking branch 'openstreetmap/pull/1078'
tomhughes Oct 26, 2015
e62e879
Add more detail to OpenGraph tags
tomhughes Oct 26, 2015
18d26c0
Use PNG logo for og:image
tomhughes Oct 27, 2015
c8640c8
Add og:url to OpenGraph tags
tomhughes Oct 27, 2015
243129b
Add og:description to OpenGraph tags
tomhughes Oct 27, 2015
a082bae
Don't send changeset comment notifications to deleted users
tomhughes Oct 30, 2015
c9fdd5d
Don't send note comment notifications to deleted users
tomhughes Oct 30, 2015
f9570c4
Update key and data browser for new road colours
AndrewHain Nov 1, 2015
82b4c8e
Pass title to opengraph routine
tomhughes Nov 5, 2015
db78390
Update to iD v1.8.0
bhousel Nov 8, 2015
3297444
Icon for shop=car_parts added
Edward17 Nov 8, 2015
ed151fd
Hide .describe_location on push and popstate
sonalkr132 Nov 13, 2015
c96eb7d
Update image_optim and disable cleanupIDs plugin
tomhughes Nov 19, 2015
081ac24
Fix rubocop warnings
tomhughes Nov 19, 2015
7f3bb52
Update to rails 4.2.5
tomhughes Nov 19, 2015
c56bf56
Switch back to the upsteam image_optim
tomhughes Nov 21, 2015
33b5af5
Don't update urlhash while in intro
bhousel Nov 23, 2015
d218d5b
Fix display of raw HTML in flash message
tomhughes Nov 30, 2015
d02ea8a
Allow closing the sidebar when a timeout occured
floscher Dec 5, 2015
e20bb50
Fix issues with bogus % encoded sequences in URLs
tomhughes Dec 7, 2015
ec9d2fd
Merge remote-tracking branch 'openstreetmap/pull/1085'
tomhughes Dec 7, 2015
bb9f207
Merge remote-tracking branch 'openstreetmap/pull/1082'
tomhughes Dec 7, 2015
988ee11
Facebook emails are verified
Zverik Nov 30, 2015
d46b68d
Use ruby 2.1.7 for travis
tomhughes Dec 7, 2015
8368f90
Merge remote-tracking branch 'openstreetmap/pull/1099'
tomhughes Dec 7, 2015
03356be
Use correct title in og:title for pages with no title
tomhughes Dec 7, 2015
0d2e160
Enable https for humanitarian layer
tomhughes Dec 7, 2015
a694609
Remove 9.0 extension install instructions
pnorman Dec 10, 2015
f7b6d76
Update documentation to say ruby 2.0 is required
tomhughes Dec 10, 2015
e5c4822
Update to iD v1.8.2
bhousel Dec 11, 2015
bd4de52
Support using iD on Internet Explorer 11 and above
bhousel Dec 11, 2015
98e2884
Remove test for iD and Internet Explorer
bhousel Dec 11, 2015
8c38faa
Update to iD v1.8.3
bhousel Dec 11, 2015
9dd5dab
Remove inline javascript from login page
tomhughes Dec 12, 2015
67f3658
Preserve URL fragments through external authentication
tomhughes Dec 12, 2015
3babcd9
Update Potlatch 2 to 2.4-16-g0c126d0 build
tomhughes Dec 16, 2015
18b8fc6
Add rel=nofollow to links to tagless nodes in browse pages
tomhughes Dec 20, 2015
febff23
Fix deprecation warnings in migrations
tomhughes Dec 21, 2015
da6cf37
Update rss.rss.builder
bmarchant Dec 23, 2015
6c1917c
Add Host: to robots.txt
Firefishy Dec 26, 2015
3bd07d1
It's a magnifying glass, stupid...
simonpoole Dec 28, 2015
b0a4a93
Add ImageMagick to list of packages to install
tuxayo Dec 30, 2015
66fccfd
Vagrant: Virtualbox: increase RAM and put 2 CPUs
tuxayo Dec 30, 2015
fb6830d
Update vagrant provision script with current install commands
tuxayo Dec 30, 2015
1efbcc3
Vagrant: Fix locale setup problem
tuxayo Dec 31, 2015
5f4b7d3
Merge remote-tracking branch 'openstreetmap/pull/1117'
tomhughes Dec 31, 2015
4028f4c
Rework locale selection
tomhughes Jan 6, 2016
5ffdcee
Update to iD v1.8.4
bhousel Jan 6, 2016
213fa72
Discard and locale tags that fail to parse
tomhughes Jan 7, 2016
1aff968
Add some tests for the locale library
tomhughes Jan 7, 2016
409e99c
Precompile login.js
tomhughes Jan 10, 2016
e128e78
Move routing API endpoint addresses to config file
tomhughes Jan 11, 2016
7d53513
Add routing URLs to example config
tomhughes Jan 11, 2016
17d166b
Use ruby 2.1.8 on travis
nikolas Jan 13, 2016
cb43e6a
Update to iD v1.8.5
bhousel Jan 18, 2016
2ef6a96
Update bundle
tomhughes Jan 19, 2016
8fe1899
Fix rubocop warnings
tomhughes Jan 19, 2016
77c25dc
Validate characters in changeset comments
tomhughes Jan 19, 2016
e4acc41
Update to tails 4.2.5.1
tomhughes Jan 25, 2016
14f1777
Localisation updates from https://translatewiki.net.
siebrand Jan 27, 2016
2f08f06
Localisation updates from https://translatewiki.net.
siebrand Jan 28, 2016
7df0fee
Localisation updates from https://translatewiki.net.
Nikerabbit Feb 1, 2016
c706199
Update bundle
tomhughes Feb 5, 2016
5d3ecff
Fix new rubocop warnings
tomhughes Feb 5, 2016
fd0d21d
Update Potlatch 2 to 2.4-21-g233799c build
tomhughes Feb 7, 2016
afde083
Localisation updates from https://translatewiki.net.
Nikerabbit Feb 8, 2016
4a9a08a
Localisation updates from https://translatewiki.net.
Nikerabbit Feb 11, 2016
b2f2188
Remove sprockets-rails version restriction now konacha is fixed
tomhughes Feb 11, 2016
8008dc9
Update rubocopy config after bug fixes
tomhughes Feb 11, 2016
be624d6
Avoid using Rails.application.assets as it no longer set in production
tomhughes Feb 11, 2016
5bf5819
Localisation updates from https://translatewiki.net.
Nikerabbit Feb 15, 2016
341f6cd
Do not hyperlink profiles of deleted users
sonalkr132 Feb 15, 2016
80c46f5
Create new translation string for deleted user
sonalkr132 Feb 15, 2016
3238bf5
Merge remote-tracking branch 'openstreetmap/pull/1154'
tomhughes Feb 15, 2016
f0219a0
Localisation updates from https://translatewiki.net.
siebrand Feb 19, 2016
ec64ea8
Localisation updates from https://translatewiki.net.
Nikerabbit Feb 22, 2016
0fe1780
Localisation updates from https://translatewiki.net.
Nikerabbit Feb 25, 2016
480c17b
Preserve username and "remember me" when login fails
tomhughes Feb 26, 2016
f0fa701
Treeat user as logged in after a password reset
tomhughes Feb 26, 2016
fa593d8
Make capitalisation of user menu entries consistent
tomhughes Feb 29, 2016
398b448
Change "blocks received" to "active blocks"
tomhughes Feb 29, 2016
3ca254d
Localisation updates from https://translatewiki.net.
Nikerabbit Feb 29, 2016
95bf36e
Update rails to 4.2.5.2
tomhughes Feb 29, 2016
2d7a678
Update to iD v1.9.0
bhousel Mar 1, 2016
bbd40f9
Localisation updates from https://translatewiki.net.
Nikerabbit Mar 3, 2016
47881ad
Add traffico icons to vendor/assets/iD and asset pipeline precompile …
bhousel Mar 2, 2016
2059c83
Update to iD v1.9.1
bhousel Mar 3, 2016
fea08ef
Merge remote-tracking branch 'openstreetmap/pull/1172' into next
tomhughes Mar 3, 2016
397b68a
Only compile those iD assets that we actually need
tomhughes Mar 4, 2016
cf597c1
Remove debug statement
tomhughes Mar 4, 2016
0cbc683
Compile traffico font assets
tomhughes Mar 4, 2016
9f9ba18
Correct URL of Mapzen metro extracts
tomhughes Mar 4, 2016
0ff7a92
Fix query tool to get correct bounds for enclosing ways
tomhughes Mar 6, 2016
6e154d4
Ignore bounds on elements with geometry
tomhughes Mar 6, 2016
37d6512
Improve styling of "signup blocked" page
tomhughes Mar 7, 2016
fe04a0c
Update to rails 4.2.6
tomhughes Mar 7, 2016
b7bea9c
Use rake test:db to do initial test run
tomhughes Mar 8, 2016
6c3fd1e
Consistent blue marker colour for sharing location
simon04 Mar 8, 2016
f10ad91
Localisation updates from https://translatewiki.net.
siebrand Mar 9, 2016
f94340b
Fix tests that made assumptions about tag ordering
tomhughes Mar 9, 2016
bb489ed
Merge remote-tracking branch 'openstreetmap/pull/1174'
tomhughes Mar 9, 2016
6f144e8
Show ref of object when no name is present
simon04 Mar 9, 2016
ca5de5b
Merge remote-tracking branch 'openstreetmap/pull/1122'
tomhughes Mar 9, 2016
151a48d
Open new tab/window for "report a problem" link
floscher Jan 15, 2016
544ed36
Enebale I18n for embedded maps
tomhughes Mar 9, 2016
fbf2b45
Make "Report a problem" link in embeddable map translateable
floscher Jan 15, 2016
860887d
Merge remote-tracking branch 'openstreetmap/pull/1120'
tomhughes Mar 9, 2016
56122bb
Localisation updates from https://translatewiki.net.
Nikerabbit Mar 14, 2016
6c34885
Fix error and inconsistencies INSTALL.md
simon04 Mar 14, 2016
07cbf7f
We require PostgreSQL 9.1 for CREATE EXTENSION
tomhughes Mar 14, 2016
359d030
Only the standard layer can be exported
simon04 Mar 14, 2016
5175ee6
Add title to changeset feeds
simon04 Mar 13, 2016
246d8a4
Test titles in changeset feed
tomhughes Mar 14, 2016
f3fa97f
Wrap user name in `bdi` to provide a separate RTL context
simon04 Mar 14, 2016
5f495b4
Notes: show first comment as marker tooltip
simon04 Apr 14, 2015
16f5a5a
Merge remote-tracking branch 'openstreetmap/pull/954'
tomhughes Mar 14, 2016
38180c5
Don't pass the locale to the Mapzen routing engine
tomhughes Mar 15, 2016
145839a
Localisation updates from https://translatewiki.net.
Nikerabbit Mar 17, 2016
79df0df
Correctly sort the Copyright item in the compact menu
marcows Mar 17, 2016
c9c4464
Update to iD v1.9.2
bhousel Mar 18, 2016
2d2334d
Make list items highligh colour darker
Self-Perfection Nov 21, 2015
945ff79
Merge remote-tracking branch 'openstreetmap/pull/954'
tomhughes Mar 20, 2016
6be39fc
Make support email address configurable
tomhughes Mar 20, 2016
e782b21
Update bundle
tomhughes Mar 20, 2016
a95748b
Handle overpass errors reported as remarks
tomhughes Mar 20, 2016
6c4448b
Increase overpass API timeout
tomhughes Mar 20, 2016
3daeb21
Localisation updates from https://translatewiki.net.
Nikerabbit Mar 21, 2016
ce6d796
Localisation updates from https://translatewiki.net.
Nikerabbit Mar 24, 2016
4e95ff1
Allow redcarpet to add nofollow to links
tomhughes Mar 24, 2016
c4579c7
Localisation updates from https://translatewiki.net.
Nikerabbit Mar 28, 2016
414388f
Update bundle
tomhughes Mar 28, 2016
8fd70ff
Make vagrant provision script stop on error
tomhughes Mar 28, 2016
7b96de3
Localisation updates from https://translatewiki.net.
Nikerabbit Mar 31, 2016
eea093b
Localisation updates from https://translatewiki.net.
Nikerabbit Apr 4, 2016
d17df07
Localisation updates from https://translatewiki.net.
Nikerabbit Apr 7, 2016
8278c9a
Localisation updates from https://translatewiki.net.
Nikerabbit Apr 11, 2016
bf3482e
Localisation updates from https://translatewiki.net.
Nikerabbit Apr 14, 2016
930c299
Localisation updates from https://translatewiki.net.
Nikerabbit Apr 18, 2016
57eb391
Localisation updates from https://translatewiki.net.
Nikerabbit Apr 21, 2016
c3c6cfd
Remove old config files.
gravitystorm Apr 22, 2016
2f06610
Remove 9 year old warning
gravitystorm Apr 22, 2016
21e1ff6
Remove database readme
gravitystorm Apr 22, 2016
8c23f36
Merge remote-tracking branch 'openstreetmap/pull/1208'
tomhughes Apr 24, 2016
f207664
Fix broken link to Vagrant downloads page
MattHeard Apr 3, 2016
d83954a
Update to iD v1.9.3
bhousel Apr 25, 2016
537af5d
Localisation updates from https://translatewiki.net.
Nikerabbit May 2, 2016
935c207
Update to iD v1.9.4
bhousel May 4, 2016
a6b88fe
Support passing imagery offset parameter to iD
bhousel May 4, 2016
0a92041
Localisation updates from https://translatewiki.net.
Nikerabbit May 12, 2016
fc8b69f
Localisation updates from https://translatewiki.net.
Nikerabbit May 16, 2016
0fbcfa4
Localisation updates from https://translatewiki.net.
Nikerabbit May 19, 2016
b9c8737
Localisation updates from https://translatewiki.net.
Nikerabbit May 23, 2016
6e981a9
Update to iD v1.9.5
bhousel May 25, 2016
99e0957
Localisation updates from https://translatewiki.net.
Nikerabbit May 26, 2016
cad7115
Localisation updates from https://translatewiki.net.
Nikerabbit May 30, 2016
8c2b7d7
Localisation updates from https://translatewiki.net.
Nikerabbit Jun 2, 2016
7439a35
Localisation updates from https://translatewiki.net.
Nikerabbit Jun 6, 2016
1c8736d
Update to iD v1.9.6
bhousel Jun 7, 2016
174eadf
Localisation updates from https://translatewiki.net.
Nikerabbit Jun 9, 2016
2ea4ecc
Update bundle
tomhughes Jun 9, 2016
72e71b9
Fix rubocop warnings
tomhughes Jun 9, 2016
dbbb6c0
Reflect sucessful trademark registration of State of the Map
simonpoole Jun 10, 2016
8d1a8b2
Localisation updates from https://translatewiki.net.
Nikerabbit Jun 13, 2016
fb234e2
Drop the MapQuest Open layer
tomhughes Jun 15, 2016
16f8acd
Remove more traces of MapQuest Open layer
tomhughes Jun 15, 2016
14048c1
Localisation updates from https://translatewiki.net.
Nikerabbit Jun 16, 2016
ee1cc2a
Localisation updates from https://translatewiki.net.
Nikerabbit Jun 20, 2016
5c572f5
Update bundle
tomhughes Jun 20, 2016
5e27978
Add support for rotating banners, add banners for SOTM, SOTMUS
bhousel Jun 20, 2016
40abfdd
remove debug statement
bhousel Jun 20, 2016
933335a
Set max queuePos high to ensure a banner is shown
bhousel Jun 21, 2016
e14ec15
Refactor banner logic into BannerHelper module
bhousel Jun 22, 2016
3e82a36
Add end dates to banners
bhousel Jun 22, 2016
9e3dc42
Load banner config from config/banners.yml
bhousel Jun 22, 2016
2ada059
Pacify rubocop
bhousel Jun 22, 2016
db40eee
Don't show banner unless content classed with overlay-sidebar
bhousel Jun 23, 2016
e15c00d
Merge remote-tracking branch 'openstreetmap/pull/1240'
tomhughes Jun 23, 2016
49edb79
Rename cookie_id to banner_cookie
tomhughes Jun 23, 2016
7da6602
Add banner for FOSSGIS 2016 conference
PedaB Jun 23, 2016
6403fd2
Switch travis to test on ruby 2.3
tomhughes Jul 1, 2016
46b899a
Switch travis to test on ruby 2.3.1
tomhughes Jul 1, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
sudo: false
language: ruby
rvm:
- 2.3
- 2.3.1
cache: bundler
addons:
postgresql: 9.1
Expand Down