Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity
16,958 Commits 1 Branch 0 Tags 507 MiB
d0162013f6
Commit Graph

16958 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tejaaswini
08323d3281 fix: Modal collapse on role entry 2020-06-11 17:01:32 +05:30
Hetu Nandu
c4a03bc1f5 Merge branch 'fix/action-selector-expected-value' into 'release' 
Evaluated value bug fixes

- Show evaluated value for action creator text fields (message and url)
- Fix evaluated value crashing for chart data control

See merge request theappsmith/internal-tools-client!709
 2020-06-11 11:03:17 +00:00
Hetu Nandu
c2213bd696 Evaluated value bug fixes 2020-06-11 11:03:16 +00:00
vicky_primathon.in
d7b8c0da7d lightning menu disabled for disabled fields 2020-06-11 14:26:38 +05:30
Suhas Ranganath
e2ef658dfc Merge branch 'fix/application-share-button' into 'feature/acl' 
Disable application share button visibility

See merge request theappsmith/internal-tools-client!711
 2020-06-11 07:51:59 +00:00
Tejaaswini
53732cf7d9 fix: Disable application share button visibility 2020-06-11 13:03:54 +05:30
vicky_primathon.in
299d1d8158 code review changes 2020-06-11 12:54:19 +05:30
Trisha Anand
dde850e367 Merge branch 'bug/acl-update-layout' into 'feature/acl-spring-object' 
Fixed the repository function which was failing for fetching actions during updateLayout.

See merge request theappsmith/internal-tools-server!378
 2020-06-11 07:22:16 +00:00
Trisha Anand
e7e008dcd2 Fixed the repository function which was failing for fetching actions during updateLayout. 2020-06-11 07:22:16 +00:00
Nikhil Nandagopal
e468fbbe62 Merge branch 'release' into fix/form 2020-06-11 12:23:34 +05:30
Arpit Mohan
b837016ae0 Merge branch 'feat/queryExecuteOnLoad' into 'release' 
Add checkbox field for executeOnLoad in query form

See merge request theappsmith/internal-tools-client!705
 2020-06-11 06:29:32 +00:00
Akash N
41e431ebb4 Add checkbox field for executeOnLoad in query form 2020-06-11 06:29:32 +00:00
Rashmi P
3263b767e4 Merge branch 'fix/Pagination-test' into 'release' 
fixed issue

See merge request theappsmith/internal-tools-client!708
 2020-06-11 06:17:45 +00:00
Trisha Anand
4b39dcc8e5 Merge branch 'fix/user-form-design' into 'feature/acl' 
Invite user form design

See merge request theappsmith/internal-tools-client!707
 2020-06-11 06:10:52 +00:00
vicky_primathon.in
da3ad7edc9 merge conflicts resolved 2020-06-11 10:52:00 +05:30
rashmipn
8c0d010216 fixed issue 2020-06-11 10:43:18 +05:30
Rashmi P
640bafdbd7 Merge branch 'update/Dsl' into 'release' 
Update/dsl

See merge request theappsmith/internal-tools-client!678
 2020-06-10 17:49:16 +00:00
Satbir Singh
13afc1a703 Merge branch 'feature/save-edit' into 'release' 
Save api on edit.

See merge request theappsmith/internal-tools-client!702
 2020-06-10 17:42:51 +00:00
Satbir Singh
13422048e4 Save api on edit. 2020-06-10 17:42:51 +00:00
Abhinav Jha
8fb9054f92 Merge branch 'feature/new-widget-borders' into 'release' 
New Widget borders

See merge request theappsmith/internal-tools-client!646
 2020-06-10 17:31:20 +00:00
Abhinav Jha
80f03d970b New Widget borders 2020-06-10 17:31:20 +00:00
Tejaaswini
54003a1d31 update: Invite user form design 2020-06-10 20:30:11 +05:30
vicky_primathon.in
a528ffc7d4 merge conflicts resolved 2020-06-10 19:16:45 +05:30
vicky_primathon.in
f70a3143c6 action selector breakages fixed 2020-06-10 19:11:26 +05:30
rashmipn
16b70bd52d resolved conflicts 2020-06-10 18:05:41 +05:30
Arpit Mohan
4322555d16 Merge branch 'fix/runQueryTwice' into 'release' 
Use isExecutionSuccess flag to handle query execution errors

See merge request theappsmith/internal-tools-client!684
 2020-06-10 12:25:54 +00:00
Akash N
69a65f7052 Use isExecutionSuccess flag to handle query execution errors 2020-06-10 12:25:52 +00:00
Arpit Mohan
9c6e46c649 Merge branch 'Add/Pagination-tests' into 'release' 
Add pagination Cypress tests

This adds tests for server-side pagination in a table. 

Pagination via table pageNo and by responseUrl are covered in this scenario.

See merge request theappsmith/internal-tools-client!693
 2020-06-10 12:25:16 +00:00
