Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity
5,314 Commits 1 Branch 0 Tags 507 MiB
7bd1e9587c
Commit Graph

5314 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tejaaswini Narendra
b65cdf68b0
feat: Add org share option to application share modal (#166) 
* feat: Add org share option to application share modal

* fix: Update design and implement copy to clipboard

* fix: Show share based on permission and update modal UI

- Update modal style
-  show application share button only to admins.

* fix: refine code
 2020-08-03 14:44:08 +05:30
Arpit Mohan
953e03e24f Adding the automated username & email for merges 2020-08-03 13:49:56 +05:30
Automated Github Action
61b811e343 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-08-03 04:05:03 +00:00
dependabot[bot]
2b2a06e9e1
Bump elliptic from 6.5.2 to 6.5.3 in /app/client (#204) 
Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.2 to 6.5.3.
- [Release notes](https://github.com/indutny/elliptic/releases)
- [Commits](https://github.com/indutny/elliptic/compare/v6.5.2...v6.5.3)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-08-03 09:16:56 +05:30
Automated Github Action
28a495fbc7 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-08-03 03:05:02 +00:00
areyabhishek
3fa0beef9c
Update README.md (#188) 2020-08-03 07:47:10 +05:30
Automated Github Action
225a7cec5e Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-08-03 02:05:29 +00:00
Shrikant Sharat Kandula
cef1241bcb
Return 200 when action could not be executed (#202) 2020-08-03 07:35:14 +05:30
Automated Github Action
3c9021a6ea Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-07-31 11:04:39 +00:00
Hetu Nandu
f8c2bd5d42
Update binding highlight styles (#136) 
Co-authored-by: Nikhil Nandagopal <nikhil@appsmith.com>
 2020-07-31 15:47:18 +05:30
Automated Github Action
b3130f00aa Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-07-30 11:04:36 +00:00
Shrikant Sharat Kandula
43304ca146
Fix form data not showing up in the right place when importing from curl (#198) 2020-07-30 16:30:39 +05:30
Automated Github Action
6d8e1d623f Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-07-30 08:05:00 +00:00
Arpit Mohan
c033698269 Adding the automated username & email for merges 2020-07-30 12:53:26 +05:30
Arpit Mohan
6bd994a9ba
Removing the option --nobest from the apt install command (#196) 2020-07-30 11:18:48 +05:30
Arpit Mohan
87811401de Merge branch 'release' of github.com:appsmithorg/appsmith-ee into release 2020-07-30 10:14:46 +05:30
Arpit Mohan
0e87baf395 Cloning the entire repo so that merge is possible 2020-07-30 10:14:30 +05:30
Trisha Anand
8c36a5b27a Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-07-29 16:59:05 +05:30
Trisha Anand
c6a9fc2bb4
Organization getById should use custom repository get function (#195) 
* Overwriting the base service's getById for OrganizationService to ensure that the response contains userPermissions (by using custom repository instead of default mongo repository classes)

* Fixed the failing test cases.

* Minor code formatting.
 2020-07-29 16:57:46 +05:30
Arpit Mohan
4475bc2b1e
Configuring dynamic redirect post login (#194) 
The client will have to send a query parameter redirectUrl or a header X-Redirect-Url in order for the server to redirect the client to the appropriate URL post login. If neither of these parameters are present, the client is redirected to /applications by default.

Co-authored-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
 2020-07-29 16:07:40 +05:30
dependabot[bot]
4b026d5acb
Bump lodash from 4.17.15 to 4.17.19 in /app/client (#132) 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-07-29 15:43:38 +05:30
Arpit Mohan
52d69382f6 Merge branch 'release' 2020-07-29 15:36:16 +05:30
Arpit Mohan
18745ceef1
Merge pull request #17 from appsmithorg/fix/remove-marketplace-netlify 
Removing marketplace url from netlify configuration
 2020-07-29 14:34:07 +05:30
Arpit Mohan
54e981da30 Removing marketplace url from netlify configuration 2020-07-29 14:31:39 +05:30
vicky-primathon
527bb5898a
Fix-The tabs should scroll with the increase in the number of tabs. (#131) 
* Fixed tabs widget bugs and other updates:
1. Moved drag icon to the left of tab name field in the tabs widget property pane
2. Change drag icon
3. Add scroll when the tabs occupy more width than the width of tabs widget.
4. Add selected tab name validation.
5. Hide overflow tabs.
6. Avoid vertical scrollbars in tabs widget header
 2020-07-29 14:31:17 +05:30
Arpit Mohan
576ca2bc3b
Merge pull request #16 from appsmithorg/release 
Release
 2020-07-29 13:58:43 +05:30
Trisha Anand
eba38ae1fa
During signup, if the user already exists, instead of throwing a generic duplicate key exception, request the user to sign in. (#192) 
* During signup, if the user already exists, instead of throwing a generic duplicate key exception, request the user to sign in.

* Minor change in the error message.
 2020-07-29 13:44:23 +05:30
Arpit Mohan
8c5bd36350 Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-07-29 13:04:55 +05:30
Abhinav Jha
08d2a94768
Change derivedpropertiesmap for selectedRow to use filtered table data (#173) 
* Add a new meta property to tableWidget called filteredTableData which will be used by the table to filter

* Use derived properties to update filteredTableData

* Check if search is done via actions, if so, filteredTableData is the same as tableData
 2020-07-29 11:45:06 +05:30
Arpit Mohan
9575abc602
Fixing minor typos in the README (#186) 2020-07-29 11:33:40 +05:30
NandanAnantharamu
3c5d93e699
Feature/validate request header (#189) 
* validate request header

* Validate request header for API tests

Co-authored-by: Nandan Anantharamu <Nandan@thinkify.com>
 2020-07-29 11:30:03 +05:30
Shrikant Sharat Kandula
60efdb998b
Fix: Datasource password gets double encrypted on cloning (#191) 
* Decrypt sensitive fields before cloning a datasource

* Fix NPE in cloning datasource when configuration is missing
 2020-07-29 11:12:04 +05:30
Arpit Mohan
b159a1eeb5 Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-07-29 10:57:11 +05:30
Arpit Mohan
7ffd5993e7 Modifying the remote add https url 2020-07-29 01:05:42 +05:30
Arpit Mohan
f6debe1178 Correcting the docker tags built during release 2020-07-28 20:09:41 +05:30
Trisha Anand
9c51ac3f8d
🔥 & forget asynchronous email sending (#187) 
* Email sending is now an asynchronous function. It follows a 🔥 & forget strategy to make it run asynchronously.
 2020-07-28 20:06:12 +05:30
vicky-primathon
e794c916e6
Fix-Row to be selected when button is clicked and row is not selected (#167) 
* Row selection when button is clicked and row is not selected

* Added columnActions to useMemo for columns computation to support live action name updated and action change support
 2020-07-28 19:56:27 +05:30
Arpit Mohan
1b2b47342b Adding the github action to sync release branch from CE 2020-07-28 19:36:51 +05:30
Arpit Mohan
9c0b2a4e33 Merging community release 2020-07-28 19:27:12 +05:30
Arpit Mohan
1b67c76479 Merge branch 'release' 2020-07-28 18:53:32 +05:30
Arpit Mohan
ad41063944
Fixing bug for beta releases (#185) 2020-07-28 18:52:59 +05:30
Arpit Mohan
ecf07e054e Merge branch 'release' 2020-07-28 18:22:04 +05:30
Arpit Mohan
7eda0f0201
Making the pre-release tag configurable based on the tag (#184) 2020-07-28 18:21:40 +05:30
Shrikant Sharat Kandula
66bf23106d
Fix cloning fails in some cases for organizations (#159) 
* Fix cloning fails in some cases for organizations

Cloning currently fails in cases like the following:
- Application with no pages
- Pages with no actions
- Pages with more than one action

* Remove debug naming of cloned datasources

* Add test for organization cloning

* Add more tests for organization cloning

* Fix potential race condition in adding pages to an application

* Move db update call to add page to application, into repository

* Use `getIdCriteria` to query for document's _id
 2020-07-28 17:54:06 +05:30
Arpit Mohan
c849f988d3 Merge branch 'release' 2020-07-28 17:33:24 +05:30
Arpit Mohan
0bff7ca165
Adding nightly builds that will be generated on each push to master (#183) 
The latest tag will only be generated when a non-beta Github release is created.
 2020-07-28 17:33:05 +05:30
Hetu Nandu
01a3d4682f
Fix action batching issue (#181) 2020-07-28 16:11:51 +05:30
Arpit Mohan
6bdcb985d4 Merge branch 'release' 2020-07-28 15:04:34 +05:30
Arpit Mohan
f3d88bc8b8
Removing erroneous condition on master branch (#180) 2020-07-28 15:04:13 +05:30
Arpit Mohan
75b1ea191a Merge branch 'release' 2020-07-28 14:55:40 +05:30