Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity
5,314 Commits 1 Branch 0 Tags 507 MiB
7bd1e9587c
Commit Graph

5314 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikhil Nandagopal
29cf9bb450 Merge branch 'release' into feature/basic-styling 
# Conflicts:
#	src/constants/ActionConstants.tsx
#	src/constants/WidgetConstants.tsx
#	src/editorComponents/CheckboxComponent.tsx
#	src/editorComponents/RadioGroupComponent.tsx
#	src/mockResponses/WidgetCardsPaneResponse.tsx
#	src/pages/Editor/Canvas.tsx
#	src/pages/Editor/EditorDragLayer.tsx
#	src/reducers/entityReducers/index.tsx
#	src/reducers/index.tsx
#	src/utils/WidgetRegistry.tsx
#	src/widgets/BaseWidget.tsx
#	src/widgets/BreadcrumbsWidget.tsx
#	src/widgets/ButtonWidget.tsx
#	src/widgets/CalloutWidget.tsx
#	src/widgets/CheckboxWidget.tsx
#	src/widgets/IconWidget.tsx
#	src/widgets/InputGroupWidget.tsx
#	src/widgets/NumericInputWidget.tsx
#	src/widgets/RadioGroupWidget.tsx
#	src/widgets/TagInputWidget.tsx
#	src/widgets/TextWidget.tsx
 2019-09-13 16:15:49 +05:30
Nikhil Nandagopal
f905417242 added actions & executor sagas 2019-09-13 15:26:11 +05:30
Abhinav Jha
7f28788c6a Merge branch 'feature/widget_properties' into 'release' 
Feature/widget properties

See merge request theappsmith/internal-tools-client!19
 2019-09-13 09:53:53 +00:00
Nikhil Nandagopal
cbc23349c7 added api & query data in entities 2019-09-12 19:14:25 +05:30
Nikhil Nandagopal
6bd89d65a1 added action events to widgets 2019-09-12 17:49:46 +05:30
Nikhil Nandagopal
a33074af79 added action API & interfaces 2019-09-12 17:14:18 +05:30
Nikhil Nandagopal
be5c516db8 added json path 
added action interfaces
 2019-09-12 16:49:38 +05:30
Nikhil Nandagopal
cd1b088568 added widget config reducer 2019-09-12 13:41:25 +05:30
Trisha Anand
57f98d7581 Merge branch 'bug/nestedDataLayout' into 'master' 
Fixes nested data object in Layout. Renamed data to 'dsl'

Closes #43

See merge request theappsmith/internal-tools-server!15
 2019-09-11 11:51:25 +00:00
Trisha Anand
467b3e6db5 Fixes nested data object in Layout. Renamed data to 'dsl' 2019-09-11 11:51:25 +00:00
Trisha Anand
e6ef59295a Merge branch 'feature/page-crud' into 'master' 
CRUD for pages and layouts.

Closes #33

See merge request theappsmith/internal-tools-server!14
 2019-09-11 10:44:31 +00:00
Trisha Anand
07614d8980 CRUD for pages and layouts. 2019-09-11 10:44:31 +00:00
Abhinav Jha
8e8866175c Resolve #5 
- Add Missing Icons
- Remove extraneous components (for Beta)
- Add missing widget cards
 2019-09-10 16:31:48 +05:30
Abhinav Jha
3136515f23 Merge branch 'feature/basic-styling' into 'develop' 
Feature/basic styling

See merge request theappsmith/internal-tools-client!16
 2019-09-09 11:57:29 +00:00
Abhinav Jha
2aeff35ea4 Resolve #2 2019-09-09 16:39:13 +05:30
Abhinav Jha
51d2284c6b Merge branch 'feature/basic-styling' of gitlab.com:theappsmith/internal-tools-client into feature/basic-styling 2019-09-09 16:33:10 +05:30
Abhinav Jha
aafea7a05f Resolve #2 
- Update to latest react-router-dom version
 2019-09-09 16:31:18 +05:30
Abhinav Jha
054b3e85da Update to latest react-router-dom version 2019-09-09 16:25:11 +05:30
Abhinav Jha
69eeb8c586 WIP: Remove extra lint-staged config 2019-09-09 16:02:04 +05:30
Abhinav Jha
6f19e0d17a WIP: Fix Prettier formatting issues and add precommit hook 2019-09-09 16:00:22 +05:30
Abhinav Jha
b9718bdaec WIP: Fix eslint errors 2019-09-09 14:38:54 +05:30
Abhinav Jha
2c34b6d09b WIP: Generate font icons from SVGs using CLI 2019-09-09 13:53:53 +05:30
Trisha Anand
59f85cef96 Merge branch 'app-crud' into 'master' 
Application CRUD

See merge request theappsmith/internal-tools-server!13
 2019-09-09 06:54:36 +00:00
