Commit Graph

13528 Commits

Author SHA1 Message Date
Shrikant Kandula
7f4d32e7d4 Report error when cURL command is invalid. 2020-05-12 04:12:55 +00:00
Arpit Mohan
4207de2c53 Merge branch 'bug/add-mongo-auth-type-to-uri' into 'release'
Auth mechanism is not added to URI in the MongoPlugin. Fixed now.

See merge request theappsmith/internal-tools-server!330
2020-05-12 04:11:47 +00:00
Nikhil Nandagopal
0a1b965d83 Merge branch 'feature/text-widget-align' into 'release'
Adding alignment property to TextWidget

See merge request theappsmith/internal-tools-client!577
2020-05-11 16:18:07 +00:00
Trisha Anand
963a3388c3 In CI, buidling and packaging ACL branch with a new tag for the deployment. 2020-05-11 21:15:19 +05:30
Satbir Singh
14f287cb5e Removed textAlignemnt from form widget. 2020-05-11 19:52:47 +05:30
Satbir Singh
5a06911b2f Adding aligment property to TextWidget 2020-05-11 19:49:58 +05:30
Nikhil Nandagopal
1fdc96ccc6 tweaked image 2020-05-11 16:59:17 +05:30
Nikhil Nandagopal
8c08ea9257 updated default image 2020-05-11 16:58:07 +05:30
Nikhil Nandagopal
cc1ce1bba7 removed label 2020-05-11 16:30:53 +05:30
Nikhil Nandagopal
eade785bed minor text fixes
removed labels
2020-05-11 16:30:31 +05:30
rashminagarajp
a1f6b62d26 seperated after block and update replaced session_id to SESSION 2020-05-11 16:08:49 +05:30
rashminagarajp
b1a5fe41aa formatted the example.json 2020-05-11 15:40:40 +05:30
Hetu Nandu
0bcb6c85f2 Merge branch 'test/queryActions' into 'release'
Tests for query actions

See merge request theappsmith/internal-tools-client!560
2020-05-11 09:03:46 +00:00
Hetu Nandu
c2f730edb1 feat: dynamic post body in api form
- add info icon
- display helper text and placeholders dynamically
2020-05-11 09:03:46 +00:00
Shrikant Kandula
f3e448019d Auth mechanism is not added to URI in the MongoPlugin. Fixed now. 2020-05-11 12:16:09 +05:30
Rashmi P
c7cc13c50c Formatted the example.json 2020-05-11 05:15:26 +00:00
Nikhil Nandagopal
7dbe243d45 updated widget config 2020-05-09 12:25:20 +05:30
Trisha Anand
6cdab92bbe Merge branch 'feature/acl-action-inheritance' into 'feature/acl-spring-object'
Action Permission Inheritance during create.

See merge request theappsmith/internal-tools-server!329
2020-05-08 15:39:36 +00:00
Trisha Anand
b7435e546f Added action inheritance for permissions during create. No update permissions for action added. Fixed the existing test cases to run with the new code.
TODO : Add test cases for action permissions.
2020-05-08 15:39:36 +00:00
Trisha Anand
02de2ea1f6 Removing Arn because its not being used anymore. 2020-05-08 21:08:16 +05:30
Abhinav Jha
882de368eb Merge branch 'feature/propertypane-toggle-ux' into 'release'
Stop showing property pane on click

- Property pane opens when you first drag and drop a new widget
- Property pane toggles via the top right "show props" toggle
- Property pane remembers its open/close state before and after a drag/resize. For example, if the property pane was open when the user started dragging the widget, the property pane will open again once the user stops dragging.

See merge request theappsmith/internal-tools-client!565
2020-05-08 15:31:36 +00:00
Abhinav Jha
0bf035e927 Stop showing property pane on click 2020-05-08 15:31:36 +00:00
Trisha Anand
f7bb87824c Merge branch 'release' into feature/acl-spring-object
# Conflicts:
#	appsmith-server/src/main/java/com/appsmith/server/domains/User.java
2020-05-08 20:57:51 +05:30
Hetu Nandu
2893e09b64 Merge branch 'fix/custom-content-type-api' into 'release'
Fix content type switching to raw when custom

