Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity
11,293 Commits 1 Branch 0 Tags 507 MiB
2139382928
Commit Graph

11293 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Trisha Anand
f81e22b1a5 Adding the capability to associate a user with multiple organizations 2019-11-13 10:23:23 +00:00
Hetu Nandu
5886bccbdc Merge branch 'fix/api-pane-p0' into 'release' 
Fix various api pane bugs

See merge request theappsmith/internal-tools-client!136
 2019-11-13 07:34:59 +00:00
Hetu Nandu
8c8312928a Fix various api pane bugs 2019-11-13 07:34:59 +00:00
Abhinav Jha
63d86bf9fe Merge branch 'feature/appviewer-fixes' into 'release' 
AppView display positioning

Fixes for the discrepancy between the builder view and AppViewer.
Fixes for no collision scenarios.

- Fixes #127 Widget sizes don't vary when selected and unselected
- Fixes #219 Widget sizes in builder and appviewer are now the same size
- Fixes #212 Widget names now appear for all widgets when selected
- Fixes #155 Widgets collisions now happen when they should
- Fixes #153 Widgets cannot be dropped on top of one another. Unless, the widget is dropped within a container widget
- Fixes #140 Drop Target grid dots, now, do not bleed off the Drop Target
- Fixes #211 Property Panes now have a close button as well as the widget type title
- Fixes #216 Input Widget now resizes appropriately when trying to resize.


See merge request theappsmith/internal-tools-client!122
 2019-11-13 07:00:25 +00:00
Abhinav Jha
03e78f0751 WIP: Allow absolute paths for imports. Refactor ContainerComponent.tsx to PositionedContainer.tsx, CanvasWidgetContainer.tsx, ContainerComponent.tsx. Refactor all widgets and components to adhere to new props and apis. 2019-11-13 07:00:25 +00:00
Trisha Anand
ea5a892da3 Merge branch 'bug/empty-datasource' into 'master' 
Datasource without any configuration is not valid. Deter the user from...

Closes #77

See merge request theappsmith/internal-tools-server!69
 2019-11-13 06:08:36 +00:00
Trisha Anand
55a29c448c Datasource without any configuration is not valid. Deter the user from creating one in such a scenario 2019-11-13 06:08:36 +00:00
Trisha Anand
0a80fe8d7f Merge branch 'bug/api-names-without-space' into 'master' 
Api name validation : Don't allow whitespace

Closes #76

See merge request theappsmith/internal-tools-server!66
 2019-11-13 05:51:01 +00:00
Trisha Anand
df904539ca Datasource instead of DatasourceId is expected as part of Action. During create and update action, datasource can also be created, which is automatically saved as part of datasource collection 2019-11-13 05:51:01 +00:00
Hetu Nandu
e771f923ce Merge branch 'hotfix/datasource-issue' into 'release' 
hotfix datasource null field issue

See merge request theappsmith/internal-tools-client!138
 2019-11-13 05:03:38 +00:00
Hetu Nandu
581a32420b hotfix datasource null field issue 2019-11-13 05:03:38 +00:00
Nikhil Nandagopal
1c8177e217 Merge branch 'hotfix/image' into 'release' 
fixed default image

See merge request theappsmith/internal-tools-client!133
 2019-11-12 11:58:42 +00:00
Nikhil Nandagopal
73ca13b20e fixed default image 2019-11-12 11:58:42 +00:00
Trisha Anand
923159e2cd Merge branch 'bug/api-sort-by-name' into 'master' 
Get all actions returns them in sorted order

Closes #74

See merge request theappsmith/internal-tools-server!68
 2019-11-12 09:59:31 +00:00
Trisha Anand
41be720335 Get all actions returns them in sorted order 2019-11-12 09:59:29 +00:00
Trisha Anand
f1878d63ab Merge branch 'feature/redis-session' into 'master' 
Redis used for session persistence

See merge request theappsmith/internal-tools-server!67
 2019-11-12 09:58:14 +00:00
Trisha Anand
cb4493dc2d Datasource instead of DatasourceId is expected as part of Action. During create and update action, datasource can also be created, which is automatically saved as part of datasource collection 2019-11-12 09:58:14 +00:00
Satbir Singh
448edac175 Merge branch 'fix/chaining' into 'release' 
Fixing breaking code in error and success action select.

In Property pane, when you select an action, the followup on success and on error were breaking due to an error in code. Fixed this issue.

See merge request theappsmith/internal-tools-client!132
 2019-11-12 09:50:40 +00:00
Satbir Singh
dbbb469dcd Fixing breaking code in error and success action select. 2019-11-12 09:50:40 +00:00
Hetu Nandu
da1b20599b Merge branch 'feature/api-pane-dry-run' into 'release' 
Api Dry Run

This feature is to allow the dry run of actions without saving it first.

See merge request theappsmith/internal-tools-client!128
 2019-11-12 09:43:14 +00:00
Hetu Nandu
c9914c4246 Api Dry Run 2019-11-12 09:43:13 +00:00
Trisha Anand
54fb13d332 Merge branch 'feature/action-resource-included' into 'master' 
Adding datasource as part of action for create/update action, execute action

Closes #60

See merge request theappsmith/internal-tools-server!65
 2019-11-12 09:15:09 +00:00