Trisha Anand
7e0cb75ed2 Added domains for application and pages. Edited the layout domain to make it an embedded object inside a page instead of existing in the database on its own. 2019-09-09 06:54:36 +00:00
Arpit Mohan
a03c0a8bde Merge branch 'feature/oauth2-custom-domain' into 'master' 
A hacky approach to limiting the Google OAuth2 to a set of custom domains.

Closes #18

See merge request theappsmith/internal-tools-server!12
 2019-09-09 05:16:42 +00:00
Arpit Mohan
9c47e1cb2f A hacky approach to limiting the Google OAuth2 to a set of custom domains. 
This is not the prettiest way to do it. Ideally, we should send a query parameter to Google with key "hd=example.com" in order to get Google to list accounts with only those domains. For now, we send an error when the domains don't match in a custom `ClientUserRepository` function.
 2019-09-09 05:16:42 +00:00
Abhinav Jha
29d6bd52da WIP: Workflow fixes 2019-09-06 17:10:00 +05:30
Trisha Anand
b5e05e72c6 Merge branch 'signup' into 'master' 
Signup flow

See merge request theappsmith/internal-tools-server!11
 2019-09-06 10:49:48 +00:00
Trisha Anand
bea5f53f46 Signup flow 2019-09-06 10:49:48 +00:00
Abhinav Jha
5a5a5019be Merge branch 'release' into 'master' 
Release

Closes #2

See merge request theappsmith/internal-tools-client!14
 2019-09-06 09:43:00 +00:00
Abhinav Jha
53091a52d0 Merge branch 'feature/basic-styling' into 'release' 
Feature/basic styling

See merge request theappsmith/internal-tools-client!13
 2019-09-06 09:37:49 +00:00
Abhinav Jha
c23724effe Resolve #2 Basic Editor Styling 
- Add Widget Icons
- Font face observer
- Widget Pane styling based on Theme
 2019-09-06 15:00:22 +05:30
gray
6284f07c76 Add default theme base 2019-09-05 23:17:50 +05:30
Arpit Mohan
f71bd9a4e0 Migrating from Tenant nomenclature to Organization. 
This makes it consistent with the terminology that we want in the product. The hierarchy will be organization -> team -> user.
 2019-09-04 15:08:40 +05:30
Arpit Mohan
b7c480801f Merge branch 'feature/test' into 'master' 
Adding JUnit test framework

Closes #44

See merge request theappsmith/internal-tools-server!10
 2019-09-04 09:24:38 +00:00
Arpit Mohan
bf908025e2 Adding some basic unit tests for the TenantService class. We should add more tests for other CRUD flows as well. 2019-09-04 09:24:38 +00:00
Trisha Anand
6c90ce2561 Merge branch 'mongo-changes' into 'master' 
#42

See merge request theappsmith/internal-tools-server!9
 2019-09-03 11:36:49 +00:00
Trisha Anand
4258f85a81 Removed DBRef from action. Added DBRef of plugin because while execution, this will be used. So instead of fetching plugin on every execution, plugin is fetched once during create action and stored as part of action (DBRef). Because of DBRef, eager loading would happen which would lead to plugin being present on get without loading plugin again. 2019-09-03 11:36:49 +00:00
Nikhil Nandagopal
8d13ae3895 minor fix for protection 2019-09-03 13:48:14 +05:30
Abhinav Jha
773b6dcd68 Merge branch 'feature/dnd_v1' into 'master' 
Feature/dnd v1

See merge request theappsmith/internal-tools-client!12
 2019-09-03 03:40:53 +00:00
Abhinav Jha
a3ccf9f3c3 Fix merge conflicts with master - 3-sept 2019-09-03 08:35:37 +05:30
Nikhil Nandagopal
ebe31f4acb fixes for netlify user identity 2019-09-02 21:06:24 +05:30
Nikhil Nandagopal
46237873bd Merge branch 'feature/integration' 2019-09-02 20:20:25 +05:30
Nikhil Nandagopal
588db871ee added protecrted routes and login page 2019-09-02 20:20:01 +05:30
Nikhil Nandagopal
744e5b7043 fixed redirect 2019-09-02 18:05:18 +05:30
Nikhil Nandagopal
4c2e44d366 minor fix 2019-09-02 17:57:55 +05:30
Abhinav Jha
d0f676be09 Fix issues caused to UI after resolving merge conflicts 2019-09-02 17:55:17 +05:30
Nikhil Nandagopal
ebe70b0e99 added redirects file 2019-09-02 17:51:36 +05:30
Abhinav Jha
1f2e0f8dd0 Fix Merge Conflicts with master 2019-09-02 17:45:41 +05:30
Abhinav Jha
cf5ec97bb0 Drag drop monitor, code cleanup 2019-09-02 16:28:11 +05:30