Rashmi P
66b26c42ee Add pagination Cypress tests 2020-06-10 12:25:16 +00:00
Nikhil Nandagopal
05bb520479 Merge branch 'release' into fix/form 2020-06-10 17:50:39 +05:30
Nikhil Nandagopal
125fb9c162 Merge branch 'fix/bugs' into 'release' 
Fix/bugs

See merge request theappsmith/internal-tools-client!696
 2020-06-10 12:19:55 +00:00
Hetu Nandu
b87fde64b1 Merge branch 'fix/action-evaluated-value' into 'release' 
Action creator evaluated value fixes

See merge request theappsmith/internal-tools-client!699
 2020-06-10 12:16:50 +00:00
Hetu Nandu
cb2867069f Action creator evaluated value fixes 2020-06-10 12:16:50 +00:00
Nikhil Nandagopal
bc9ec2a2eb Merge branch 'release' into fix/bugs 2020-06-10 17:11:23 +05:30
Arpit Mohan
58e75ee603 Merge branch 'hotfix/sorry-cypress-parallel' into 'release' 
Adding sorry-cypress integration to ensure Cypress parallelization without the Cypress dashboard

Using the open source project sorry-cypress, we get the benefits of test parallelization without having to pay Cypress for the test recordings. This server is hosted on Heroku at this moment.

See merge request theappsmith/internal-tools-client!703
 2020-06-10 11:14:58 +00:00
Arpit Mohan
7af301566c Adding sorry-cypress integration to ensure Cypress parallelization without the Cypress dashboard 2020-06-10 11:14:58 +00:00
Arpit Mohan
a2a4cbb2d7 Merge branch 'hotfix/plugin-fat-jar' into 'release' 
Creating a fat jar for plugins

The plugins should be completely independent of the appsmith-server. Earlier, the plugins were picking their dependencies from the main appsmith-server maven module. 

Now using the maven-shade-plugin, they are an independent entity and completely self sufficient. The only exception is restapi-plugin & rapidapi-plugin because they inherit from spring-boot-starter which is not compatible with the maven-shade-plugin.

See merge request theappsmith/internal-tools-server!377
 2020-06-10 11:11:23 +00:00
Arpit Mohan
01737b9599 Experimenting with maven-shade-plugin to create a fat-jar of the postgres dependency. 
Will have to do this for all plugins. Currently, it's not registering the plugin with the SpringPluginManager
 2020-06-10 11:11:23 +00:00
vicky_primathon.in
a5986ed8a8 merge conflicts resolved 2020-06-10 16:34:11 +05:30
Trisha Anand
f00c9c23c8 Merge branch 'bug/mark-2xx-as-success-restapi-plugin' into 'release' 
Mark any 2xx status code in REST API plugin as successful execution.

See merge request theappsmith/internal-tools-server!372
 2020-06-10 10:51:07 +00:00
Shrikant Kandula
1ce336257c Mark any 2xx status code in REST API plugin as successful execution. 2020-06-10 10:51:07 +00:00
Trisha Anand
e3b6129d77 Merge branch 'bug/acl-app-viewer-org' into 'feature/acl-spring-object' 
App viewer user in an organization should have read:organizations permission.

See merge request theappsmith/internal-tools-server!376
 2020-06-10 10:34:26 +00:00
Trisha Anand
7a658ce5ea App viewer user in an organization should have read:organizations permission. 2020-06-10 15:55:29 +05:30
Nikhil Nandagopal
ed37c27c67 added pagination info 2020-06-10 15:51:16 +05:30
vicky_primathon.in
e930a3963c Merge branch 'feature/widget-actions-menu' of gitlab.com:theappsmith/internal-tools-client into fix/lightning-menu 2020-06-10 15:41:12 +05:30
Trisha Anand
84b74813a5 Merge branch 'bug/acl-create-query' into 'feature/acl-spring-object' 
In case of global datasource, no need to check for organizationId during action create.

See merge request theappsmith/internal-tools-server!375
 2020-06-10 09:08:01 +00:00
Trisha Anand
491afc3599 In case of global datasource, no need to check for organizationId during action create. 2020-06-10 09:08:01 +00:00
Nikhil Nandagopal
a26e8ea51c Merge branch 'release' into fix/bugs 
# Conflicts:
#	cypress/integration/Smoke_TestSuite/FormWidgets/DatePicker_spec.js
 2020-06-10 14:22:04 +05:30
Trisha Anand
8b9bc4b42d Merge branch 'fix/acl-bugs' into 'feature/acl' 
Fix acl-bugs

See merge request theappsmith/internal-tools-client!701
 2020-06-10 08:29:21 +00:00
Tejaaswini Narendra
4f34b2c502 fix: Send organizationId for embedded datasources 
- show organization title in invite form
- show form when clicking on share in dropdown
- show org name in org settings page
- remove the deleted application from the UI when delete is successful
- fix role update in user list table
 2020-06-10 08:29:21 +00:00