Commit Graph

16958 Commits

Author SHA1 Message Date
Arpit Mohan
3affa82bdb Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-07-15 16:43:17 +05:30
Trisha Anand
212e98c4ba
Fixing test cases failing due to non unique names. (#100) 2020-07-15 16:42:53 +05:30
Trisha Anand
4b3ace9d9e Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-07-15 16:29:50 +05:30
Arpit Mohan
6c16cba4b9
Adding null checks before encrypting or decrypting the password in AuthenticationDTO object (#99)
This ensures that we don't run in NPE
2020-07-15 16:29:05 +05:30
Arpit Mohan
b23c8feb9c Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-07-15 15:49:37 +05:30
Trisha Anand
499d189d6b
Adding EE related environment variables into the docker.env.sh file (#8)
* Adding back marketplace and other EE related environment variable in EE repo
2020-07-15 15:48:37 +05:30
Arpit Mohan
c15f83dbc3
Adding configuration variables for MAIL_FROM and REPLY_TO in EmailConfig (#97)
The MAIL_FROM & REPLY_TO addresses default to appsmith@localhost. This should be changed in the generated docker.env file during deployment to actual values.

Most email providers will not send emails unless they originate from a valid sender ID.
2020-07-15 15:47:33 +05:30
Trisha Anand
f2b10d5759 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-07-15 15:23:09 +05:30
Tejaaswini Narendra
2956f1b3d0
Feat: Share application publicly (#89)
* Feat:  Share application publically

* fix: eslint warnings and code refactor
2020-07-15 15:17:39 +05:30
akash-codemonk
b1e8e83e5d
Show error toast for delete datasource (#93) 2020-07-15 13:30:34 +05:30
Nikhil Nandagopal
de151e1b46
Fix/deploy script (#94)
* Added information to setup domain

* Fixed incorrect var reference

* Updated documentation message

* Updated env template

Co-authored-by: Nikhil Nandagopal <nikhil@appsmith.com>
2020-07-15 12:49:52 +05:30
dependabot[bot]
204e65924f
Bump websocket-extensions from 0.1.3 to 0.1.4 in /app/client (#70)
Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-node) from 0.1.3 to 0.1.4.
- [Release notes](https://github.com/faye/websocket-extensions-node/releases)
- [Changelog](https://github.com/faye/websocket-extensions-node/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faye/websocket-extensions-node/compare/0.1.3...0.1.4)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-15 11:36:02 +05:30
Hetu Nandu
a5fba4db26
Update alias and added some documentation (#6)
Update import alias in the index.tsx and added some documentation in the README
2020-07-15 11:35:02 +05:30
Arpit Mohan
9164e80597
Merge pull request #7 from appsmithorg/release
Release
2020-07-15 11:33:05 +05:30
akash-codemonk
b45cc8f35e
Fix autocomplete for special cases (#31)
* Fix autocomplete for special cases

-  Send the currently focused dynamic binding to tern instead of the entire editor value

* Add tests for TernServer methods

- Make request callback a seperate so that it could be testable
- Add tests for getFocusedDynamicValue, buildRequest and requestCallback

* Keep input and expected values together
2020-07-14 16:00:33 +05:30
Arpit Mohan
4efabb540e Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-07-14 14:46:54 +05:30
Trisha Anand
fd0f23b9cc
Database credentials encryption in MongoDB (#80)
* Encrypting the password stored in AuthenticationDTO for every db.

* Adding comment to the properties file to denote that adding encryption salt and password are mandatory to the server coming up.

* Added the encryption salt and password to server.yml to allow the github actions to succeed.

* Adding database migration to encrypt the existing passwords for authentication object (used for storing db connection username/password)

Changes to the installation script install.sh:

1. Instead of overwriting the existing encryption password or salt, giving the user an option to conserve the previous encryption credentials to ensure that the developer users do not lose access to their database configurations (passwords).
2. Added another file for writing encryption credentials (encryption.env) to ensure that we dont delete the encryption password and salt by mistake.
2020-07-14 14:45:08 +05:30
Arpit Mohan
bebc0cf7aa Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-07-14 13:56:01 +05:30
vicky-primathon
7114936554
Fix/action btn loading in table widget (#28)
* Added Button component in Table widget for actions

* Action button state loading added for Table widget

* Action button font-weight made as normal

* Table button loading state fixed. Table code refactored, rendering from props instead of state in ReactTableComponent

* Table widget action button alignment fixed

* Handled actions column changes

* added proper keys to useMemo for react table widget

* Code refactors and added dependency map with meta props and table data for computing columns

* RenameColumnHeader function renamed to TableHeaderCell

Co-authored-by: Arpit Mohan <me@arpitmohan.com>
2020-07-14 13:25:46 +05:30
vicky-primathon
86b4ec562c
Table column show column fixed. Show icon changed. Columns list made … (#54)
* Table column show column fixed. Show icon changed. Columns list made static in visibility dropdown

* Code review comments handled

* Hiding visibililty options in published mode
2020-07-14 13:10:52 +05:30
Hetu Nandu
612f01b04a
Fix params not saving after url update (#85) 2020-07-14 12:23:33 +05:30
Arpit Mohan
8dfb289540
Merge pull request #5 from appsmithorg/release
Release
2020-07-14 07:13:19 +05:30
Arpit Mohan
fbf4e4f7d2 Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-07-13 23:30:39 +05:30
Manish
2c15487d1b
Deployment script now works on Mac OS X (#86) 2020-07-13 23:29:37 +05:30
Trisha Anand
56acb5c9fd
New endpoint added to get actions by applicationId in view mode. (#88)
* New endpoint added to get actions by applicationId in view mode. Only id, name and jsonPathKeys are returned in view mode.
2020-07-13 23:27:49 +05:30
Arpit Mohan
0f9f29a78c Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-07-13 19:46:31 +05:30
Tejaaswini Narendra
b035241013
fix: error page and get applications API (#77)
* fix: error page and get applications API

* fix: apptoaster check for show variable instead of error code.

* fix: Update naming and combine currentOrgId and OrgDetails.
2020-07-13 19:24:26 +05:30
vicky-primathon
0a1a3e5589
Lightning menu dropdown popper placement fixed in query editor (#59) 2020-07-13 18:36:44 +05:30
Nikhil Nandagopal
d133f9f839
Fix/deploy script (#83)
* Added information to setup domain

* Fixed incorrect var reference

* Updated documentation message

Co-authored-by: Nikhil Nandagopal <nikhil@appsmith.com>
2020-07-13 16:57:46 +05:30
Manish
a193125093
Starting docker daemon if not already running (#82) 2020-07-13 16:00:53 +05:30
Hetu Nandu
3af5d006eb Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-07-11 13:16:23 +05:30
NandanAnantharamu
1b3e8c91a7
Fixing Cypress test cases (#32)
* Removed saveQuery method part for query

* login from env variables

Co-authored-by: Nandan Anantharamu <Nandan@thinkify.com>
Co-authored-by: Hetu Nandu <hetunandu@gmail.com>
Co-authored-by: Arpit Mohan <me@arpitmohan.com>
2020-07-11 12:12:53 +05:30
Nikhil Nandagopal
999239cefa
Update install.sh (#79)
* Update install.sh

* Update deploy/install.sh

Co-authored-by: Arpit Mohan <mohanarpit@users.noreply.github.com>

Co-authored-by: Arpit Mohan <mohanarpit@users.noreply.github.com>
2020-07-10 19:29:34 +05:30
Arpit Mohan
4e08e69351
Adding the deployment shell script for Linux instances (#62)
TODO: Need to add checks for MacOS machines as well.

Co-authored-by: Nikhil Nandagopal <nikhil@appsmith.com>

Co-authored-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2020-07-10 19:18:42 +05:30
Shrikant Sharat Kandula
4796b6edba
Add maven-license-plugin to the project (#73) 2020-07-10 15:58:04 +05:30
Hetu Nandu
3d9962adfa
Add @appsmith namespace (#74)
Adds an @appsmtih alias for managing imports with the EE repo
2020-07-10 14:54:06 +05:30
Arpit Mohan
cc86eec639 Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-07-10 13:13:49 +05:30
Abhinav Jha
5ec134eae7
Use Google Maps API key from configs (#76) 2020-07-10 13:05:27 +05:30
Arpit Mohan
795882b59b Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-07-10 12:13:31 +05:30
Tejaaswini Narendra
a3ec3b3854
Adding CSS class names for testing (#75) 2020-07-10 12:12:51 +05:30
Shrikant Sharat Kandula
a2bbb78b10
Delete merge_repos.sh (#72) 2020-07-10 10:27:38 +05:30
Arpit Mohan
62622184fe Merge branch 'master' of github.com:appsmithorg/appsmith-ee 2020-07-09 22:47:00 +05:30
Arpit Mohan
73b07f9f43 Merge branch 'release' 2020-07-09 22:46:26 +05:30
Arpit Mohan
4626db5793 Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-07-09 22:43:26 +05:30
Trisha Anand
4a720b80e2
Removing the marketplace basic auth credentials which was hard coded into the code to environment variable. (#71) 2020-07-09 22:38:21 +05:30
Arpit Mohan
5e6f5dd7d3 Correcting the Docker images for the appsmith editor and server for EE versions 2020-07-09 21:38:14 +05:30
Arpit Mohan
ccc2136edb Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-07-09 21:36:45 +05:30
Trisha Anand
8734067cad
Resolving the dependabot vulnerabilities. (#69) 2020-07-09 21:12:16 +05:30
Nikhil Nandagopal
3ef53b15f3
Feature/query help (#64)
* bumped up codemirror version

* minor fix

Co-authored-by: Nikhil Nandagopal <nikhil@appsmith.com>
2020-07-09 19:03:34 +05:30
Arpit Mohan
dffe843fe8 Merge branch 'release' 2020-07-09 19:00:22 +05:30