 keegan-lillo
|
e78c09f5be
|
Merge pull request #54 from pebble/#52/custom-color-picker-layout
#52/custom color picker layout
|
2016-03-16 12:03:13 +11:00 |
|
|
keegan-lillo
|
d8e73f2674
|
Merge branch 'master' into #52/custom-color-picker-layout
|
2016-03-16 11:54:18 +11:00 |
|
|
keegan-lillo
|
0358e820e6
|
Merge pull request #59 from pebble/document-pebblejs
Document Pebble.js usage
|
2016-03-16 11:54:04 +11:00 |
|
|
keegan-lillo
|
1d821f61c3
|
Change Settings.data to Settings.option
|
2016-03-16 11:44:50 +11:00 |
|
|
keegan-lillo
|
e2ffa42595
|
Document Pebble.js usage
|
2016-03-16 11:42:39 +11:00 |
|
|
keegan-lillo
|
3a2dcb187e
|
Merge branch 'master' into #52/custom-color-picker-layout
|
2016-03-16 09:12:39 +11:00 |
|
|
keegan-lillo
|
08e3a21429
|
Merge pull request #56 from pebble/#55/unicode-support
Allow unicode characters in config
|
2016-03-16 09:12:30 +11:00 |
|
|
keegan-lillo
|
42a613caf4
|
Merge branch 'master' into #52/custom-color-picker-layout
|
2016-03-16 08:25:59 +11:00 |
|
|
keegan-lillo
|
4ff38eb0ba
|
Merge branch 'master' into #55/unicode-support
|
2016-03-16 08:25:44 +11:00 |
|
|
keegan-lillo
|
b466c48487
|
Merge pull request #48 from pebble/#47/range-slider-component
#47/range slider component
|
2016-03-16 08:25:06 +11:00 |
|
|
keegan-lillo
|
517d4f84ff
|
Add quotes to slider description
|
2016-03-16 08:12:13 +11:00 |
|
|
keegan-lillo
|
e04a6c9f87
|
Merge branch 'master' into #47/range-slider-component
|
2016-03-15 13:11:32 +11:00 |
|
|
keegan-lillo
|
1f0867985d
|
Merge branch 'master' into #52/custom-color-picker-layout
|
2016-03-15 13:11:24 +11:00 |
|
|
keegan-lillo
|
d0e5988024
|
Merge branch 'master' into #55/unicode-support
|
2016-03-15 13:11:16 +11:00 |
|
|
keegan-lillo
|
d007d48afc
|
Merge pull request #57 from pebble/document-clayconfig-param-in-component-initialize
Document the clayConfig parameter of custom component initializer
|
2016-03-15 13:11:09 +11:00 |
|
|
keegan-lillo
|
07a847457f
|
Document the clayConfig parameter of custom component initializer
|
2016-03-15 13:07:19 +11:00 |
|
|
Keegan
|
9347c9f3d2
|
Allow unicode characters in config
|
2016-03-15 12:06:04 +11:00 |
|
|
Keegan
|
4ee5a7361c
|
When setting the value for the color picker, round it to the closest available value in the layout
|
2016-03-15 04:53:58 +11:00 |
|
|
Keegan
|
dad8b2a025
|
add allowGray option to color picker
|
2016-03-14 03:09:23 +11:00 |
|
|
Keegan
|
d52f6d4aa2
|
Globally increase mocha timeout because Travis struggles sometimes
|
2016-03-14 01:55:22 +11:00 |
|
|
keegan-lillo
|
a94eae9a16
|
Clarify acceptable default values for the color picker.
|
2016-03-14 01:30:41 +11:00 |
|
|
keegan-lillo
|
317f6fd4e8
|
Grammar fixes in color picker docs
|
2016-03-14 01:23:46 +11:00 |
|
|
keegan-lillo
|
b19b07c47d
|
Fix syntax error in Color Picker examples
|
2016-03-14 01:20:07 +11:00 |
|
|
Keegan
|
0a2ddab597
|
Document new color picker functionality
|
2016-03-14 01:02:40 +11:00 |
|
|
Keegan
|
005ac939b1
|
Refine color picker styles
|
2016-03-14 01:01:58 +11:00 |
|
|
Keegan
|
12b0ae9bd6
|
Allow custom layouts in the color picker and automatically choose a layout based on platform
|
2016-03-14 01:01:13 +11:00 |
|
|
Keegan
|
6f92c0d267
|
Merge remote-tracking branch 'origin/master' into #47/range-slider-component
# Conflicts:
# index.js
|
2016-03-12 10:27:27 +11:00 |
|
|
keegan-lillo
|
756cdc0d9e
|
Merge pull request #50 from pebble/#20/allow-user-data
#20/allow user data
|
2016-03-12 10:25:04 +11:00 |
|
|
Keegan
|
783bc84779
|
fix typo in Clay JSdoc
|
2016-03-12 10:22:01 +11:00 |
|
|
Keegan
|
e621bbf0bd
|
Merge remote-tracking branch 'origin/master' into #20/allow-user-data
|
2016-03-12 10:16:47 +11:00 |
|
|
keegan-lillo
|
43c5c3cc9f
|
Merge pull request #51 from pebble/#39/fix-event-targets
Fix events firing on wrong element for button component
|
2016-03-12 10:15:37 +11:00 |
|
|
Keegan
|
d8738e06b2
|
fix tests for slider
|
2016-03-11 11:12:00 +11:00 |
|
|
Keegan
|
67449ec34e
|
Use number for value display in slider because of vendor implementation inconsistencies
|
2016-03-11 11:04:52 +11:00 |
|
|
keegan-lillo
|
5c63b00eda
|
Make slider update value display as user is adjusting it
|
2016-03-11 10:49:23 +11:00 |
|
|
Keegan
|
79eef99731
|
Fix events firing on wrong element for button component
|
2016-03-11 03:57:30 +11:00 |
|
|
Keegan
|
e5496c62d6
|
Add developers to send arbitrary data to the config page
|
2016-03-11 03:36:00 +11:00 |
|
|
Keegan
|
b1a6f184ba
|
Stop exposing config as a reference. resolves #35
|
2016-03-11 02:25:59 +11:00 |
|
|
Keegan
|
878fea0340
|
Allow floats in the slider component and update docs
|
2016-03-11 01:07:17 +11:00 |
|
|
Keegan
|
1142d1adee
|
Renamed ClayConfig.getSettings() to ClayConfig.serialize()
|
2016-03-10 21:00:44 +11:00 |
|
|
Keegan
|
0873f5eba2
|
Added Slider component
|
2016-03-10 04:20:50 +11:00 |
|
|
Keegan
|
0faa585d5f
|
Clean up manipulators tests
|
2016-03-10 00:03:50 +11:00 |
|
|
keegan-lillo
|
3b7c4cda7c
|
Merge pull request #42 from pebble/fix-readme-getsetting-link
Fix link in readme
|
2016-03-09 15:41:01 +11:00 |
|
|
keegan-lillo
|
3839a47f5c
|
Merge branch 'master' into fix-readme-getsetting-link
|
2016-03-09 15:37:16 +11:00 |
|
|
keegan-lillo
|
85503d2846
|
Merge pull request #46 from clach04/readme_json_v_js
Clarify config.json versus config.js differences
|
2016-03-09 15:35:30 +11:00 |
|
|
clach04
|
d6ae6faef4
|
Merge branch 'master' into readme_json_v_js
|
2016-03-08 18:06:23 -08:00 |
|
|
clach04
|
2c2f003e15
|
Clarify config.json versus config.js differences
Make example config clear, main impact is for CloudPebble usage where json is not yet an option.
|
2016-03-08 18:02:49 -08:00 |
|
|
keegan-lillo
|
2bd9623ab1
|
Merge pull request #45 from pebble/release/v0.1.3
Bump version to v0.1.3
v0.1.3
|
2016-03-09 12:46:28 +11:00 |
|
|
keegan-lillo
|
9f3c78de17
|
Bump version to v0.1.3
|
2016-03-09 12:38:10 +11:00 |
|
|
keegan-lillo
|
1af5828b18
|
Update README.md
|
2016-03-09 12:32:51 +11:00 |
|
|
keegan-lillo
|
99dc081b69
|
Merge pull request #41 from pebble/#40/move-settings-conversion
`Clay.getSettings()` now does type conversion, not `ClayConfg.getSettings()`
|
2016-03-09 12:30:31 +11:00 |
|