See merge request theappsmith/internal-tools-client!568
2020-05-08 12:54:27 +00:00
Hetu Nandu
ff2f32290f Fix content type switching to raw when custom 2020-05-08 12:54:27 +00:00
Rashmi P
16c10daaa8 Merge branch 'release' into 'add/Smoke-test-cases'
# Conflicts:
#   cypress/support/commands.js
2020-05-08 11:12:49 +00:00
Trisha Anand
c12d83caa5 Merge branch 'feature/acl-page-inheritance' into 'feature/acl-spring-object'
Completed the loop on page inheritance from application

See merge request theappsmith/internal-tools-server!328
2020-05-08 11:07:52 +00:00
Trisha Anand
d7637355fe Create Page always sets the inherited policies from the application. Update Application policy remains to be done. Leaving it as a TODO for now. 2020-05-08 16:32:46 +05:30
Rashmi P
f4c17f7423 Update RichTextEditor_spec.js 2020-05-08 10:38:35 +00:00
Rashmi P
8d4a223dd5 Merge branch 'fix/Create_Application' into 'release'
Update commands.js

See merge request theappsmith/internal-tools-client!564
2020-05-08 10:00:18 +00:00
Rashmi P
1527067fac Update commands.js 2020-05-08 09:26:03 +00:00
rashminagarajp
895acb3681 added someke test cases 2020-05-08 14:31:11 +05:30
Shrikant Kandula
0e2320895c Merge branch 'bug/install-default-plugins-to-existing-orgs' into 'release'
Migration to install existing default plugins to existing organizations.

See merge request theappsmith/internal-tools-server!326
2020-05-08 07:12:50 +00:00
Rashmi P
1d8239439e Update Mapdsl.json 2020-05-08 06:38:43 +00:00
Shrikant Kandula
ffc4379a4d Migration to install existing default plugins to existing organizations. 2020-05-08 11:46:13 +05:30
Hetu Nandu
3c9a9afce2 Merge branch 'fix/temp-autocomplete-fix' into 'release'
Fix opening and closing of autocomplete

See merge request theappsmith/internal-tools-client!567
2020-05-08 06:05:03 +00:00
Hetu Nandu
4c5302158f Fix opening and closing of autocomplete 2020-05-08 06:05:03 +00:00
Hetu Nandu
20abff30d4 Merge branch 'test/datasources' into 'release'
Tests for datasource pane

See merge request theappsmith/internal-tools-client!559
2020-05-08 05:40:14 +00:00
Hetu Nandu
00bcaf2022 Tests for datasource pane 2020-05-08 05:40:14 +00:00
Abhinav Jha
9dea72c72b Merge branch 'fix/map-hotfix' into 'release'
Fix/map hotfix

See merge request theappsmith/internal-tools-client!563
2020-05-08 04:02:28 +00:00
Vicky Bansal
651a346143 Fix/map hotfix 2020-05-08 04:02:28 +00:00
Shrikant Kandula
7673ee49eb Merge branch 'chore/remove-index-annotations' into 'release'
Remove index annotations as they don't accurately reflect actual indexes

See merge request theappsmith/internal-tools-server!322
2020-05-08 01:58:43 +00:00
Shrikant Kandula
b8de4ef659 Remove index annotations as they don't accurately reflect actual indexes 2020-05-08 01:58:43 +00:00
Shrikant Kandula
b1a9c40397 Merge branch 'bug/npe-when-curl-command-is-invalid' into 'release'
Guard against NPE when action is null due to cURL command being invalid.

See merge request theappsmith/internal-tools-server!323
2020-05-08 01:22:02 +00:00
Shrikant Kandula
2e9a94341b Guard against NPE when action is null due to cURL command being invalid. 2020-05-08 01:22:02 +00:00
Rashmi P
f284def4be Update commands.js 2020-05-07 15:09:17 +00:00
Trisha Anand
5fa667aecc Merge branch 'feature/add-delete-perm-obj' into 'feature/acl-spring-object'
Add and Remove Policies to an Object

See merge request theappsmith/internal-tools-server!325
2020-05-07 14:14:51 +00:00
Trisha Anand
44ce0bbf01 Added baseservice function add and remove policies to an object. This would be used for updating permissions for an object. 2020-05-07 19:39:36 +05:30
Hetu Nandu
081aa1bf8d Merge branch 'fix/runQuery' into 'release'
Create query action with an actionConfiguration object

See merge request theappsmith/internal-tools-client!561
2020-05-07 13:29:02 +00:00
Akash N
82c17a3bb8 Create query action with an actionConfiguration object 2020-05-07 18:01:29 +05:30