Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity
18,100 Commits 1 Branch 0 Tags 507 MiB
6e4a7fe92b
Commit Graph

18100 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Trisha Anand
83b30a2d36 Merge branch 'bug/rest-api-query-params' into 'master' 
Query param handling has been added to Rest API plugin using URIComponentsBuilder

See merge request theappsmith/internal-tools-server!63
 2019-11-06 12:30:56 +00:00
Trisha Anand
63c0f07708 Query param handling has been added to Rest API plugin using URIComponentsBuilder 2019-11-06 12:30:56 +00:00
Nikhil Nandagopal
b244c4d784 Merge branch 'feature/date-picker' into 'release' 
Feature/date picker

See merge request theappsmith/internal-tools-client!118
 2019-11-06 12:12:41 +00:00
Nikhil Nandagopal
a031606fa1 Feature/date picker 2019-11-06 12:12:41 +00:00
Arpit Mohan
bcda3f0feb Renaming all the references of resource to datasource 
This renaming is reflective of the entity and it's potential values in the future.
 2019-11-06 16:25:08 +05:30
Hetu Nandu
b7b92a9bdd Merge branch 'feature/dynamic-property-input' into 'release' 
Dynamic Property in Editor mode

See merge request theappsmith/internal-tools-client!114
 2019-11-06 06:35:15 +00:00
Hetu Nandu
895649d77f Dynamic Property in Editor mode 2019-11-06 06:35:15 +00:00
Nikhil Nandagopal
185abd9dc6 Merge branch 'feature/appviewer-page-routing' into 'release' 
AppViewer - Routing updates the page

See merge request theappsmith/internal-tools-client!106
 2019-11-06 06:21:56 +00:00
Abhinav Jha
ab8270536e AppViewer - Routing updates the page 2019-11-06 06:21:56 +00:00
Arpit Mohan
c283b1eddb Merge branch 'hotfix/null-request-body' into 'master' 
Handling null values in the request body

See merge request theappsmith/internal-tools-server!62
 2019-11-05 12:25:09 +00:00
Arpit Mohan
a61b9ab325 Handling null values in the request body 2019-11-05 12:25:08 +00:00
Satbir Singh
747bf3e1ef Merge branch 'feature/actions' into 'release' 
Adding action selector control.

See merge request theappsmith/internal-tools-client!115
 2019-11-05 12:08:41 +00:00
Satbir Singh
cb478e8d1c Adding action selector control. 2019-11-05 12:08:41 +00:00
Trisha Anand
12b4450eda Merge branch 'bug/get-pages-application' into 'master' 
Bug/get pages application

See merge request theappsmith/internal-tools-server!61
 2019-11-05 11:49:52 +00:00
Trisha Anand
3c1b08d911 Page Controller now can return list of pages by application id and list of page names & ids by application id 2019-11-05 11:49:52 +00:00
Arpit Mohan
f75b94ed43 Merge branch 'bug/get-pages-application' into 'master' 
Get Pages by application ID & Get Page names by application ID

See merge request theappsmith/internal-tools-server!60
 2019-11-05 11:36:10 +00:00
Trisha Anand
3f968afac6 Page Controller now can return list of pages by application id and list of page names & ids by application id 2019-11-05 11:36:10 +00:00
Arpit Mohan
fd5b79a869 Merge branch 'fix/json-string-post-body' into 'release' 
Post body in API now only supports string

See merge request theappsmith/internal-tools-client!116
 2019-11-05 11:17:46 +00:00
Arpit Mohan
f493d8c3ae Merge branch 'feature/datasource-resource-naming' into 'master' 
Adding ACL bundle for datasources API

See merge request theappsmith/internal-tools-server!59
 2019-11-05 11:09:08 +00:00
Arpit Mohan
0c0956ca46 Adding ACL bundle for datasources API 2019-11-05 16:36:09 +05:30
Hetu Nandu
48901e0f2e fix body as string 2019-11-05 16:20:58 +05:30
Arpit Mohan
29c7b7cc01 Merge branch 'feature/mustache-key-extraction' into 'master' 
Extract mustache keys from action object

