Commit Graph

2576 Commits

Author SHA1 Message Date
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
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
c31fb9acd4 Correcting the Github Action for the client Docker image build 2020-07-09 18:53:13 +05:30
Arpit Mohan
9c6b2967de Adding the step to add the release tag based on the branch in the client Docker image 2020-07-09 18:51:31 +05:30
Arpit Mohan
e2f3ab538b Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-07-09 18:40:54 +05:30
Arpit Mohan
7dbda01ba4 Removing extra lines from client README 2020-07-09 18:40:35 +05:30
Arpit Mohan
3fcf44948f
Adding the steps to build docker container for the client codebase (#63)
Also adding the steps to run Jest tests for the client
2020-07-09 18:39:21 +05:30
Arpit Mohan
ed00c59068 Adding instructions on how to test the code in app/server/README 2020-07-09 17:54:12 +05:30
Arpit Mohan
449b94d59a Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-07-09 17:50:43 +05:30
Arpit Mohan
e9d87084f4 Correcting the Docker image repository path for CE server builds 2020-07-09 17:49:53 +05:30
Arpit Mohan
8adb4f15e1 Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-07-09 11:22:45 +05:30
trishaanand
9eedb15620
Updating anonymous user permissions for application and associated pages & actions when public access is modified (#57)
* On setting an application to public view, correct permissions are assigned to the application and its pages & actions.

* If anonymous user is allowed a certain permission, the all users (anonymous/logged in) should be allowed the certain permission.
2020-07-09 11:21:39 +05:30
Arpit Mohan
bb59a555b1 Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-07-08 20:25:09 +05:30
Arpit Mohan
a51920f814 Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-07-08 17:14:09 +05:30
trishaanand
53b61b4942
Skeleton code added for changing application view between public and private to help with client development. (#56) 2020-07-08 17:13:42 +05:30
Arpit Mohan
c67e390b0e Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-07-08 15:46:49 +05:30
Tejaaswini Narendra
7737b57667
Feat/page not found (#37)
* Feat: Implement page not found UI

* fix: check user login status and minor code refactoring

 - Check if user is logged in or not in page header.
 - Based on login status show relevant CTAs
 - Fix ESLint errors
 - Move RoleNameCell and DeleteActionCell as seperate components.

* fix: Add catch all for pagenotfound

* fix: Use constants and update css syntax.

Co-authored-by: Arpit Mohan <me@arpitmohan.com>
2020-07-08 15:44:03 +05:30
akash-codemonk
5f39dfd88b
Fix new query flag value (#55) 2020-07-08 15:04:50 +05:30
trishaanand
a5a3a5f4a2
Bug fix - In case of invited user signing up on Appsmith, the password is getting doubly hashed leading to sign in breaking for this user. (#51)
* Bug fix is working. Added a test case which is not working.

* Code cleanup. Test case fixed. Now, when we set the user to enabled, we also store the password that has been passed to the flatMap.

* Minor code cleanup.
2020-07-08 13:16:13 +05:30
Arpit Mohan
93c90d3a12 Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-07-08 11:57:05 +05:30
trishaanand
765f1c7164
Get user profile should return anonymousUser instead of 401 unauthorized in case the API is called without logging in. (#50)
This will help us display the 404 page on the client reliably.
2020-07-08 11:54:00 +05:30
Arpit Mohan
930d802475 Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-07-08 11:09:09 +05:30
Arpit Mohan
f10a00c87d
Adding the environment configurations for EE in netlify.toml (#2) 2020-07-07 16:27:43 +05:30
Arpit Mohan
3d9ea63769 Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-07-07 15:53:55 +05:30
Abhinav Jha
94b28311c6
Use injected configuration from Nginx at runtime instead of build time (#30)
* Use envsubst and nginx templates to generate nginx configs which can substitute environment variables and inject into the index.html file

* Fix path in dockerfile. Add .gitignore and .env.example files. Fix nginx-linux template.

* Add all environment variables. Add prefix to all environment variables. Update scripts to attempt to substitute all environment variables with the prefix

* Setup dockerfile to execute a bash script. use env.example for fetching environment variables in development

* Toggle features based on injected configs. Fix nginx template substitution script.

* Update env.example file

* Remove debug code from start-nginx.sh

* Fix nginx config templates by adding quotes by default. Fix sed regex to include numerals. Toggle social login buttons on Login page based on the config.

* Update rapid api environment variable name. Toggle oauth buttons based on config in SignUp page. Update .env.example to be a union of server and client environment variables

* Adding a Map disabled message on Map widget

* Adding links to Privacy policy and TNC

* Use REACT_APP_ env variables with higher priority over injected config variables for toggling features

* Update netlify.toml by commenting out the build environment variables

* Remove env variables not required by the client

* Remove start-storybook entry from package.json

* Fix netlify.toml. Fallback algolia configs

* Add contexts to netlify.toml for successful deploys. Swith to using APPSMITH_MARKETPLACE_URL as the toggle for RapidAPI feature on the client. Remove comments in nginx config templates. Fix template used in dockerfile.

Co-authored-by: Satbir Singh <apple@apples-MacBook-Pro.local>
Co-authored-by: Satbir Singh <satbir121@gmail.com>
2020-07-07 15:52:17 +05:30
Arpit Mohan
5d014ea9af Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-07-07 14:20:07 +05:30
Hetu Nandu
d85376b90c
Remove current value popup from function call fields (#49) 2020-07-07 14:19:22 +05:30