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
Arpit Mohan
0e0909b68e Merge branch 'release' into 'master' 
Release

See merge request theappsmith/internal-tools-client!725
 2020-06-16 13:10:54 +00:00
Satbir Singh
efcbde656b Merge branch 'feature/api-name' into 'release' 
Api name editable.

See merge request theappsmith/internal-tools-client!717
 2020-06-16 10:23:19 +00:00
Satbir Singh
7e3df81302 Api name editable. 2020-06-16 10:23:19 +00:00
Abhinav Jha
0f7fd2287a Stop click propagation on property pane to prevent the widget from getting unselected 2020-06-16 15:42:17 +05:30
Arpit Mohan
0abd0fb682 Merge branch 'fix/table-bugs' into 'release' 
Fixing table bugs

This MR fixes a bunch of bugs associated with the react-base-table. Some of them include:
1. Show loading state for the table 
2. Handling nested objects when displaying table data
3. Truncate long text instead of overlapping it with the next column
4. Displaying Youtube video URLs in the table column

See merge request theappsmith/internal-tools-client!704
 2020-06-16 07:37:39 +00:00
Vicky Bansal
5643a53c9f Fixing table bugs 2020-06-16 07:37:39 +00:00
Tejaaswini
c99640df91 Merge branch 'release' into feature/acl 2020-06-16 11:44:44 +05:30
Arpit Mohan
c6af229a97 Merge branch 'bug/default-page-action-refactor' into 'release' 
Adding the widget names set to the default layout for a page

During action name refactor, we require the widget names to exist in the layout. Hence all default layouts must have the widgetName set.

See merge request theappsmith/internal-tools-server!387
 2020-06-16 05:25:54 +00:00
Arpit Mohan
e27af0f525 Merge branch 'bug/curl-import-with-url-argument' into 'release' 
Fix cURL import when using `--url` argument

See merge request theappsmith/internal-tools-server!386
 2020-06-16 05:21:43 +00:00
vicky_primathon.in
02d841a1b1 changes for tree structure 2020-06-16 10:50:46 +05:30
Arpit Mohan
a4132d5845 Adding the widget names set to the default layout for a page 2020-06-16 10:50:07 +05:30
Shrikant Kandula
dd0ba857c2 Fix cURL import when using --url argument 
Also fixes cases where there's a space between `-X` and `POST` and
similar cases.
 2020-06-16 09:59:43 +05:30
Hetu Nandu
428cb5e287 Merge branch 'feat/tabKeyNavigation' into 'release' 
Feat/tab key navigation

- Extend existing extraKeys to avoid overriding the `Tab` extraKey

See merge request theappsmith/internal-tools-client!724
 2020-06-15 13:14:39 +00:00
Akash N
1d38c98a7f Fix tab key navigation for headers and query params 
- Extend existing extraKeys to avoid overriding the `Tab` extraKey
 2020-06-15 13:14:39 +00:00
Abhinav Jha
2609f26117 Merge branch 'fix/lightning-menu' into 'release' 
Fix/lightning menu

- Add lightning menu to assist users in binding
- Change the action selection display for consistency.

See merge request theappsmith/internal-tools-client!706
 2020-06-15 10:51:20 +00:00
Hetu Nandu
0f066a2192 Merge branch 'fix/bad-styles' into 'release' 
Add missing semicolons in styles

See merge request theappsmith/internal-tools-client!722
 2020-06-15 08:56:40 +00:00
Hetu Nandu
70d4818767 add missing semi-colons in styles 2020-06-15 14:21:00 +05:30
Satbir Singh
cb628d26b2 Merge branch 'fix/remove-ff' into 'release' 
ApiPaneV2 DocsV2 QueryV2 DatasourceV2 feature flag removed

See merge request theappsmith/internal-tools-client!721
 2020-06-15 08:03:07 +00:00
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