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

7029 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tom Hughes
16b875b271 Fix broken interpolation 2015-01-26 22:43:52 +00:00
Siebrand Mazeland
32dfa68f90 Localisation updates from https://translatewiki.net. 2015-01-26 23:03:30 +01:00
Dan Stowell
8024ad919c fix typo which prevented directions closebox from working 2015-01-26 20:48:01 +00:00
Richard Fairhurst
df283287e6 Merge pull request #31 from zerebubuth/routing-ui-tweaks-2 
Make directions endpoints own the value and not care which input box the...
 2015-01-26 18:50:41 +00:00
Matt Amos
1b2bfb6e92 Make directions endpoints own the value and not care which input box they get it from. 2015-01-26 18:47:34 +00:00
Richard Fairhurst
904b512998 Merge pull request #30 from zerebubuth/routing-ui-tweaks-2 
Use CSS rather than HTML attributes for styling.
 2015-01-26 18:04:56 +00:00
Matt Amos
7a44ae6cdc Use CSS rather than HTML attributes for styling. 2015-01-26 18:02:00 +00:00
Richard Fairhurst
6214fe0a9f Merge pull request #29 from zerebubuth/routing-ui-tweaks-2 
Revert some of the selection styling changes which cause bizarre styling...
 2015-01-26 17:55:19 +00:00
Matt Amos
b09c14218f Revert some of the selection styling changes which cause bizarre styling regressions to the 80s on FF. 2015-01-26 17:53:24 +00:00
Richard Fairhurst
497009ed2b Merge pull request #28 from zerebubuth/routing-ui-tweaks-2 
Routing UI tweaks, part deux
 2015-01-26 17:26:46 +00:00
Matt Amos
5afe47e3f6 Use larger 'spinner' when waiting for route request. Replace HTML in content to avoid resize. 2015-01-26 17:18:32 +00:00
Matt Amos
376a630756 Fix vertical alignment of text within select input on Firefox. 2015-01-26 16:57:34 +00:00
Matt Amos
56b2fdf5c9 Hide route steps sidebar when user presses close button. 2015-01-26 15:39:53 +00:00
Matt Amos
2dd89f2d08 Geocode pre-filled values when the user presses 'Go'. 2015-01-26 15:39:21 +00:00
Matt Amos
321218f9b1 Make close button on route dialogue return to index. 2015-01-26 15:02:55 +00:00
Matt Amos
9995d316b2 Pre-fill directions 'from' field with search query, if any. 2015-01-26 14:52:18 +00:00
Matt Amos
c3e2e6462f Merge remote-tracking branch 'upstream/master' into routing-ui-tweaks-2 
Conflicts:
	config/locales/de.yml
 2015-01-26 13:14:58 +00:00
Richard Fairhurst
24df66b718 Merge pull request #27 from danstowell/jsrouting-topclosebox 
Use 'close-box' appearance (less confusing) for exit-from-directions
 2015-01-25 16:18:50 +00:00
Dan Stowell
c99841536b Use 'close-box' appearance (less confusing) for exit-from-directions 2015-01-24 13:27:17 +00:00
Siebrand Mazeland
9ad586f08e Localisation updates from https://translatewiki.net. 2015-01-19 09:35:56 +01:00
Tom Hughes
44e44a5198 Only log at info level in production 2015-01-18 19:43:21 +00:00
Amir Wilf
103ba7977f Vagrant deploy works 
Creating extension btree_gist for test DB 'osm_test'
 2015-01-18 14:14:53 +02:00
Tom Hughes
cd2ca12d42 Merge branch 'rails42' 2015-01-17 11:09:13 +00:00
Tom Hughes
821a22c607 Update old changesets to subscribe the creator 2015-01-11 19:44:58 +00:00
Tom Hughes
6e56580278 Remove some (hopefully) redundant code 2015-01-11 12:54:17 +00:00
Tom Hughes
7f81de2065 Don't try and match xmlns as an attribute 
This doesn't seem to work with the new nokogiri based matching
in rails 4.2 probably because the attribute is removed by the
parser and used to set the namespace of the element.
 2015-01-11 12:54:17 +00:00
Tom Hughes
8fa9763281 Set default formats in the database now that rails handles enums 
Because rails now reads the defaults from the database correctly it
no longer works to set them conditionally in after_initialise as they
have already been set.
 2015-01-11 12:54:16 +00:00
Tom Hughes
a9a9ae2cbb Updated for changes in rails HTML testing 2015-01-11 12:53:06 +00:00
Tom Hughes
046fbdc177 Replace deprecated reset method with restore method 2015-01-11 12:53:06 +00:00
Tom Hughes
360d68ea5c Replace deprecated deliver method with deliver_now 2015-01-11 12:53:06 +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
Tom Hughes
e65e41a694 Update to rails 4.2.0 2015-01-10 17:46:58 +00:00
Tom Hughes
0ebbccdcef Fix invalid CSS selectors 2015-01-10 17:45:10 +00:00
Tom Hughes
428f379eef Restore removal of div and style elements when sanitizing HTML 2015-01-10 17:41:17 +00:00
Tom Hughes
dc5c3d6eea Fix login tests to check whether logins succeed/fail as expected 2015-01-10 17:41:00 +00:00
Tom Hughes
84c802d1a9 Use correct URL 2015-01-10 17:40:55 +00:00
Tom Hughes
75a32ff879 Fix broken translations 2015-01-10 15:59:19 +00:00
Tom Hughes
25337c0b04 Use assert_dom_equal to compare HTML text 2015-01-10 15:59:09 +00:00
Tom Hughes
0d7f7944bb Fix invalid CSS selectors 2015-01-10 15:58:30 +00:00
Tom Hughes
316ebb7570 Don't pass ActiveRecord objects to find and exists? 2015-01-10 12:41:16 +00:00
Tom Hughes
6af8f8a9e3 Fix invalid CSS selectors 2015-01-10 12:41:09 +00:00
Tom Hughes
5781674c1b Remove unused performance test stub 2015-01-10 12:41:04 +00:00
Tom Hughes
3058135d9a Update to rails 4.1.9 2015-01-08 10:06:22 +00:00
Siebrand Mazeland
6ac1a593a9 Localisation updates from https://translatewiki.net. 2015-01-02 11:04:15 +01:00
Siebrand Mazeland
b9493f56a3 Localisation updates from https://translatewiki.net. 2014-12-27 17:05:10 +01:00
Tom Hughes
716846b480 Update Potlatch 2 to 2.3-650-gad99430 build 2014-12-20 11:41:47 +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
Tom Hughes
4e6fe811a0 Don't render the offline page for XHR requests 2014-12-14 00:32:50 +00:00
Tom Hughes
2b823b7b07 Make development mode work when the database is offline 2014-12-14 00:27:48 +00:00
Tom Hughes
281dc29c5c Disable the "add note" button in database offline mode 2014-12-14 00:27:31 +00:00