Tom Hughes
|
0037502426
|
Merge branch 'master' into notes
Conflicts:
Gemfile.lock
app/views/browse/_map.html.erb
app/views/site/index.html.erb
|
2012-10-13 15:55:34 +01:00 |
|
Richard Fairhurst
|
012d5b69c6
|
Provide example of correct attribution
|
2012-10-12 21:06:56 +01:00 |
|
Tom Hughes
|
4d91fe3dd9
|
Merge branch 'master' into openstreetbugs
Conflicts:
Gemfile
app/helpers/application_helper.rb
app/views/site/index.html.erb
|
2012-09-20 16:01:24 +01:00 |
|
Martijn van Exel
|
5f0c590c32
|
Add a banner for SOTM US
|
2012-09-16 16:20:53 +01:00 |
|
Tom Hughes
|
3787918d68
|
Remove SOTM advert
|
2012-09-08 14:32:27 +01:00 |
|
Tom Hughes
|
a5f5dcce5d
|
Remove unused osmarender key data
|
2012-08-31 09:30:44 +01:00 |
|
Tom Hughes
|
0d3a9ed9cb
|
Merge branch 'master' into openstreetbugs
Conflicts:
Gemfile.lock
app/views/browse/_map.html.erb
app/views/user/view.html.erb
config/locales/en.yml
config/openlayers.cfg
db/structure.sql
vendor/assets/openlayers/OpenLayers.js
|
2012-08-22 20:52:08 +01:00 |
|
Tom MacWright
|
a9a5b6ef38
|
Revise SOTM logo design
|
2012-08-21 22:19:56 +01:00 |
|
Tom Hughes
|
3445f447cd
|
Add a SOTM advert to the sidebar
|
2012-08-08 21:37:29 +01:00 |
|
Tom MacWright
|
f436a5cd2b
|
Improve presentation of homepage
Collapse search button into icon, deemphasize copy and remove
extraneous borders.
|
2012-08-08 18:20:48 +01:00 |
|
Tom Hughes
|
bd14832cb5
|
Rearrange layer switcher assets
|
2012-03-28 21:18:47 +01:00 |
|
Tom MacWright
|
8f4ed911e0
|
Introduce a new layer switcher
The new layer switcher behaves the same as the standard one but
has less cruft and more attractive styling.
|
2012-03-28 21:06:08 +01:00 |
|
Tom Hughes
|
eb789dbf75
|
Show an animation while a preview is loading
|
2012-03-17 16:36:58 +00:00 |
|
Tom Hughes
|
e660e60966
|
Merge branch 'master' into openstreetbugs
Conflicts:
Gemfile
Gemfile.lock
lib/migrate.rb
|
2012-03-08 18:23:27 +00:00 |
|
Tom Hughes
|
48ad9eff45
|
Remove unused image
|
2012-03-04 10:37:33 +00:00 |
|
Tom Hughes
|
f2150a94cf
|
Serve up paperclip attachments in a cache friendly way
|
2012-02-21 12:31:38 +00:00 |
|
Tom Hughes
|
3ecf431f7e
|
Move notes resources to assets directory
|
2012-01-07 16:36:58 +00:00 |
|
Tom Hughes
|
b8445ad3b2
|
Serve the favicon through the assets pipeline
|
2011-12-30 22:32:55 +00:00 |
|
Tom Hughes
|
8acdba8bdd
|
Upgrade to rails 3.1.0
|
2011-11-14 09:42:52 +00:00 |
|