Commit Graph

1348 Commits

Author SHA1 Message Date
vicky_primathon.in
a5986ed8a8 merge conflicts resolved 2020-06-10 16:34:11 +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
Hetu Nandu
9e087de059 Merge branch 'fix/query-pane-evaluated-value' into 'release'
Query pane evaluated value

- Use `body` field of query action configuration
- Show evaluated value of a query field
- Update failing test

See merge request theappsmith/internal-tools-client!697
2020-06-10 07:49:27 +00:00
Hetu Nandu
e2eb590a86 Query pane evaluated value 2020-06-10 07:49:27 +00:00
Satbir Singh
dbd06b1cd9 Merge branch 'sc-names' into 'release'
Adding styled component names to dom for local env

See merge request theappsmith/internal-tools-client!692
2020-06-08 09:00:58 +00:00
Satbir Singh
618d6180e6 Adding styled component names to dom for local env 2020-06-08 09:00:58 +00:00
Hetu Nandu
01c2f71bc0 Merge branch 'feature/custom-eval-value' into 'release'
Fix Chart series data

See merge request theappsmith/internal-tools-client!688
2020-06-05 16:20:24 +00:00
Hetu Nandu
e401844014 Fix Chart series data 2020-06-05 16:20:23 +00:00
Hetu Nandu
410d2d1d2a Merge branch 'feature/evaluated-value' into 'release'
Evaluated value popup

See merge request theappsmith/internal-tools-client!621
2020-06-04 13:49:22 +00:00
Hetu Nandu
d9540f8927 Evaluated value popup 2020-06-04 13:49:22 +00:00
vicky_primathon.in
19b8c46cc1 Merge branch 'feature/lightning-menu' of gitlab.com:theappsmith/internal-tools-client into feature/widget-actions-menu 2020-06-04 16:03:40 +05:30
vicky_primathon.in
cf0fa0fd22 Merge branch 'feature/lightning-menu' of gitlab.com:theappsmith/internal-tools-client into fix/icons-placement-issues 2020-06-04 16:03:05 +05:30
vicky_primathon.in
b72e8ecd0f lightning menu popover placement fixed 2020-06-04 15:25:44 +05:30
vicky_primathon.in
0062b3182f padding added in dynamic auto complete to show lightningmenu icon reverted 2020-06-04 14:22:48 +05:30
Aditya Acharya
303363cb60 Merge branch 'Binding/ChartText' into 'release'
Binding/chart text

See merge request theappsmith/internal-tools-client!673
2020-06-04 07:50:39 +00:00
Aditya Acharya
3f10d16bfb Binding/chart text 2020-06-04 07:50:39 +00:00
Satbir Singh
b3d79e1542 Merge branch 'fix/ff' into 'release'
Enabling Optimizely through ad blockers.

See merge request theappsmith/internal-tools-client!667
2020-06-04 07:13:36 +00:00
Satbir Singh
11b2995387 Enabling Optimizely through ad blockers. 2020-06-04 07:13:36 +00:00
Hetu Nandu
086f9559a9 Merge branch 'fix/autocomplete-bugs' into 'release'
Fix autocomplete visibility bugs

See merge request theappsmith/internal-tools-client!674
2020-06-03 17:27:24 +00:00
Hetu Nandu
44e657fe12 refactored function name
reverted binding logic
2020-06-03 17:27:24 +00:00
vicky_primathon.in
199e70955e Merge branch 'feature/lightning-menu' of gitlab.com:theappsmith/internal-tools-client into feature/widget-actions-menu 2020-06-03 18:01:21 +05:30
vicky_primathon.in
3e5d7eeb34 Merge branch 'feature/lightning-menu' of gitlab.com:theappsmith/internal-tools-client into fix/icons-placement-issues 2020-06-03 18:00:28 +05:30
vicky_primathon.in
b38b5b3a30 lightning menu border changes 2020-06-03 17:51:18 +05:30
Satbir Singh
3b729bc470 Merge branch 'fix/react-table-widget' into 'release'
Fix/react table widget

