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

2890 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Satbir Singh
bb4004fce0 ApiPaneV2 DocsV2 QueryV2 DatasourceV2 flag removed 2020-06-15 12:21:46 +05:30
vicky_primathon.in
cddd6586f2 overflow fix reverted 2020-06-15 11:18:17 +05:30
Trisha Anand
2d28e82f54 Merge branch 'fix/back-to-editor' into 'feature/acl' 
Back to editor in app view mode should not be visible to users with only read application permissions

See merge request theappsmith/internal-tools-client!719
 2020-06-12 15:44:51 +00:00
Tejaaswini Narendra
09554f97e8 Back to editor in app view mode should not be visible to users with only read application permissions 2020-06-12 15:44:51 +00:00
Trisha Anand
9dfb72720e Fixed the broken test cases. 2020-06-12 19:35:01 +05:30
Trisha Anand
bb6dc61015 Build fix 2020-06-12 19:16:31 +05:30
Trisha Anand
73757c3425 Merge branch 'release' into feature/acl-spring-object 
# Conflicts:
#	.gitignore
#	appsmith-plugins/mongoPlugin/plugin.properties
#	appsmith-plugins/postgresPlugin/plugin.properties
#	appsmith-plugins/rapidApiPlugin/plugin.properties
#	appsmith-plugins/restApiPlugin/plugin.properties
#	appsmith-plugins/restApiPlugin/src/main/java/com/external/plugins/RestApiPlugin.java
#	appsmith-server/src/main/java/com/appsmith/server/constants/FieldName.java
#	appsmith-server/src/main/java/com/appsmith/server/repositories/ActionRepository.java
#	appsmith-server/src/main/java/com/appsmith/server/services/ActionServiceImpl.java
#	appsmith-server/src/main/java/com/appsmith/server/services/DatasourceContextServiceImpl.java
#	appsmith-server/src/main/java/com/appsmith/server/services/DatasourceServiceImpl.java
#	appsmith-server/src/test/java/com/appsmith/server/services/ActionServiceTest.java
#	appsmith-server/src/test/java/com/appsmith/server/services/ApplicationServiceTest.java
#	appsmith-server/src/test/java/com/appsmith/server/services/LayoutServiceTest.java
#	appsmith-server/src/test/java/com/appsmith/server/services/PageServiceTest.java
#	build.sh
 2020-06-12 19:14:31 +05:30
Trisha Anand
55837b4cc7 Merge branch 'bug/dont-invite-developer-role-users' into 'feature/acl-spring-object' 
Don't invite users if they have any access in an org, not just admin.

See merge request theappsmith/internal-tools-server!382
 2020-06-12 12:57:18 +00:00
Shrikant Kandula
18476432ac Don't invite users if they have any access in an org, not just admin. 2020-06-12 17:48:35 +05:30
Trisha Anand
6eea8ec43e Merge branch 'fix/acl-buglist' into 'feature/acl' 
Modal collapse on role entry : Fix enter role from the dropdown closes the share pop up

See merge request theappsmith/internal-tools-client!712
 2020-06-12 11:59:20 +00:00
Trisha Anand
cd26555861 Merge branch 'feature/acl-migration-script' into 'feature/acl-spring-object' 
ACL Migration Script

See merge request theappsmith/internal-tools-server!371
 2020-06-12 11:54:21 +00:00
Shrikant Kandula
b391f46e2c ACL Migration Script 2020-06-12 11:54:21 +00:00
Arpit Mohan
96846d0e41 Merge branch 'feature/add-lodash-docs' into 'release' 
Add lodash docs to autocomplete

See merge request theappsmith/internal-tools-client!718
 2020-06-12 11:43:26 +00:00
Hetu Nandu
e6972ea772 add lodash docs 2020-06-12 16:26:46 +05:30
Tejaaswini
3b147cc445 Merge branch 'release' into feature/acl 2020-06-12 15:38:40 +05:30
vicky_primathon.in
3bf86936b1 merge conflicts resolved 2020-06-12 14:16:42 +05:30
Hetu Nandu
17510bc826 Merge branch 'fix/api-pane-performance' into 'release' 
Fix api pane performance

- Fix duplicate name error for edited api name
- Debounce draft updates
- Reduce dynamic binding list update

See merge request theappsmith/internal-tools-client!714
 2020-06-12 08:35:52 +00:00
Hetu Nandu
133f50807e Fix api pane performance 2020-06-12 08:35:52 +00:00
Trisha Anand
d3e60953b9 Merge branch 'bug/acl-forgot-password' into 'feature/acl-spring-object' 
Bug fix for forgot password error "user not found". During reset password, the user is not logged in and hence the permissions can not be applied during repository findByEmail

See merge request theappsmith/internal-tools-server!381
 2020-06-12 08:33:30 +00:00
Trisha Anand
4eab663c8e Bug fix for forgot password error "user not found". During reset password, the user is not logged in and hence the permissions can not be applied during repository findByEmail 2020-06-12 13:57:57 +05:30
Trisha Anand
da8185f650 Merge branch 'bug/acl-invite-email-link-missing' into 'feature/acl-spring-object' 
In case of sending email for an existing user, fixed the URL.

See merge request theappsmith/internal-tools-server!380
 2020-06-12 08:06:51 +00:00
Satbir Singh
1b546cd308 Merge branch 'fix/save-edit' into 'release' 
Save on edit debounce rate decreased and Run api is filled

See merge request theappsmith/internal-tools-client!715
 2020-06-12 08:03:17 +00:00
Satbir Singh
75cef07aa9 Save on edit debounce rate decreased and Run api is filled 2020-06-12 08:03:17 +00:00
Trisha Anand
3dafccba2e In case of sending email for an existing user, fixed the URL. 2020-06-12 13:30:53 +05:30
Nikhil Nandagopal
5e292f0534 Merge branch 'fix/form' into 'release' 
made form data visible at the top level

See merge request theappsmith/internal-tools-client!700
 2020-06-12 05:28:37 +00:00
Arpit Mohan
2200b99fbe Merge branch 'fix/dbqueryFixes' into 'release' 
Datasouces and query fixes

- Show plugin icons in query sidebar and dropdown
- Collapse all sections except the first one in datasources form
- Collapse from second depth in query mongo response UI.

See merge request theappsmith/internal-tools-client!694
 2020-06-12 05:09:49 +00:00
Akash N
e6ed4fd5bc Datasouces and query fixes 
-  Show plugin icons in query sidebar and dropdown
- Collapse all sections except the first one in datasources form
- Collapse from second depth in query mongo response UI.
 2020-06-12 05:09:49 +00:00
Satbir Singh
f606b0989e Merge branch 'fix/api-scroll' into 'release' 
Fixing api Scroll.

See merge request theappsmith/internal-tools-client!689
 2020-06-12 03:54:12 +00:00
Satbir Singh
1538a70d1f Fixing api Scroll. 2020-06-12 03:54:12 +00:00
Shrikant Kandula
c1a5f768c6 Merge branch 'bug/applications-not-invited-to' into 'feature/acl-spring-object' 
Fix problem where not all apps were getting policies when invited.

See merge request theappsmith/internal-tools-server!379
 2020-06-11 15:32:26 +00:00
Shrikant Kandula
ab83bc0223 Fix problem where not all apps were getting policies when invited. 2020-06-11 20:56:52 +05:30
vicky_primathon.in
db17836810 info icon placed after field. test case fixed for action selectors 2020-06-11 19:30:38 +05:30
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