Commit Graph

2305 Commits

Author SHA1 Message Date
satbir121
f35e2d7f05
Fixing icon path. (#429) 2020-08-26 13:53:43 +05:30
Automated Github Action
5886082871 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-08-26 08:06:08 +00:00
devrk96
6ff6b5e1a1
Search input component (#403)
* search input implemented with both variant

* classname bug resolved in icon component

* PR comments resolved

* ellipsis added for long search keywords
2020-08-26 12:55:27 +05:30
devrk96
4da585a5af
Icon picker component (#404)
* icon picker functionalities and UI implemented

* appicon component added for icon picker

* PR comments resolved

* PR comment on appicon size resolved

* icon picker story fixed and enum added for names
2020-08-26 12:48:04 +05:30
devrk96
d511b6ecab
Color picker component (#405)
* color picker functinalities and ui implemented

* unused import removed

* PR comments resolved
2020-08-26 12:44:41 +05:30
Automated Github Action
086d7725b1 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-08-26 06:09:27 +00:00
vicky-primathon
a8e6b268ab
Setting table widget filteredTableData after reset. (#425) 2020-08-26 11:11:18 +05:30
akash-codemonk
4f8a3b5968
Save datasource name on change (#373) 2020-08-26 10:54:44 +05:30
Automated Github Action
ad81dd9921 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-08-25 12:36:01 +00:00
Hetu Nandu
87876d8f51
Update Entity Explorer to avoid extra evals of data tree (#421)
* Use the without functions method since it is cached via selector
* Remove functionality where entity search is appended on the url
2020-08-25 17:55:22 +05:30
akash-codemonk
3e545e9638
Fix form-encoded body showing 0 (#420) 2020-08-25 17:52:54 +05:30
Automated Github Action
8bb3b4ce72 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-08-25 09:05:54 +00:00
Trisha Anand
11eac73013
Clone application within the same organization (#414)
* WIP : First draft of clone applications

* Cloning of application now works correctly.

* Fixed the failing test case for page cloning.

* Added test case to assert the clone of application successfully.

* Minor function renaming to avoid confusion.

* Minor code refactoring to remove duplicate code.
2020-08-25 14:08:52 +05:30
Automated Github Action
beabf4731c Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-08-25 06:06:22 +00:00
Trisha Anand
8c20aeb95b
Example app being cloned must be set to private instead of public because public permissions are not given during cloning. (#418) 2020-08-25 11:12:55 +05:30
Automated Github Action
986cb846d8 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-08-25 03:05:57 +00:00
Trisha Anand
c253b7430b
1. Fixed the bug where policies are being set to empty during organization update (#415)
1. Fixed the bug where policies are being set to empty during organization update.
2. Added email field in organization.

* Updated the test case for update organization to assert the organization policies being present post the update.
2020-08-25 08:13:37 +05:30
Trisha Anand
ce41fec346
Bug fix : Example applications should have make public permissions for the administrator. (#416) 2020-08-25 08:12:13 +05:30
Hetu Nandu
e8edaeee5d Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-08-24 18:19:05 +05:30
Hetu Nandu
4873ac3421
Local store via Datatree (#367) 2020-08-24 17:39:17 +05:30
Automated Github Action
29a9abdf7f Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-08-24 11:05:21 +00:00
Abhinav Jha
bb55029f42
Fix: Missing form button (#397) 2020-08-24 16:20:50 +05:30
Abhinav Jha
4ef36386fd
Enable property pane event listeners, so that it is contained within the viewport properly when it's size updates (#398) 2020-08-24 16:20:15 +05:30
Automated Github Action
2050d455f5 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-08-24 07:05:44 +00:00
Shrikant Sharat Kandula
eb7dcd69a5
Fix MongoDB datasource testing fails due to unauthorized error (#402) 2020-08-24 12:23:38 +05:30
NandanAnantharamu
01f6393189
Changed the widget used for search in the test (#406) 2020-08-24 12:16:28 +05:30
Automated Github Action
6cce099129 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-08-24 06:08:35 +00:00
devrk96
f5f65dd89e
table dropdown functionalities and UI implemented (#407) 2020-08-24 11:30:22 +05:30
satbir121
bccef563c4
Alignment of icon button is to right (#372) 2020-08-24 11:12:19 +05:30
Automated Github Action
d605554dc6 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-08-22 04:06:03 +00:00
akash-codemonk
3deb9ace43
Add clone page option (#365)
Adding the option to clone a page in the overflow menu of the entity explorer
2020-08-22 08:40:22 +05:30
Automated Github Action
e1ee82be9a Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-08-22 03:05:35 +00:00
Shrikant Sharat Kandula
27b7f6c5e2
Fix test DS fails on datasources with direct mongo connection (#400) 2020-08-22 07:40:02 +05:30
Automated Github Action
05b6910956 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-08-21 17:05:18 +00:00
Hetu Nandu
a2b1d3442f
Table widget selected row initial value fix (#401)
* Set initial value as empty object

* log debug
2020-08-21 22:13:02 +05:30
Automated Github Action
28c3e131f5 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-08-21 16:05:38 +00:00
akash-codemonk
5658e04a1c
Navigate to app via href instead of history push (#396) 2020-08-21 20:55:49 +05:30
Automated Github Action
f1452047d5 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-08-21 15:07:02 +00:00
Shrikant Sharat Kandula
ba72e21f7b
Add two more apps to examples org dump (#393)
* Add two more apps to examples org dump

* Fix undefined checks in example org dump
2020-08-21 19:53:16 +05:30
Automated Github Action
6fe4252da2 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-08-21 11:05:27 +00:00
Shrikant Sharat Kandula
2a2dda0ab0
Fix race condition in setting default page in application (#394)
We are currently getting the *list* of all pages, updating the
`isDefault` fields inside, and then saving the whole *list* of
all pages. If a new page got added to that list in the DB during
this process, that page would be lost. This commit fixes this
problem.

This race condition was causing tests for cloning applications
to fail *sometimes*.
2020-08-21 16:31:40 +05:30
Automated Github Action
50a5ecd77e Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-08-21 09:08:38 +00:00
Shrikant Sharat Kandula
87f27c9182
Add two new/updated apps for self-hosted (#392)
* Add two new/updated apps for self-hosted

* Fix potential NPE when template org dump has API datasources
2020-08-21 14:37:35 +05:30
Automated Github Action
378d1346c5 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-08-21 08:15:14 +00:00
Hetu Nandu
63946fcacb
indentify user email in hotjar (#390) 2020-08-21 13:43:59 +05:30
Automated Github Action
4f46f259ae Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-08-21 07:32:17 +00:00
Hetu Nandu
078a6a3a00
remove flag checks via EJS (#387) 2020-08-21 12:59:31 +05:30
Automated Github Action
ac456d1bf5 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-08-21 07:01:03 +00:00
Hetu Nandu
2e731b5e11
conditional ejs for GA and Intercom (#384) 2020-08-21 12:14:21 +05:30
Automated Github Action
5ef5144797 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-08-21 06:08:32 +00:00
Abhinav Jha
613db73b15
Fix: Action move & copy issues (#381)
* Fix: When copying a query, the app tries to open the API page with the queryID

* Fix: When moving a query, the query input box is empty
2020-08-21 11:33:04 +05:30
Shrikant Sharat Kandula
e97ceab412
Fix default page not being set for cloned applications (#383)
* Fix default page not being set for cloned applications

* Add test for setting default page in clone applications
2020-08-21 10:38:23 +05:30
Automated Github Action
77fe24e28e Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-08-20 20:06:06 +00:00
Abhinav Jha
a03568b79b
The default template in editor and app viewer must match (#382) 2020-08-21 01:24:18 +05:30
Automated Github Action
cf181b106f Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-08-20 16:05:41 +00:00
Hetu Nandu
c658769b1b
Style polish (#371)
* Rotate Fork app icon
* Change Explorer divider color
* Fix favicon not accessible
* Rename `appsmith.url` to `appsmith.URL`
* AppView page tab overflow ellipsis
* Rename `Back to editor` button to `Edit App`
* Update App card colors
2020-08-20 20:47:20 +05:30
Arpit Mohan
8c9cedd432
Merge pull request #23 from appsmithorg/feature/add-mail-enabled-flag-client
Adds flag in notlify toml file
2020-08-20 18:26:34 +05:30
Arpit Mohan
f19a5b34ab Merge branch 'release' of github.com:appsmithorg/appsmith into release
[remote "client1"]
	url = /tmp/client-1
	fetch = +refs/heads/*:refs/remotes/client1/*
2020-08-20 18:25:46 +05:30
Shrikant Sharat Kandula
27511c90d4
Users created won't have any orgs if a template is configured (#374) 2020-08-20 18:24:31 +05:30
Arpit Mohan
e3bf0a21da
Updating server README to get Github Actions to run 2020-08-20 18:01:44 +05:30
Arpit Mohan
84f1683976 Merge branch 'release' into feature/add-mail-enabled-flag-client 2020-08-20 17:43:46 +05:30
Arpit Mohan
0087efa6a4 Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-08-20 17:14:00 +05:30
NandanAnantharamu
4617a87686
Feature test/search delay (#369)
- Add a delay after adding a entity search text, to accommodate debounce and search computations
2020-08-20 16:48:10 +05:30
Shrikant Sharat Kandula
3ae6c745b1
Initial implementation to import examples organization as a migration (#290) 2020-08-20 16:46:23 +05:30
devrk96
0685243534
tabs ui and textinput box-shadow fixed (#345)
Co-authored-by: Satbir Singh <satbir121@gmail.com>
2020-08-20 16:12:45 +05:30
vicky-primathon
b4cb37ddb8
Table Widget: debounce (#313)
* debounce method attached to search component and input field in table widget filters

* debounce used inside RenderInput component to update changed value
2020-08-20 15:01:49 +05:30
vicky-primathon
17af152148
Table Widget: Filter updates (#355)
- Show symbol signifying selected filters in table widget
- Show callout to prompt users to change column data types for accurate filter operations
2020-08-20 15:00:19 +05:30
Arpit Mohan
09c8b00263 Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-08-20 14:20:01 +05:30
Shrikant Sharat Kandula
bd670487a7
Redirect to forked application when signed up by clicking on Fork of a public example app (#335)
* Redirect to forked application works for direct login

Co-authored-by: Trisha Anand <trisha@appsmith.com>
2020-08-20 14:15:54 +05:30
vicky-primathon
296cadbcbb
Fix/rte cursor reset (#317)
* Cursor going to start issue is fixed

* Update editor content when content is updated using bindings

* Setting local editor's content value in debounce onChange to get the latest value passed to parent
2020-08-20 14:10:13 +05:30
Hetu Nandu
0399457599 added flag in notlify toml file 2020-08-20 13:44:07 +05:30
Automated Github Action
41aceb655e Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-08-20 07:05:31 +00:00
vicky-primathon
222ba74996
Table widget initializing selectedRow value to show up in autocomplete (#359) 2020-08-20 12:09:16 +05:30
vicky-primathon
714d107a71
Table column sorting changes (#360)
- Sort icon correction
- Allow users to remove sorting
2020-08-20 12:08:16 +05:30
Hetu Nandu
73f495e4c5
Fix curl import causing action responses to be wiped (#363)
* Fix curl import causing action responses to be wiped

* remove unused
2020-08-20 11:53:25 +05:30
Automated Github Action
9c4601ce58 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-08-20 06:06:22 +00:00
NandanAnantharamu
c680d70b5a
Feature/explorer tests (#309)
* Explorer related test scripts

* updated test data

* Added tests for widget edit/delete from explorer

* Incorporated review comments

* review comments incorporated
2020-08-20 11:08:08 +05:30
Shrikant Sharat Kandula
f57e2a2fb8
Refactor: Remove unused type parameter in AnalyticsService (#340)
* Move repeated code for analytics into functions inside AnalyticsService

* Fix type parameters in BaseService & BaseController
2020-08-20 10:47:22 +05:30
Hetu Nandu
f70c55c681
Show warning when mail client is not enabled on an instance (#333)
* Adds the `APPSMITH_MAIL_ENABLED` flag on client
* Shows warning if email service not configured for inviting users in an org
* Shows warning if email service not configured for password reset
2020-08-20 10:43:20 +05:30
Automated Github Action
bc40d337f5 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-08-19 10:05:37 +00:00
Tejaaswini Narendra
6b411cae7a
fix: Add loading indicator while fetching user details. (#329)
* fix: Add loading indicator while fetching user details.

* update: Variable name
2020-08-19 15:32:33 +05:30
Trisha Anand
efab105e19
Clone Page feature inside an application (#357)
* Working version of cloning page given page id. The clone is created inside the same application and is in unpublished state.

* Added a test case for Clone Page feature

* Incorporated review comments.
2020-08-19 15:20:00 +05:30
Automated Github Action
f078f07161 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-08-19 09:36:43 +00:00
Hetu Nandu
9a1658e2c1
Fixes for autocomplete (#351)
* Fix tern guessing for completions

* Probable fix for create api button not working

* Close autocomplete when "Backspace" or "Comma" is pressed

* Only show extra docs when ctrl+space is pressed when hint is selected

* Fix issue with action form state params not disabling after taking an action
2020-08-19 14:51:32 +05:30
Automated Github Action
0678ed16e5 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-08-19 09:05:47 +00:00
Hetu Nandu
abc6f3f6a6
Update postgres test datasource (#356) 2020-08-19 14:00:42 +05:30
Automated Github Action
5058cd0740 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-08-19 06:07:51 +00:00
Abhinav Jha
432c32e31e
Fix: Entity Explorer - Entity loaders (#331)
- Fixes issue where the loading state progress indicators do not show up on entities in the explorer.
2020-08-19 11:24:57 +05:30
vicky-primathon
eb62ff6675
Table Widget: Action Button name from evaluated values (#332)
- Add evaluated property in Table widget action button property control component to fix the evaluated value
2020-08-19 11:22:19 +05:30
satbir121
51ce6b320c
Fixing Application crashes when query is moved. (#350) 2020-08-19 11:17:54 +05:30
Automated Github Action
e544d228e0 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-08-19 05:05:13 +00:00
Hetu Nandu
590afa7a30
Fix query response state (#348) 2020-08-19 10:07:20 +05:30
Automated Github Action
fe0817b1e2 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-08-18 22:05:23 +00:00
satbir121
901932f9d7
Switching to system fonts (#344)
* Switching to system fonts

* Fixed text alignment issue in text component.

* Changing font of ads components.

* Adding a font type

* Removing unused fonts

* Making fonts in theme an object.

* Removing unncessary font declerations

* Fixing storybook

* Reverting background remove
2020-08-19 03:21:23 +05:30
Automated Github Action
2e71c2aa77 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-08-18 13:12:19 +00:00
Abhinav Jha
6776f6a251
Patch: New widget property pane offset (#347) 2020-08-18 18:40:07 +05:30
Automated Github Action
755dbf273d Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-08-18 13:05:23 +00:00
akash-codemonk
a73c0fd7d2
Fix tab name overflowing (#343)
- Set minimum width to 150 px, stretch if it exceeds
2020-08-18 18:06:45 +05:30
Automated Github Action
fb28b4e4b9 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-08-18 12:07:07 +00:00
vicky-primathon
33cd1ac1d9
Fix-table filtered data calculations (#342)
* Update table widget's filtered data calculations to avoid recursive dataTree evaluations

* Stringify removed from Table component as data is already checked inside TableWidget

* Vertical scrollbar removed from Table Widget. Stop column sorting by stopping event propagation when clicking column menu icon.

Co-authored-by: Abhinav Jha <abhinav@appsmith.com>
2020-08-18 17:00:26 +05:30
Automated Github Action
850f614e27 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-08-18 11:04:58 +00:00
Abhinav Jha
1eb193249e
Fix: Table widget pagination cypress tests (#338)
* Fix breaking cypress tests for table widget pagination

* Remove commented code
2020-08-18 16:00:36 +05:30
akash-codemonk
b58a7158d5
Fix query response table style (#341)
- Overide table body height to auto to take the available space
2020-08-18 15:48:43 +05:30
Automated Github Action
c9abaf5b57 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-08-18 09:05:35 +00:00
Hetu Nandu
c4ac4668c2
Launch polish bug fixes (#337)
* Make sure default page is first in view mode

* Update query form on name change

* Add copy support for deploy link

* Show server error when timeout occurs on first load
2020-08-18 14:18:06 +05:30
akash-codemonk
52b48b0c34
Update empty state of Dropdown component (#339) 2020-08-18 14:12:46 +05:30
Automated Github Action
e5712b89d3 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-08-18 08:06:22 +00:00
Hetu Nandu
bb369e6bdf
Fix overflowing multi select widget (#320)
Co-authored-by: Akash N <akash@codemonk.in>
2020-08-18 13:11:53 +05:30
Automated Github Action
d07709b5b0 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-08-18 07:05:42 +00:00
akash-codemonk
7eac30f82a
Tab should indent in query editor (#327) 2020-08-18 12:15:09 +05:30
akash-codemonk
1e10f39fa6
App homepage header new design (#301) 2020-08-18 12:10:11 +05:30
Automated Github Action
04aba94993 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-08-18 06:11:25 +00:00
Trisha Anand
82018547f5
Added tests to test invite user permissions for administrators and developers and make public app permissions for only administrators. Also added test to ensure that roles for an organization are being returned depending on the current user's roles. (#326) 2020-08-18 10:53:46 +05:30
Hetu Nandu
96cdc074f3 Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-08-17 20:31:27 +05:30
akash-codemonk
664d55053d
Add email validation for email input (#276)
Co-authored-by: Hetu Nandu <hetunandu@gmail.com>
2020-08-17 19:53:57 +05:30
Hetu Nandu
dca9e705a5
Access env variables in index.html via ejs (#334)
* Fix for intercom env variable

* Add GA via env variables
2020-08-17 19:51:42 +05:30
Automated Github Action
275848c3d2 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-08-17 14:05:42 +00:00
Tejaaswini Narendra
a0b823b1ca
Fix: User management table height. (#324)
* fix: Table Height

* fix: update styles
2020-08-17 19:08:05 +05:30
Automated Github Action
1850990f40 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-08-17 11:05:00 +00:00
Arpit Mohan
a7c4fe697e Merge branch 'master' into release
# Conflicts:
#	README.md
#	app/client/yarn.lock
#	deploy/install.sh
2020-08-17 16:33:37 +05:30
Automated Github Action
052ac4e0ad Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-08-17 10:05:29 +00:00
Abhinav Jha
28e3831862
Fix: Jump issue of APIPane fields (#330) 2020-08-17 15:13:25 +05:30
Trisha Anand
336514344b
If an invited user follows the path of reset password (instead of sign up), this should be allowed. (#328) 2020-08-17 14:57:41 +05:30
Automated Github Action
98bad427dc Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-08-17 09:05:56 +00:00
vicky-primathon
10ba66485d
Show add filter in table widget only when one filter is selected (#271) 2020-08-17 13:51:55 +05:30
akash-codemonk
30e93ea9df
Validate datasource name without calling update api (#323)
* Validate datasource name without calling update api

* Use EditableText for datasource name
2020-08-17 13:45:07 +05:30
Automated Github Action
6205b33e01 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-08-17 08:05:52 +00:00
vicky-primathon
aba53c0627
Table widget row items color changed. Pagination font-size changed. Search and pagination item font-size changed. (#314) 2020-08-17 13:11:50 +05:30
vicky-primathon
cf91361637
Fix: table compact mode to persist and saved from canvas editor (#316)
* Table widget compact mode to persist after reload

* Table widget compact mode to be saved from canvas editor
2020-08-17 13:03:37 +05:30
vicky-primathon
b7815006a1
Fix: selection of correct table row data after sort, search and filter (#315)
* Table fix sort, search and filter methods to set correct selectedRow after these methods are applied

* Filtering table data with the latest filters, to correctly select the row

* Setting initial filteredTableData value

* Updating filteredTableData when tableData is updated
2020-08-17 13:01:17 +05:30
Automated Github Action
effcf16b18 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-08-17 05:06:48 +00:00
Hetu Nandu
855fc1c00a
Fixes date widget crashing when no date format is mentioned (#322)
Fixed by using a proper default format string for ISO dates
2020-08-17 10:33:15 +05:30
Automated Github Action
304669daf0 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-08-17 04:05:50 +00:00
satbir121
cbc4796921
Fixing icon story disabled prop. (#321) 2020-08-17 09:31:15 +05:30
satbir121
ac91bedb98
Table component ads (#251)
* Adding blank components.

* Adding Todo note for tree

* Adding todo note for LighteningMenu

* ads button component

* Adding storybook support.

* storybook integrated with button component

* ads button component props completed

* button component icon and loading logic implemented

* button component completed

* Added a text knob.

* Adding default text for button.

* Merging theme and other fixes.

* Fixed info button.

* Better types.

* Adding background param to components.

* Re-using vsariant for callount.

* Added props for Text input.

* Adding text component.

* feedback changes added in button and icon component

* type any removed in button component

* function naming corrected

* table component ui and sorting implemented

* table component default sorting implemented

* Fixing spinner issues

* Fixing bad merge

* table feedback implemented

* merge conflict resolved

Co-authored-by: Rohit Kumawat <rohit.kumawat@primathon.in>
2020-08-17 08:55:35 +05:30
dependabot[bot]
5765552629
Bump prismjs from 1.20.0 to 1.21.0 in /app/client (#308)
Bumps [prismjs](https://github.com/PrismJS/prism) from 1.20.0 to 1.21.0.
- [Release notes](https://github.com/PrismJS/prism/releases)
- [Changelog](https://github.com/PrismJS/prism/blob/master/CHANGELOG.md)
- [Commits](https://github.com/PrismJS/prism/compare/v1.20.0...v1.21.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-14 22:28:42 +05:30
Hetu Nandu
5af1da5f3a Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-08-14 17:19:25 +05:30
Hetu Nandu
f38cd1da1f
Intercom object check before execution (#312) 2020-08-14 17:12:58 +05:30
Automated Github Action
96d4e2b787 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-08-14 11:05:44 +00:00
Hetu Nandu
a560761a53
Fixes for Intercom check and alias paths 2020-08-14 16:34:46 +05:30
Hetu Nandu
252a7670b6
App Intercom app id to activate it (#22) 2020-08-14 16:03:01 +05:30
Automated Github Action
fa72df3c36 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-08-14 10:06:03 +00:00
Shrikant Sharat Kandula
a79951bae9
Don't always automatically create a blank personal org (#306)
* Don't always automatically create a blank personal org

It will still be created, only if a example template organization
has not been configured in the system.

* Name examples organization same as personal organization

* Minor fixes in tests

* Remove unused userService in clone tests
2020-08-14 15:30:52 +05:30
Hetu Nandu
7f8befc365
Update support menu (#259)
Add a default help menu with
* Report a Github issues link
* Documentation link
* Github discussions link
* Intercom link support
* App version id support
2020-08-14 15:17:47 +05:30
Automated Github Action
e3e9796d23 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-08-14 09:05:25 +00:00
vicky-primathon
72d08b6c99
Fix-Operator in table filter made as empty by default (#272)
* Operator in filter made as empty be default

* Added props.placeholder as dependency for useEffect in CascadeField component
2020-08-14 14:30:59 +05:30
Automated Github Action
b8507be571 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-08-14 08:06:13 +00:00
Hetu Nandu
d24d0ed17c
Fixes to data tree appsmith entities (#307)
* Fixes to data tree appsmith entities
* Add app mode `appsmith.mode`
* Add a common app data state for appsmith namespace entities
* Add autocomplete entries for btoa and atob
* Add urlString property in appsmith.url for full url
2020-08-14 13:13:01 +05:30
Abhinav Jha
e22a9c6dc6
Entity Explorer Fixes (#305)
* Fix: modal widget closes when navigating to the widgets pane from explorer

* Fix: Align API input tab with the headers

Fix: align delete and run buttons to the right in queries pane

* Fix: while dragging, the cursor must be 'grabbing'

* Set new widget name in editing mode

* Fix: While property pane is open, changing the widget name in entity explorer does not update the name in the property pane

* Fix: The expanded entity property value popup should not have a label, as its function is only to show the full version of truncated data

* Feature: Edit datasource name from entity explorer

* Fix: Allow users to navigate from the placeholder text

* Fix: When moving or copying apis, navigate to the moved or copied api
2020-08-14 12:48:30 +05:30
devrk96
ef2eb6107d
Tabs component Appsmith Design System (#300)
* Adding blank components.

* Adding Todo note for tree

* Adding todo note for LighteningMenu

* ads button component

* Adding storybook support.

* storybook integrated with button component

* ads button component props completed

* button component icon and loading logic implemented

* button component completed

* Added a text knob.

* Adding default text for button.

* tabs component implemented and theme type added

* Merging theme and other fixes.

* Fixed info button.

* Better types.

* Adding background param to components.

* Re-using vsariant for callount.

* Added props for Text input.

* Adding text component.

* tab props fixed

* feedback changes added in button and icon component

* type any removed in button component

* key prop fixed and icon margin corrected

* Fixing spinner issues

* Removing unwanted files.

* tab header icon size fixed and story updated

* new tab added in tabs story

Co-authored-by: Satbir Singh <satbir121@gmail.com>
Co-authored-by: satbir121 <39981226+satbir121@users.noreply.github.com>
2020-08-14 12:41:38 +05:30