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

6641 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
nebulon42
e3b0b7813c update browse symbols changed in osm-carto 2.27.0 2015-02-05 22:05:28 +01:00
Tom Hughes
c093aa481b Remove typo 2015-02-01 14:18:16 +00:00
Tom Hughes
6f762ae184 Set foreground colour for input fields 2015-02-01 14:10:15 +00:00
Tom Hughes
959a076b50 Add some padding to select elements 2015-02-01 11:29:38 +00:00
Tom Hughes
2452576333 Drop redundant css extension from scss files 2015-02-01 10:50:50 +00:00
Thijs Alkemade
17f926fefb Fix two issues with the remember_me_openid button 
1. It didn't work, the code only checked the remember_me button, not
   the remember_me_openid button.

2. It did not have a unique id, making the label next to it not work
   for selecting the checkbox.
 2015-02-01 10:33:45 +00:00
Tom Hughes
d423ae9137 Default background for input fields to white 
Some browsers apparently default form fields to a background based
on the desktop theme, and don't inherit from body.

Fixes #883
 2015-02-01 10:15:00 +00:00
Sarah Hoffmann
2f6f627a76 update list of key-value pairs for nominatim 2015-01-31 22:36:28 +01:00
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
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
Tom Hughes
a6c24e3e5b Query mode doesn't need the database 2014-12-14 00:18:46 +00:00
Tom Hughes
1bfc96ec76 Update bundle 2014-12-08 08:02:00 +00:00
Adam Conrad
9934eed190 Remove unnecessary local variable 
The local variable `app` was unused and therefore not needed
to be declared with initialization
 2014-12-08 07:59:49 +00:00
David Gumberg
b1a1d45576 Losslessly compressed all images using optipng and advpng 2014-12-07 16:36:39 -08:00