Commit Graph

23511 Commits

Author SHA1 Message Date
Conor_Mack 647b33b167
Merge pull request #419 from Budibase/colorpicker/bugfixes
Minor bug fixes
2020-07-03 16:22:41 +01:00
Conor_Mack cf42dbb514 Merge pull request #419 from Budibase/colorpicker/bugfixes
Minor bug fixes
2020-07-03 16:22:41 +01:00
cmack 787a49ee48 Minor bug fixes 2020-07-03 16:16:38 +01:00
cmack 6bf394fde5 Minor bug fixes 2020-07-03 16:16:38 +01:00
Michael Shanks 60ff21b159 hiding the `<EmptyModel />` for now 2020-07-03 14:44:25 +01:00
Michael Shanks cb0492886b hiding the `<EmptyModel />` for now 2020-07-03 14:44:25 +01:00
Michael Shanks 817abccfd4 Merge branch 'master' into bugfixes 2020-07-03 14:07:43 +01:00
Michael Shanks cf696f109d Merge branch 'master' into bugfixes 2020-07-03 14:07:43 +01:00
Michael Shanks db56390251
Merge pull request #417 from mjashanks/autoinit
auto init of budibase when electron starts
2020-07-03 14:06:18 +01:00
Michael Shanks b146158357 Merge pull request #417 from mjashanks/autoinit
auto init of budibase when electron starts
2020-07-03 14:06:18 +01:00
Conor_Mack 80b5ec4ed9
Merge pull request #418 from Budibase/colorpicker/moz-prefixes-and-x-pos-awareness
Moz Prefixes and X Positional Awareness
2020-07-03 13:46:07 +01:00
Conor_Mack 0ad2152e97 Merge pull request #418 from Budibase/colorpicker/moz-prefixes-and-x-pos-awareness
Moz Prefixes and X Positional Awareness
2020-07-03 13:46:07 +01:00
cmack 3a145ab154 Moz Prefixes and X Positional Awareness 2020-07-03 13:38:51 +01:00
cmack 03dabc5810 Moz Prefixes and X Positional Awareness 2020-07-03 13:38:51 +01:00
Michael Shanks 2bf5702bca #416 auto init of budibase when electron starts 2020-07-03 13:03:50 +01:00
Michael Shanks 69b05d6f93 #416 auto init of budibase when electron starts 2020-07-03 13:03:50 +01:00
Martin McKeaveney 454d1be4c8 Merge branch 'master' of github.com:Budibase/budibase into deployment 2020-07-03 09:16:27 +01:00
Martin McKeaveney 63ca4c094e Merge branch 'master' of github.com:Budibase/budibase into deployment 2020-07-03 09:16:27 +01:00
Martin McKeaveney 5cc358e496 deployment E2E 2020-07-02 23:22:20 +01:00
Martin McKeaveney 5ecc8d4a54 deployment E2E 2020-07-02 23:22:20 +01:00
Michael Shanks 83b1ace561
Merge pull request #414 from mjashanks/master
#383 rename Model > Table (ui only) & #290 field name validation
2020-07-02 21:25:44 +01:00
Michael Shanks 551086b5b8 Merge pull request #414 from mjashanks/master
#383 rename Model > Table (ui only) & #290 field name validation
2020-07-02 21:25:44 +01:00
Michael Shanks 1dc406e1d7 DataTable should not display type & modelId 2020-07-02 21:22:21 +01:00
Michael Shanks 2a7926a677 DataTable should not display type & modelId 2020-07-02 21:22:21 +01:00
Michael Shanks 0fd9047030 #290 field name validation 2020-07-02 21:09:49 +01:00
Michael Shanks 1da37b1fa5 #290 field name validation 2020-07-02 21:09:49 +01:00
Martin McKeaveney f8593da365 Merge branch 'master' of github.com:Budibase/budibase into deployment 2020-07-02 20:52:50 +01:00
Martin McKeaveney 993eb71019 Merge branch 'master' of github.com:Budibase/budibase into deployment 2020-07-02 20:52:50 +01:00
Michael Shanks 8cc59447b8 #383 rename Model > Table (ui only) 2020-07-02 20:38:02 +01:00
Michael Shanks 4346bce4fd #383 rename Model > Table (ui only) 2020-07-02 20:38:02 +01:00
kevmodrome acc2acddba
fetching keys now done correctly 2020-07-02 21:25:25 +02:00
kevmodrome 0ae8c425ee fetching keys now done correctly 2020-07-02 21:25:25 +02:00
kevmodrome dc35808aea
update process.env with new value 2020-07-02 21:01:34 +02:00
kevmodrome 160c3ef7c4 update process.env with new value 2020-07-02 21:01:34 +02:00
kevmodrome 7a7ad75e12
adds getEnvironmentVariables function 2020-07-02 20:31:26 +02:00
kevmodrome e3e5caaf97 adds getEnvironmentVariables function 2020-07-02 20:31:26 +02:00
kevmodrome f6f2dfb8e4
dummy methods wired up to return values to the front-end 2020-07-02 18:38:00 +02:00
kevmodrome a5d33854da dummy methods wired up to return values to the front-end 2020-07-02 18:38:00 +02:00
kevmodrome 03980182d2
fetches keys correctly on the front-end 2020-07-02 17:55:36 +02:00
kevmodrome b6f3a1e32d fetches keys correctly on the front-end 2020-07-02 17:55:36 +02:00
kevmodrome aabde78c47
sets up dummy back-end 2020-07-02 17:53:09 +02:00
kevmodrome d8e6bd0ab9 sets up dummy back-end 2020-07-02 17:53:09 +02:00
Michael Shanks 4f82b0c0aa
Merge pull request #409 from mjashanks/bugfixes
Some simple fixes
2020-07-02 16:34:19 +01:00
Michael Shanks b930dd4739 Merge pull request #409 from mjashanks/bugfixes
Some simple fixes
2020-07-02 16:34:19 +01:00
Conor_Mack 0f5ef9f8c2
Merge pull request #411 from Budibase/colorpicker/swatch-updates
Swatch and Title Attributes Updates / Fixes
2020-07-02 16:33:00 +01:00
Conor_Mack 8d8eb83ae6 Merge pull request #411 from Budibase/colorpicker/swatch-updates
Swatch and Title Attributes Updates / Fixes
2020-07-02 16:33:00 +01:00
kevmodrome d5b85ba8d7
adds tab to settings modal on front-end to display API Keys 2020-07-02 17:28:33 +02:00
kevmodrome 6ca49403df adds tab to settings modal on front-end to display API Keys 2020-07-02 17:28:33 +02:00
cmack a945a99db7 Merge branch 'colorpicker/swatch-updates' of https://github.com/Budibase/budibase into colorpicker/swatch-updates 2020-07-02 16:27:46 +01:00
cmack bb0be2f347 Merge branch 'colorpicker/swatch-updates' of https://github.com/Budibase/budibase into colorpicker/swatch-updates 2020-07-02 16:27:46 +01:00