16273 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Saman Bemel-Benrud	16b42b8e81	adding logo.	2013-01-31 08:18:44 -05:00
Saman Bemel-Benrud	578d4eebdf	everything but logo.	2013-01-31 08:18:42 -05:00
Saman Bemel-Benrud	8a7f18d8f7	Merge branch 'master' of github.com:systemed/iD	2013-01-30 19:09:25 -05:00
Saman Bemel-Benrud	1b495870c0	grammar for tooltips, keybinding hints, other tooltip fixes.	2013-01-30 19:09:10 -05:00
Tom MacWright	eb504a3e23	Correctly rewrite users	2013-01-30 18:18:19 -05:00
Ansis Brammanis	9d37f146cc	Merge pull request #565 from systemed/graph-perf2 ... graph performance	2013-01-30 14:43:45 -08:00
Ansis Brammanis	35cefceba6	Fix partial redraws	2013-01-30 17:43:14 -05:00
Tom MacWright	e63434f437	Rename, titles, edit distance	2013-01-30 17:41:06 -05:00
Tom MacWright	2cb3e5849d	First shot at presets ... This includes a first JSON scheme and a bad-looking UI currently in inspector.	2013-01-30 17:30:04 -05:00
Saman Bemel-Benrud	b28fd051db	Merge branch 'master' of github.com:systemed/iD	2013-01-30 17:27:50 -05:00
Saman Bemel-Benrud	792531d48a	fixed tooltip sizing / positioning/	2013-01-30 17:27:28 -05:00
Ansis Brammanis	9862238a84	Fix graph.rebase()	2013-01-30 17:04:51 -05:00
Ansis Brammanis	b73d18cbf5	Merge remote-tracking branch 'systemed/master' into graph-perf2	2013-01-30 16:58:44 -05:00
John Firebaugh	639f1b6977	Stub in splash screen (#567)	2013-01-30 16:44:27 -05:00
Ansis Brammanis	a82b81a3c2	Add tests for #replace #remove #rebase	2013-01-30 16:40:00 -05:00
John Firebaugh	e4c513ae87	midpoint = true -> type = 'midpoint' ... Makes it more consistent with entities.	2013-01-30 16:24:33 -05:00
John Firebaugh	363cd53af1	Rearrange code	2013-01-30 16:17:30 -05:00
John Firebaugh	168a3b5e26	Fix drawing on midpoints (fixes #559)	2013-01-30 16:14:29 -05:00
John Firebaugh	dbac370c71	More draw refactoring	2013-01-30 16:14:29 -05:00
Ansis Brammanis	2fa48df9a1	Small parentWays, parentRelations perf improvements	2013-01-30 16:09:15 -05:00
Saman Bemel-Benrud	0a5cdb393a	Merge branch 'master' of github.com:systemed/iD	2013-01-30 15:54:56 -05:00
Saman Bemel-Benrud	c1348e231e	fix inspect icon on warnings.	2013-01-30 15:54:36 -05:00
John Firebaugh	e381b6ab26	Extract AddMidpoint action	2013-01-30 15:47:33 -05:00
John Firebaugh	459dc00ce5	Change the midpoint data a bit ... Store the ways which share the segment and the index of the segment. This will be used in both DragWay and Draw behaviors.	2013-01-30 15:47:33 -05:00
Ansis Brammanis	a317859b0f	Don't re-add removed parentways, don't duplicate	2013-01-30 15:44:03 -05:00
Saman Bemel-Benrud	b50160b4d9	more screwing around with button styles.	2013-01-30 15:29:10 -05:00
Ansis Brammanis	1b5a1b8268	Merge takes an entities object, not graph	2013-01-30 14:20:39 -05:00
Ansis Brammanis	5a35b6bfa4	Fix difference	2013-01-30 14:11:54 -05:00
Ansis Brammanis	e08364d492	working parentRels	2013-01-30 13:18:44 -05:00
Ansis Brammanis	ba68a238fe	Working rebase	2013-01-30 12:26:40 -05:00
John Firebaugh	217577da95	Exit MoveWay mode on undo (fixes #562)	2013-01-30 12:02:49 -05:00
John Firebaugh	6576ec6501	Operation sprites	2013-01-30 11:56:49 -05:00
Tom MacWright	30d7296a00	Relative path for loader	2013-01-30 11:38:53 -05:00
Saman Bemel-Benrud	a2c713ca93	Merge branch 'master' of github.com:systemed/iD	2013-01-30 11:27:28 -05:00
Saman Bemel-Benrud	ec4f4266ad	fix overflow in commit dialog.	2013-01-30 11:27:03 -05:00
John Firebaugh	bfa823f71d	Fix hover	2013-01-30 10:57:37 -05:00
John Firebaugh	7f0b449307	Add background color slider	2013-01-30 10:57:37 -05:00
Saman Bemel-Benrud	17007b0661	Merge branch 'master' of github.com:systemed/iD	2013-01-30 10:39:53 -05:00
Saman Bemel-Benrud	0dd7bbc1ff	update source graphics.	2013-01-30 10:39:42 -05:00
John Firebaugh	c787d9f4a2	Add areas to rendering test	2013-01-30 10:36:11 -05:00
John Firebaugh	13e7d03395	Fix build	2013-01-29 19:02:34 -05:00
Saman Bemel-Benrud	089f84bf90	Merge branch 'master' of github.com:systemed/iD	2013-01-29 18:57:29 -05:00
Saman Bemel-Benrud	8d78aa060b	fix layout for tag reference image.	2013-01-29 18:57:14 -05:00
John Firebaugh	b30acae5c5	Fix tests	2013-01-29 18:49:50 -05:00
Tom MacWright	38743a602f	Merge branch 'master' of github.com:systemed/iD	2013-01-29 18:48:55 -05:00
Tom MacWright	f6415e3b2d	Merge branch 'translation'	2013-01-29 18:48:11 -05:00
John Firebaugh	2008fa1d92	Don't show an empty menu	2013-01-29 18:45:10 -05:00
John Firebaugh	f31dcd32a2	Add keybindings for all operations	2013-01-29 18:45:10 -05:00
John Firebaugh	9b2860d01a	Futuristic radial menu tooltips	2013-01-29 18:45:10 -05:00
John Firebaugh	6559b7015f	Futuristic radial menu (fixes #548)	2013-01-29 18:45:10 -05:00