Commit Graph

463 Commits

Author SHA1 Message Date
Javier Arce
2e276841bf bump version 2016-02-26 16:53:00 +01:00
Javier Arce
76e7d4baf2 Closes #79 2016-02-26 16:52:03 +01:00
piensaenpixel
cc6005407d Merge branch 'master' of github.com:CartoDB/CartoAssets into add-tooltips 2016-02-26 13:02:02 +01:00
piensaenpixel
6040d5e26f add first tooltips 2016-02-26 12:58:18 +01:00
piensaenpixel
d8f269117a Merge pull request #77 from CartoDB/add-tags
Add tags
2016-02-26 11:29:37 +01:00
Javier Arce
1bc85827ec Fixed typo 2016-02-26 11:17:54 +01:00
piensaenpixel
98ee2aa195 fix hound 2016-02-26 11:03:28 +01:00
piensaenpixel
1487846b73 change markup 2016-02-26 11:00:29 +01:00
piensaenpixel
babf763690 change var name 2016-02-26 10:42:01 +01:00
piensaenpixel
61c25d893e fix hound 2016-02-26 10:29:40 +01:00
piensaenpixel
9a4f2bc265 fix PR 2016-02-26 10:23:53 +01:00
piensaenpixel
7755c46c5e merge master 2016-02-24 19:10:07 +01:00
piensaenpixel
0120c5921b add data type 2016-02-24 19:08:31 +01:00
piensaenpixel
f34ceb1575 add metadata 2016-02-24 18:47:18 +01:00
piensaenpixel
5d432cf6ec Merge pull request #76 from CartoDB/clean-cartoAssets
Clean carto assets
2016-02-24 16:38:54 +01:00
piensaenpixel
b33a64adca bump version 2016-02-24 16:31:57 +01:00
piensaenpixel
04bd83c37c clean cartoassets 2016-02-24 16:20:43 +01:00
piensaenpixel
75d24f72e8 Merge pull request #75 from CartoDB/list-widgets
List widgets
2016-02-24 14:39:51 +01:00
piensaenpixel
7a8ff5a5b0 add vars 2016-02-24 14:23:17 +01:00
piensaenpixel
0591e25d0e add list widgets 2016-02-24 14:21:53 +01:00
piensaenpixel
ee39eb3491 add first commit 2016-02-24 12:01:34 +01:00
Javier Arce
6d273be27a Merge pull request #73 from CartoDB/fix-forms
use flexbox for forms
2016-02-24 11:05:57 +01:00
Javier Arce
f2d4bfd1da Fixes conflicts 2016-02-23 17:21:12 +01:00
piensaenpixel
2dc5456735 merge master 2016-02-23 17:16:25 +01:00
Javier Arce
3d9c012eef Merge with master 2016-02-23 17:12:58 +01:00
Javier Arce
cb9c60ea8c Merge branch 'master' of github.com:CartoDB/CartoAssets 2016-02-23 17:07:21 +01:00
Javier Arce
4567fe4141 Bump version 2016-02-23 17:04:36 +01:00
Javier Arce
a22154e4b3 Merge branch 'master' into fix-forms 2016-02-23 17:04:15 +01:00
piensaenpixel
a5e41c6762 Merge pull request #74 from CartoDB/fake-select
add fake styles
2016-02-23 16:45:35 +01:00
piensaenpixel
33c4e81847 fix hound 2016-02-23 16:35:39 +01:00
piensaenpixel
528684e56a add fake styles 2016-02-23 16:32:51 +01:00
Javier Arce
df5f4b7018 Merge branch 'master' of github.com:CartoDB/CartoAssets 2016-02-23 15:40:22 +01:00
piensaenpixel
78829e693c use flexbox for forms 2016-02-23 13:48:27 +01:00
María Checa
008f6aaf8e Merge pull request #49 from CartoDB/47-color_input
Color bar & option input components
2016-02-23 11:47:06 +01:00
María Checa
d91131ae16 Input option component: minor improvements 2016-02-23 11:39:19 +01:00
María Checa
b7847b25ab Color bar & option input component: minor improvements 2016-02-23 11:23:49 +01:00
María Checa
231e72cfd9 Option input component: minor fix 2016-02-23 11:10:43 +01:00
María Checa
bbc4f383c8 Color bar component: minor fix 2016-02-23 11:03:30 +01:00
María Checa
33608a1197 Color bar component: minor fixes 2016-02-23 10:51:27 +01:00
Javier Arce
fdc9b62cb5 Bump version 2016-02-23 10:15:22 +01:00
María Checa
a2b2fd5581 Color bar & option input components: fixes 2016-02-22 19:35:42 +01:00
María Checa
126b5353ef Option input component: minor fix 2016-02-22 18:12:14 +01:00
María Checa
475376be43 Option input component: ninja fixes 2016-02-22 18:09:52 +01:00
María Checa
e9bdd7017c Option input content: fixes 2016-02-22 17:13:50 +01:00
piensaenpixel
0c025acd65 Merge pull request #72 from CartoDB/menu-bar
Menu bar
2016-02-22 17:12:50 +01:00
piensaenpixel
73a3675b5f fix CR 2016-02-22 17:12:18 +01:00
piensaenpixel
5cdfb1e328 change icon and fix hound 2016-02-22 16:54:08 +01:00
piensaenpixel
137e5d28d0 change markup 2016-02-22 16:44:00 +01:00
piensaenpixel
6ab6774119 add menu editor 2016-02-22 16:39:56 +01:00
María Checa
533dd3b167 Input option component: minor changes 2016-02-22 15:43:26 +01:00