See merge request theappsmith/internal-tools-client!599
2020-06-03 10:50:10 +00:00
Vicky Bansal
c2efa63eba Fix/react table widget 2020-06-03 10:50:10 +00:00
vicky_primathon.in
86a8c49e73 isHover state removed from dynamic auto complete 2020-06-03 15:23:32 +05:30
vicky_primathon.in
d537fbcebd Merge branch 'feature/lightning-menu' of gitlab.com:theappsmith/internal-tools-client into fix/icons-placement-issues 2020-06-03 15:22:01 +05:30
vicky_primathon.in
b7ee43da39 merge conflicts resolved 2020-06-03 15:21:07 +05:30
vicky_primathon.in
210a4f3e71 merge conflicts resolved 2020-06-03 15:19:18 +05:30
vicky_primathon.in
2f6211e01b syntax highlight for code in action selectors 2020-06-03 15:09:17 +05:30
vicky_primathon.in
5259756bf6 Merge branch 'feature/syntax-highlighting' of gitlab.com:theappsmith/internal-tools-client into feature/widget-actions-menu 2020-06-03 12:48:40 +05:30
vicky_primathon.in
f55b76b582 Merge branch 'master' of gitlab.com:theappsmith/internal-tools-client into feature/widget-actions-menu 2020-06-03 12:45:28 +05:30
vicky_primathon.in
b28d1e6f5f lightning menu changes merged 2020-06-03 12:44:17 +05:30
vicky_primathon.in
535706aa9b lightning menu changes merged 2020-06-03 12:41:42 +05:30
vicky_primathon.in
2a477468ed changes to fix hover issue 2020-06-03 12:40:16 +05:30
Hetu Nandu
a783d39d5f Merge branch 'fix/embeddedDatasource' into 'release'
Fix/embedded datasource

Show datasource url for embedded datasources in api pane

See merge request theappsmith/internal-tools-client!616
2020-06-03 05:40:48 +00:00
Akash N
62f003df6e Embedded Datasource
- Show path along with url in the api pane for embedded datasource
- Add store as datasource menu option for embedded datasource
- Allow users to type the  path for global datasources
- Show the base url as a tag along with the path for global datasource.
2020-06-03 05:40:48 +00:00
vicky_primathon.in
4ca1f5b02e delete icon placement fix, spacing in auto complete for lightning menu icon added 2020-06-03 10:14:11 +05:30
Arpit Mohan
220a17e022 Merge branch 'release' into 'master'
Release to master

See merge request theappsmith/internal-tools-client!659
2020-06-02 12:14:34 +00:00
Aditya Acharya
2eb6d6cbe7 Merge branch 'LocatorFix' into 'release'
Locatorfix

See merge request theappsmith/internal-tools-client!672
2020-06-02 11:50:39 +00:00
vicky_primathon.in
5b43bd2d5f lightning menu user states added 2020-06-02 17:18:54 +05:30
Hetu Nandu
8fca4467f2 Merge branch 'feature/single-chart-data' into 'release'
Single series chart data

See merge request theappsmith/internal-tools-client!670
2020-06-02 11:27:24 +00:00
Hetu Nandu
973af1c5e7 Single series chart data 2020-06-02 11:27:24 +00:00
acharyaaditya18
4455c98ff7 Locatorfix 2020-06-02 15:34:38 +05:30
vicky_primathon.in
e6c6556b50 Merge branch 'release' of gitlab.com:theappsmith/internal-tools-client into feature/lightning-menu 2020-06-02 14:31:44 +05:30
vicky_primathon.in
2bff98d10d lightning menu state latest changes 2020-06-02 14:31:03 +05:30
Abhinav Jha
341133a95d Add syntax highlighting component 2020-06-02 13:24:31 +05:30
vicky_primathon.in
5fd3e59f7a hover and active state in lightning menu added 2020-06-02 12:43:13 +05:30
Rashmi P
76b0c65528 Merge branch 'Add/publish-map-tests' into 'release'
added map widget publish tests

See merge request theappsmith/internal-tools-client!665
2020-06-02 06:58:15 +00:00
Rashmi P
304cc969e9 added map widget publish tests 2020-06-02 06:58:15 +00:00