Commit Graph

24794 Commits

Author SHA1 Message Date
Conor Mack 690427228f Merge branch 'master' of https://github.com/Budibase/budibase 2020-01-28 13:14:44 +00:00
Martin McKeaveney bf5adaae84
Merge pull request #67 from shogunpurple/fix-bcrypt
fix bcrypt in build
2020-01-28 13:08:21 +00:00
Martin McKeaveney 449b173605 Merge pull request #67 from shogunpurple/fix-bcrypt
fix bcrypt in build
2020-01-28 13:08:21 +00:00
Martin McKeaveney 598aa5f8fa fix bcrypt in build 2020-01-28 13:06:35 +00:00
Martin McKeaveney 00df10bbd5 fix bcrypt in build 2020-01-28 13:06:35 +00:00
Conor_Mack a4a822a121 Aliasing config and additional test button component for test app (#66)
* Fix for field modal infinite render loop once closed from click away

* Added rollupgenerators to md to keep builder happy

* Beginning the button component and general setup

* Aliasing config and additional test button component for test app
2020-01-28 13:00:05 +00:00
Conor_Mack 71abc2a38d Aliasing config and additional test button component for test app (#66)
* Fix for field modal infinite render loop once closed from click away

* Added rollupgenerators to md to keep builder happy

* Beginning the button component and general setup

* Aliasing config and additional test button component for test app
2020-01-28 13:00:05 +00:00
Michael Shanks 4ac68c8ab1 Merge commit '90f6eea6c89f61b575028aa7059d7aca476f6e12' 2020-01-28 11:57:12 +00:00
Michael Shanks fff4a361c9 Merge commit '63c73915d33ccae0311f7f0e4a3002b4eb390a21' 2020-01-28 11:57:12 +00:00
Michael Shanks 44b7f455f5 Merge branch 'master' of github.com:Budibase/budibase 2020-01-28 11:00:56 +00:00
Michael Shanks 511834492d Merge branch 'master' of github.com:Budibase/budibase 2020-01-28 11:00:56 +00:00
Martin McKeaveney 621cfddd68
Merge pull request #65 from Budibase/builder-frontend
Builder frontend
2020-01-28 10:47:57 +00:00
Martin McKeaveney c4e167ce04 Merge pull request #65 from Budibase/builder-frontend
Builder frontend
2020-01-28 10:47:57 +00:00
Conor Mack e958c01487 Merge branch 'BUDIBASE-MASTER' 2020-01-28 10:06:41 +00:00
Conor Mack 42a309e581 Merge branch 'BUDIBASE-MASTER' 2020-01-28 10:06:41 +00:00
Martin McKeaveney ee400ec708 Run Budibase Dev Server from top level, server side watch mode (#64)
* better dev command

* update readme
2020-01-28 09:11:08 +00:00
Martin McKeaveney bc6f671668 Run Budibase Dev Server from top level, server side watch mode (#64)
* better dev command

* update readme
2020-01-28 09:11:08 +00:00
Michael Shanks 90f6eea6c8 Merge branch 'master' into control-flow 2020-01-27 15:55:33 +00:00
Michael Shanks 63c73915d3 Merge branch 'master' into control-flow 2020-01-27 15:55:33 +00:00
Michael Shanks ff06c727b9
md components - getting TestApp to work (#63) 2020-01-27 15:26:38 +00:00
Michael Shanks ed3caec114 md components - getting TestApp to work (#63) 2020-01-27 15:26:38 +00:00
Michael Shanks 1067179577 md components - getting TestApp to work 2020-01-27 15:22:58 +00:00
Michael Shanks 3d156de687 md components - getting TestApp to work 2020-01-27 15:22:58 +00:00
Michael Shanks 08f921ad66 fixing broken build :( 2020-01-27 14:07:04 +00:00
Michael Shanks 8c10349eba fixing broken build :( 2020-01-27 14:07:04 +00:00
Conor Mack 743f22ad7b Added rollupgenerators to md to keep builder happy 2020-01-27 13:10:16 +00:00
Conor Mack 43b77a2572 Added rollupgenerators to md to keep builder happy 2020-01-27 13:10:16 +00:00
Martin McKeaveney 17e22b4da7 merge 2020-01-27 12:16:03 +00:00
Martin McKeaveney 62a9a3ee45 merge 2020-01-27 12:16:03 +00:00
Conor Mack 9cfccce85e Merge branch 'master' of https://github.com/Budibase/budibase 2020-01-27 11:24:58 +00:00
Conor Mack 29153c4eb8 Merge branch 'master' of https://github.com/Budibase/budibase 2020-01-27 11:24:58 +00:00
Michael Shanks ee5a4e8c96
MD components library - empty proj (#61)
Added a shell Material Design components packages
2020-01-27 10:59:56 +00:00
Michael Shanks 2907da62e9 MD components library - empty proj (#61)
Added a shell Material Design components packages
2020-01-27 10:59:56 +00:00
Michael Shanks 7f58036659 few mores tests for control flow 2020-01-27 09:01:32 +00:00
Michael Shanks 64b3d8fa2f few mores tests for control flow 2020-01-27 09:01:32 +00:00
Michael Shanks fdc8867e66 render function, with code blocks - tested simple cases 2020-01-26 22:56:36 +00:00
Michael Shanks 9a857dcd77 render function, with code blocks - tested simple cases 2020-01-26 22:56:36 +00:00
Michael Shanks 66b991b07d refactored initialiseChildren into seperate file 2020-01-25 06:24:48 +00:00
Michael Shanks 80514d07bc refactored initialiseChildren into seperate file 2020-01-25 06:24:48 +00:00
Michael Shanks 468fdf1807 removed binding references to array type 2020-01-25 05:52:59 +00:00
Michael Shanks b0c1ace9f0 removed binding references to array type 2020-01-25 05:52:59 +00:00
Martin McKeaveney dda9d91413
Merge pull request #60 from shogunpurple/dev-improvements
Dev improvements
2020-01-24 16:55:27 +00:00
Martin McKeaveney 42fd1210c2 Merge pull request #60 from shogunpurple/dev-improvements
Dev improvements
2020-01-24 16:55:27 +00:00
pngwn c2d99e173b Remove unused validateProps module and tests 2020-01-24 16:39:25 +00:00
pngwn 0490441d09 Remove unused validateProps module and tests 2020-01-24 16:39:25 +00:00
Martin McKeaveney 231a1ab3e3 build process improvements and gitignore 2020-01-24 16:31:53 +00:00
Martin McKeaveney 9ebe7bec5c build process improvements and gitignore 2020-01-24 16:31:53 +00:00
Martin McKeaveney 4611970896 removing final package lock, gitignore on builder folder 2020-01-24 15:56:14 +00:00
Martin McKeaveney f06beeeada removing final package lock, gitignore on builder folder 2020-01-24 15:56:14 +00:00
pngwn 1a77b0ae00 Remove leftovers. 2020-01-24 15:34:44 +00:00