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

5830 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Hetu Nandu
e1f1e6292d 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 16:49:43 +05:30
satbir121
550a370f57 Adding base64 library to realm executor (#304) 
* Adding base64 library to realm executor

* Changing base64 interface to btoa and atob

* Making base64 a dependancy
 2020-08-17 16:49:31 +05:30
Abhinav Jha
a4e8b0d5db Add sentry release and environment configurations (#277) 
* Add sentry release and environment configurations

* Fixing nginx config issue

Co-authored-by: Satbir Singh <satbir121@gmail.com>
 2020-08-17 16:47:59 +05:30
Hetu Nandu
78c4b5a382 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 16:43:14 +05:30
satbir121
3b1c43dbdc Adding base64 library to realm executor (#304) 
* Adding base64 library to realm executor

* Changing base64 interface to btoa and atob

* Making base64 a dependancy
 2020-08-17 16:41:22 +05:30
Abhinav Jha
dbc179cead Add sentry release and environment configurations (#277) 
* Add sentry release and environment configurations

* Fixing nginx config issue

Co-authored-by: Satbir Singh <satbir121@gmail.com>
 2020-08-17 16:38:57 +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
Nikhil Nandagopal
3c80de61e5
Update README.md 2020-08-17 12:32:32 +05:30
Automated Github Action
cfc0e6487a Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-08-17 06:07:32 +00:00
Arpit Mohan
88c45118e7
Encoding the mongo credentials in install.sh script (#310) 
This is to ensure that we handle special characters in the mongo url that's given to the Java server during configuration.
 2020-08-17 11:10:01 +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
Apoorv Mishra
dc10566740
Update install.sh to install docker-compose separately (#319) 
Fixes #318

The issue occurred because code assumes that if docker is already installed, docker-compose would have been installed too. This PR is an attempt to fix it.
 2020-08-16 17:36:34 +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
Automated Github Action
679a81792e Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-08-14 07:05:49 +00:00
akash-codemonk
476dc2bd88
Remove phone number (#299) 2020-08-14 12:04:25 +05:30
Automated Github Action
c47e66cf0c Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-08-14 06:06:03 +00:00
Shrikant Sharat Kandula
50e8ee7255
Fix link in invite emails to point to signup page (#268) 
* Fix link in invite emails to point to signup page

* Auto-fill email in signup page and remove CreatePassword component
 2020-08-14 11:31:50 +05:30
Abhinav Jha
51b2410372
Fix issue where the copy info text overlaps the property binding text (#286) 
* Fix issue where the copy info text overlaps the property binding text

* Add padding to copy icon and change color
 2020-08-14 11:25:06 +05:30