When an action is created, we extract the mustache keys from various parts of the action and save it in the field `jsonPathKeys`. This same thing also happens in the update flow.

Since mustache library doesn't have an extraction function, we use a regex template to extract those keys.

We also modify the data type of the `body` parameter in the `ActionConfiguration` to String. This is because there are reserved characters that are not allowed as Mongo keys but are valid JSON keys. Converting to a string will remove all these problems.

Fixes #31 

See merge request theappsmith/internal-tools-server!58
 2019-11-05 10:40:09 +00:00
Arpit Mohan
3622d8b0d3 Converting actionConfiguration to a string to extract mustache keys 
Also making jsonPathKeys a read-only field. Cannot be written via the API.
 2019-11-05 10:40:09 +00:00
Trisha Anand
460c15eb68 Merge branch 'feature/apiCollection' into 'master' 
feature/Collection

See merge request theappsmith/internal-tools-server!50
 2019-11-05 09:39:54 +00:00
Trisha Anand
00fa2e80f7 Added ActionCollectionService which would act on composite functions. Need to handle all scenarios here. 2019-11-05 09:39:54 +00:00
Trisha Anand
cdf3c720de Merge branch 'bug/72' into 'master' 
Fix for dsl getting rewritten

See merge request theappsmith/internal-tools-server!56
 2019-11-05 07:37:39 +00:00
Trisha Anand
bd846bfc8d Fix for dsl getting rewritten 2019-11-05 07:37:39 +00:00
Trisha Anand
9fa01ab06a Merge branch 'bug/73' into 'master' 
Handles empty params in a request

See merge request theappsmith/internal-tools-server!55
 2019-11-05 05:51:14 +00:00
Trisha Anand
68e30ff297 Handles empty params in a request 2019-11-05 05:51:14 +00:00
Nikhil Nandagopal
22629544d1 Merge branch 'release' into 'master' 
Release

See merge request theappsmith/internal-tools-client!112
 2019-11-05 05:09:50 +00:00
Nikhil Nandagopal
3e9f278b95 Release 2019-11-05 05:09:50 +00:00
Nikhil Nandagopal
54a6657c38 Merge branch 'feature/file-date-picker' into 'release' 
Feature/file date picker

See merge request theappsmith/internal-tools-client!113
 2019-11-05 05:06:16 +00:00
Nikhil Nandagopal
741cd6c025 Merge branch 'release' into feature/file-date-picker 2019-11-04 23:47:26 +05:30
Nikhil Nandagopal
fcae560b6e Merge branch 'master' into release 2019-11-04 23:46:56 +05:30
Nikhil Nandagopal
22d731517a Merge branch 'feature/file-date-picker' into 'release' 
Feature/file date picker

See merge request theappsmith/internal-tools-client!108
 2019-11-04 14:22:50 +00:00
Nikhil Nandagopal
735fbbcbd7 Feature/file date picker 2019-11-04 14:22:50 +00:00
Nikhil Nandagopal
e6b85465a6 added shallow equal 2019-11-04 19:47:48 +05:30
Nikhil Nandagopal
a1dcb98e44 added shallow compare 2019-11-04 17:47:35 +05:30
Nikhil Nandagopal
074d566e3c minor fixes 2019-11-04 16:57:35 +05:30
Nikhil Nandagopal
1cf180a5a8 removed logs 2019-11-04 16:50:21 +05:30
Trisha Anand
566a56778a Merge branch 'bug/restApi' into 'master' 
Bug/rest api

Closes #70

See merge request theappsmith/internal-tools-server!54
 2019-11-04 11:20:18 +00:00
Trisha Anand
daeba007a1 Bug/rest api 2019-11-04 11:20:18 +00:00
Nikhil Nandagopal
c7ce78c01b Merge branch 'release' into feature/file-date-picker 
# Conflicts:
#	src/utils/PropertyControlRegistry.tsx
 2019-11-04 16:48:29 +05:30