CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-04-22 03:36:37 +02:00
Code Issues Packages Projects Releases Wiki Activity
1,293 Commits 2 Branches 0 Tags
29577f7645b191bc4be982b019c05448eb763f37
Commit Graph

1293 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom MacWright 29577f7645 Fix loading inflight requests and clearing history when you switch 
sources
 2013-01-24 10:28:05 -05:00
John Firebaugh 79c169b214 Fix unsaved changes warning 2013-01-23 21:59:53 -05:00
Tom MacWright 2b4b8cb5fe Merge pull request #468 from systemed/labels 
Labels
 2013-01-23 16:21:01 -08:00
Tom MacWright 1a752cba64 Merge branch 'master' of github.com:systemed/iD 2013-01-23 19:15:05 -05:00
Tom MacWright 32ea30c3fb Use isPoi for determining whether points are pois or not 2013-01-23 19:14:54 -05:00
Ansis Brammanis 9008779a18 Fix point label hiding 2013-01-23 19:10:10 -05:00
John Firebaugh 1eedbecee4 Disable edit modes when zoomed out (fixes #473) 2013-01-23 18:59:04 -05:00
Ansis Brammanis 99748dba4e Fix several small label related bugs 2013-01-23 18:54:31 -05:00
John Firebaugh f7a10c1ab6 Fix tests 2013-01-23 18:39:18 -05:00
Ansis Brammanis d14fdfa828 Remove geo.centroid(), use d3's instead 2013-01-23 18:39:14 -05:00
John Firebaugh 2b799ddd7b Improve point rendering 2013-01-23 18:24:17 -05:00
John Firebaugh 5eabb931ff Namespace events 
Fixes an issue where cursor sometimes stopped working.
 2013-01-23 18:24:16 -05:00
Tom MacWright 9041e6470f Yet another global leak 2013-01-23 18:06:01 -05:00
Tom MacWright 54903adc2b No more refnodes 2013-01-23 18:02:38 -05:00
Tom MacWright bda41b812c Optimize and break up parsing 2013-01-23 18:01:56 -05:00
Tom MacWright 8741e69c10 Add source switch 2013-01-23 17:19:19 -05:00
Ansis Brammanis c337182791 Merge remote-tracking branch 'systemed/master' into labels 2013-01-23 17:00:30 -05:00
Ansis Brammanis d387a31177 Add tests for new geo utils 2013-01-23 16:59:08 -05:00
Tom MacWright 1a916ff506 Move keys to separate file, not working on osm.org yet. 2013-01-23 16:56:48 -05:00
Ansis Brammanis 8b43094566 Fix tests 2013-01-23 16:34:23 -05:00
Ansis Brammanis b0de58b455 Fix merge (util.geo -> geo) 2013-01-23 16:29:52 -05:00
Ansis Brammanis 717af998f6 Undo line IDs 2013-01-23 16:22:38 -05:00
Ansis Brammanis 4714763ea3 Add a margin for point labels 2013-01-23 16:18:57 -05:00
Ansis Brammanis 3a48016e5f Merge remote-tracking branch 'systemed/master' into labels 
Conflicts:
	js/id/util.js
 2013-01-23 16:15:29 -05:00
Ansis Brammanis b678486c01 Label bugfixes and cleanup 2013-01-23 16:08:43 -05:00
John Firebaugh 64e8e85187 location.replace (fixes #462) 2013-01-23 15:58:09 -05:00
Tom MacWright 72ba6f52b2 Merge branch 'master' of github.com:systemed/iD 2013-01-23 15:56:02 -05:00
Tom MacWright f605ff85ea Prettier transition for notice, fix notice style. Fixes #438 2013-01-23 15:53:46 -05:00
John Firebaugh 3138ba2805 Handle incomplete relations in SplitWay (fixes #466) 2013-01-23 15:52:35 -05:00
John Firebaugh 72618574f3 Rename permitted -> enabled and add to more actions 2013-01-23 15:33:30 -05:00
Tom MacWright 671e138fcd Fix flash test 2013-01-23 15:32:25 -05:00
Tom MacWright aafcb0df65 Merge branch 'master' of github.com:systemed/iD 2013-01-23 15:28:09 -05:00
Tom MacWright fcf15718d1 Restyle flash modal. Fixes #458 2013-01-23 15:27:47 -05:00
Ansis Brammanis ca9900a91c Halos and proper orientation for line labels 2013-01-23 12:46:39 -05:00
John Firebaugh 18b3331003 Fix event reference 2013-01-23 12:40:27 -05:00
John Firebaugh 278bb4a51c Fix some cases where a degenerate way was created 2013-01-23 12:40:27 -05:00
John Firebaugh 292c916cb1 Converting some actions to entity methods 
The guidelines here are:

Entity methods:
  return a modified entity
  don't necessarily maintain whole-graph consistency

Actions:
  return a modified graph
  always maintain whole-graph consistency
  call entity methods liberally
  generally don't call other actions
 2013-01-23 12:40:27 -05:00
Tom MacWright eefa22531c Simplify indentation, add blocking modals. Fixes #412 2013-01-23 12:30:22 -05:00
Ansis Brammanis 4a87ae8298 Point halos and test width calculation/estimation 2013-01-23 11:48:04 -05:00
Tom MacWright 5c65af512d Test and fixup centerEase 2013-01-23 11:35:31 -05:00
Tom MacWright 75ea4d318e Test centerZoom 2013-01-23 11:22:23 -05:00
John Firebaugh 6f0b715c9f Include new file 2013-01-23 10:35:01 -05:00
John Firebaugh b47bb517cf Sync packaged tests 2013-01-23 10:07:10 -05:00
John Firebaugh 8e92fffa1a Freeze loc 2013-01-23 10:07:10 -05:00
John Firebaugh 29d608970b UnjoinNode action (fixes #442) 2013-01-23 10:07:10 -05:00
Tom MacWright df06148355 Look farther up for up tiles 2013-01-22 18:56:09 -05:00
John Firebaugh 80e2c3d7be Don't make the non-selected layers appear to be disabled 2013-01-22 18:37:38 -05:00
John Firebaugh 9331cd3def Delete obsolete tests 2013-01-22 18:23:53 -05:00
John Firebaugh ce7e6ff831 Consistent iD prefix in tests 2013-01-22 18:23:18 -05:00
John Firebaugh c263ebd4dc iD.util.geo => iD.geo 2013-01-22 18:20:20 -05:00