Trisha Anand
e6d9f1df88 Datasource instead of DatasourceId is expected as part of Action. During create and update action, datasource can also be created, which is automatically saved as part of datasource collection 2019-11-12 09:15:09 +00:00
Nikhil Nandagopal
977b6f2956 Merge branch 'release' into 'master' 
Release

See merge request theappsmith/internal-tools-client!130
 2019-11-12 08:55:01 +00:00
Nikhil Nandagopal
3dd7713aac minor fix 2019-11-12 14:22:13 +05:30
Nikhil Nandagopal
793ab07eed Merge branch 'master' into release 
# Conflicts:
#	src/sagas/ActionSagas.ts
#	src/widgets/TableWidget.tsx
 2019-11-12 14:09:37 +05:30
Nikhil Nandagopal
62ecb0f00f Merge branch 'release' of gitlab.com:theappsmith/internal-tools-client into release 2019-11-12 14:04:13 +05:30
Nikhil Nandagopal
8acfa99096 Merge branch 'feature/date-picker' into 'release' 
Feature/date picker

See merge request theappsmith/internal-tools-client!131
 2019-11-12 07:57:12 +00:00
Nikhil Nandagopal
3881fe699c Feature/date picker 2019-11-12 07:57:12 +00:00
Nikhil Nandagopal
2cc0e13006 Merge branch 'release' of gitlab.com:theappsmith/internal-tools-client into release 2019-11-12 12:06:46 +05:30
Satbir Singh
6bc39636a2 Merge branch 'feature/rowIndex' into 'release' 
Selected row data has been moved from selectedRow.data to selectedRow

Previously, if you wanted to use selectedRow data in a field, you would do `{{selectedRow.data.<property>}}`
With this change, you only have to do `{{selectedRow.<property>}}`

See merge request theappsmith/internal-tools-client!129
 2019-11-12 06:03:46 +00:00
Satbir Singh
20e829dceb Selected row data has been moved from selectedRow.data to selectedRow 2019-11-12 06:03:46 +00:00
Satbir Singh
91e7b6416c Merge branch 'feature/chaining' into 'release' 
Added functionality to execute actions on successful call or on error of an action.

An action can be configured to have a onSuccess and onError action.

See merge request theappsmith/internal-tools-client!127
 2019-11-12 05:22:32 +00:00
Satbir Singh
93c1b790d0 Added functionality to execute actions on successful call or on error of an action. 2019-11-12 05:22:32 +00:00
Nikhil Nandagopal
6dfbb4d445 Merge branch 'release' into 'master' 
Release

See merge request theappsmith/internal-tools-client!125
 2019-11-11 11:42:52 +00:00
Nikhil Nandagopal
1f40d135f3 Release 2019-11-11 11:42:52 +00:00
Nikhil Nandagopal
2a7508cc00 Merge branch 'master' into 'release' 
Master

See merge request theappsmith/internal-tools-client!126
 2019-11-11 11:34:43 +00:00
Nikhil Nandagopal
f0a57e8aab Master 2019-11-11 11:34:42 +00:00
Nikhil Nandagopal
be25ac3208 Merge branches 'master', 'release' and 'release' of gitlab.com:theappsmith/internal-tools-client into release 2019-11-11 17:01:25 +05:30
Hetu Nandu
45a168d1b9 Merge branch 'feature/view-dynamic-bindings' into 'release' 
View Dynamic bindings

See merge request theappsmith/internal-tools-client!123
 2019-11-08 11:02:00 +00:00
Hetu Nandu
f222c34b07 View Dynamic bindings 2019-11-08 11:02:00 +00:00
Satbir Singh
9bdeee7cee Merge branch 'feature/table-row-select' into 'release' 
Row select action call

See merge request theappsmith/internal-tools-client!119
 2019-11-07 11:17:53 +00:00
Satbir Singh
e06b7f5a2c Row select action call 2019-11-07 11:17:53 +00:00
Hetu Nandu
7013449b90 fix merge issues 2019-11-07 16:03:04 +05:30
Hetu Nandu
dc18277abc Merge branch 'release' 2019-11-07 15:45:33 +05:30
Hetu Nandu
1de6368646 Merge branch 'fix/rename-resources-to-dataSources' into 'release' 
Rename "resources" to "datasources"

See merge request theappsmith/internal-tools-client!120
 2019-11-07 09:32:38 +00:00
Hetu Nandu
7687d68b61 Rename "resources" to "datasources" 2019-11-07 09:32:38 +00:00
Arpit Mohan
aac31235f6 Merge branch 'master' of gitlab.com:theappsmith/internal-tools-server 
# Conflicts:
#	appsmith-plugins/restApiPlugin/src/main/java/com/external/plugins/RestApiPlugin.java
#	appsmith-server/src/main/java/com/appsmith/server/services/ResourceContextServiceImpl.java
 2019-11-07 14:28:09 +05:30
Abhinav Jha
0d8f84178e Merge branch 'feature/scaffold-application-create' into 'release' 
Feature - Applications Scaffold Page - Create Application

See merge request theappsmith/internal-tools-client!117
 2019-11-07 04:59:41 +00:00
Abhinav Jha
9ba528830d Feature - Applications Scaffold Page - Create Application 2019-11-07 04:59:40 +00:00