CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-02-17 11:12:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,273 Commits 2 Branches 0 Tags
develop
Commit Graph

16273 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
d6d1709e7b Trying out radial menus for operations UI (#226) 2013-01-23 15:34:04 -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
John Firebaugh
7f8ff43a0f Fix namespaces and unbinding 2013-01-22 18:16:52 -05:00
John Firebaugh
7b18674e91 This is maybe working on PhantomJS now 2013-01-22 18:15:04 -05:00
John Firebaugh
381794e7a1 Fix Relation#multipolygon for unmatched inner rings (fixes #461) 2013-01-22 17:54:57 -05:00
Ansis Brammanis
daff9c5a2f Labels height pulled from font-size css 2013-01-22 17:40:05 -05:00
John Firebaugh
d74bf1e39a Use proper prototypal inheritance and less dynamic new 2013-01-22 17:38:52 -05:00
John Firebaugh
f2c6227cb3 Fix build 
Failing due to a bug in PhantomJS (a.k.a Webkit), see
https://github.com/tmcw/happen/issues/5
 2013-01-22 17:36:06 -05:00
Saman Bemel-Benrud
533eb704ab Merge branch 'master' of github.com:systemed/iD 2013-01-22 15:15:57 -05:00
Saman Bemel-Benrud
dbd5fc6543 minor style tweak to forms. 2013-01-22 15:15:41 -05:00
John Firebaugh
2e6c23d7ef Fix namespace 2013-01-22 14:58:51 -05:00
Ansis Brammanis
66c0a08d00 Merge remote-tracking branch 'systemed/master' into labels 
Conflicts:
	js/id/renderer/map.js
 2013-01-22 14:55:15 -05:00
John Firebaugh
814c3608db Hook into undos in a different way 
This way doesn't depend on details of keybindings and
the undo button.

Also, implement this in DrawArea mode.
 2013-01-22 14:55:08 -05:00
John Firebaugh
ff15aa8e7b Rewrite d3.keybinding 
A keybinding now represents a set of key commands that can
be unbound as a set. Multiple keybindings are possible, and,
providing a namespace is provided to the constructor, will
not conflict with each other.

Also, key combination strings such as ⌘+A are now supported.
 2013-01-22 14:55:08 -05:00
John Firebaugh
851eae68b8 Match terminology with ReverseWay action 2013-01-22 14:54:30 -05:00
Tom MacWright
6f73ae48d7 Fix global leak 2013-01-22 14:49:28 -05:00
Ansis Brammanis
2b7aa93096 Add classes to labels for styling 2013-01-22 14:47:50 -05:00
Tom MacWright
9a3d545f17 Do not focus text fields after initial placement 2013-01-22 14:42:21 -05:00
Tom MacWright
64445e50ac Slow and fast redraw 2013-01-22 14:17:27 -05:00
Ansis Brammanis
0249d6b3eb Try multiple line label positions 2013-01-22 14:04:19 -05:00
Ansis Brammanis
14272ef200 Add label_stack 2013-01-22 13:03:53 -05:00
Ansis Brammanis
079a456500 Add pathLength to utils 2013-01-22 12:35:15 -05:00