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

481 commits

Author SHA1 Message Date
Tom Hughes
aa4205482a Treat all newly entered blocks of text as Markdown 2012-03-17 16:36:55 +00:00
Tom Hughes
c74180ba0f Update schema 2012-03-09 20:17:21 +00:00
Tom Hughes
11af5c266d Update schema 2012-03-09 00:35:23 +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
fc0b4e2dba Update schema 2012-03-07 16:44:50 +00:00
Tom Hughes
1cc882b23f Fix migration to work with mass assignment protection 2012-03-06 19:00:49 +00:00
Tom Hughes
4065f8f4f3 Update schema 2012-02-23 16:05:58 +00:00
Tom Hughes
e296b8b703 Commit the generated database schema 2012-02-23 15:58:45 +00:00
Tom Hughes
eae5192957 Add image fingerprints to users 2012-02-20 11:53:39 +00:00
Tom Hughes
e70396d70b Replace the file_column plugin with paperclip 2012-02-15 17:48:15 +00:00
Tom Hughes
a29c8f670d Ignore db/structure.sql 2012-02-15 17:48:14 +00:00
Tom Hughes
cd43529cc8 Add support for domain based ACLs 2012-02-08 21:40:21 +00:00
Tom Hughes
9c0d5277ad Combine the address and netmask for an ACL in one column 2012-02-08 14:09:50 +00:00
Tom Hughes
beb0ef6357 Stop pretending we support MySQL 2012-02-08 14:08:49 +00:00
Tom Hughes
3e99bbf5a9 Remove lib prefix from includes for ruby 1.9 compatibility 2012-01-05 20:33:19 +00:00
Tom Hughes
52e5fa6ad7 Merge branch 'master' into openstreetbugs 
Conflicts:
	app/views/browse/_map.html.erb
	app/views/site/index.html.erb
	config/initializers/mime_types.rb
	config/routes.rb
	lib/map_boundary.rb
	lib/migrate.rb
	lib/osm.rb
	vendor/assets/openlayers/OpenLayers.js
 2012-01-05 20:15:53 +00:00
Jason Meinzer
1a65b3ac6f Qualify ActiveRecord::IrreversibleMigration 2012-01-04 22:25:53 +00:00
Jason Meinzer
1aa7b3b6a8 Fix ruby 1.9 syntax error caused by space before parens on method call 2012-01-04 22:25:53 +00:00
Tom Hughes
af2b13c2c1 Require user names and emails to be case insensitively unique 
Any existing clashes are allowed to remain for now, byt any new
accounts, or changes to names on existing accounts, must be unique
without regard to case.
 2011-12-12 19:11:06 +00:00
Tom Hughes
7b89dc6349 Make OAuth work again 2011-11-16 21:13:25 +00:00
Tom Hughes
fc25c3d412 Rename all ID columns that aren't unique 
Having a table with a column called ID that is only part of the
primary key really doesn't work as rails likes to treat ID as a
special name so it becomes impossible to assign to it or read it.
 2011-11-14 09:42:52 +00:00
Tom Hughes
e1213a4651 Use Rails.xxx instead of RAILS_XXX 2011-11-14 09:42:40 +00:00
Tom Hughes
c9fa49c994 Update to rails 3 2011-11-14 09:42:40 +00:00
Tom Hughes
7c98b41cc8 Merge branch 'master' into openstreetbugs 2011-06-22 22:36:43 +01:00
Tom Hughes
e3b8b89330 Mass rename of "bugs" as "notes" for increased user friendliness 2011-05-21 17:22:31 +01:00
Tom Hughes
832b96b75a Merge branch 'master' into openid 
Conflicts:
	app/controllers/user_controller.rb
	app/views/user/terms.html.erb
	test/fixtures/users.yml
 2011-05-21 12:14:56 +01:00
Tom Hughes
882700c5c8 Rename some columns and indexes in the bug tables 2011-05-18 00:36:00 +01:00
Tom Hughes
fb4d003ebe Tidy up some of the map bugs code 2011-05-07 13:05:39 +01:00
Kai Krueger
001ff5764b Merge branch 'master' into openstreetbugs2 2011-04-19 22:00:30 -06:00
Matt Amos
8b12abd5bb Phase 2 CTs implementation and tests, with config parameter 2011-04-03 13:46:16 +01:00
Tom Hughes
0ea9f92be5 Merge branch 'master' into openid 
Conflicts:
	app/controllers/user_controller.rb
 2010-12-05 15:15:55 +00:00
Matt Amos
cd66a5db99 Initial work on support for multiple editors 2010-11-29 12:20:21 +00:00
Grant Slater
60fc060d27 DB Function add standard pgsql include dir too 2010-11-12 15:31:44 +00:00
Tom Hughes
a1cb0f04d4 Merge branch 'master' into openstreetbugs 
Conflicts:
	app/views/site/index.html.erb
 2010-10-17 11:02:11 +01:00
Tom Hughes
f70feedc65 Merge branch 'master' into openid 2010-09-24 09:35:36 +01:00
Tom Hughes
1c3a9ee62b Update oauth models and controllers for OAuth 1.0a support 2010-09-21 16:20:30 +01:00
Tom Hughes
f7009c5781 Fix OpenID migration to not create authentication tables 2010-05-16 12:48:01 +01:00
Tom Hughes
b5d0de88ea Merge branch 'master' into openstreetbugs 2010-05-16 12:13:19 +01:00
Tom Hughes
996e60614d Merge branch 'master' into openid 2010-05-16 12:11:01 +01:00
Tom Hughes
8657cd4724 Fix some bogus down migrations 2010-05-16 12:10:28 +01:00
Tom Hughes
273706ae09 Merge branch 'master' into openstreetbugs 2010-05-14 22:50:38 +01:00
Tom Hughes
9b10cbccb6 Merge branch 'master' into openid 
Conflicts:
	config/locales/is.yml
 2010-05-14 22:50:17 +01:00
Tom Hughes
594960dc63 Add user_id + created_at index to changesets 
Browsing changesets for a user will be much faster if we can get the
user's changesets in date order.
 2010-05-13 18:16:31 +01:00
Tom Hughes
64f373dc59 Merge branch 'master' into openid 
Conflicts:
	app/controllers/user_controller.rb
	app/views/user/new.html.erb
	config/locales/en.yml
	public/stylesheets/common.css
 2010-05-11 21:22:43 +01:00
Tom Hughes
959442d087 Merge branch 'master' into openstreetbugs 2010-05-11 19:53:57 +01:00
Tom Hughes
89ec02ea0a Renumber migration to avoid conflict with master 2010-05-11 19:06:30 +01:00
Ævar Arnfjörð Bjarmason
9ab2048f54 Rename open_id_authentication_tables migration to avoid clash 
If there's another migration on master before this gets merged this'll
probably have to be changed again.
 2010-05-08 18:56:42 +00:00
Tom Hughes
160429e62d Merge branch 'master' into openstreetbugs 
Conflicts:
	lib/osm.rb
 2010-05-07 22:29:09 +01:00
Tom Hughes
f85681c5ce Merge branch 'master' into openid 
Conflicts:
	app/controllers/user_controller.rb
 2010-05-07 22:28:07 +01:00
Tom Hughes
303e5d3eb9 Merge branch 'master' into terms 
Conflicts:
	config/application.yml
	lib/osm.rb
	public/stylesheets/common.css
 2010-05-07 22:23:20 +01:00