Commit Graph

2904 Commits

Author SHA1 Message Date
Nikhil Nandagopal
3829ccbbd0 Merge branch 'master' of github.com:appsmithorg/appsmith
# Conflicts:
#	.github/workflows/client.yml
2020-10-30 20:13:49 +05:30
vicky-primathon
6a0e573c50 Query table scroll issue fixed (#1464)
* Query table scroll issue fixed

* Table widget horizontal scroll fix
2020-10-30 16:47:19 +05:30
vicky-primathon
b74bec311e
Query table scroll issue fixed (#1464)
* Query table scroll issue fixed

* Table widget horizontal scroll fix
2020-10-30 16:18:57 +05:30
Arpit Mohan
17ae082637 Moving to conditional if steps 2020-10-30 15:11:59 +05:30
Arpit Mohan
4df2801643 Splitting the if conditions 2020-10-30 15:04:01 +05:30
Arpit Mohan
ca72e1f382 Trying a different syntax 2020-10-30 14:57:38 +05:30
Arpit Mohan
0595b8d05a Adding more debug logging 2020-10-30 14:52:34 +05:30
Arpit Mohan
594bae4d17 Making the default shell bash 2020-10-30 14:49:37 +05:30
Arpit Mohan
184cda75cf Minor changes in the client.ymp file 2020-10-30 14:17:31 +05:30
Arpit Mohan
7b76dfd293 Adding debug logs for the output variable 2020-10-30 14:10:14 +05:30
Arpit Mohan
71f5daac3a Debugging the github ref 2020-10-30 13:42:31 +05:30
Arpit Mohan
587a90af0f Adding a separate step for the server docker image 2020-10-30 13:24:08 +05:30
Arpit Mohan
97e4df6fc2 Adding dummy commit to trigger build 2020-10-30 13:08:30 +05:30
Arpit Mohan
b15c0a1f0b Fixing the docker image name for master builds 2020-10-30 12:56:48 +05:30
Arpit Mohan
12c874cca7 Fixing merge conflicts when cherry picking 2020-10-30 12:55:47 +05:30
Arpit Mohan
862a310050 Fixing merge conflicts during cherry picking 2020-10-30 12:54:52 +05:30
Arpit Mohan
ccea01cb21 Ensures that the master & release flows pick appropriate server Docker images (#1465) 2020-10-30 12:43:52 +05:30
Nikhil Nandagopal
2557c1748c Merge branch 'master' of github.com:appsmithorg/appsmith 2020-10-27 11:39:36 +05:30
Nikhil Nandagopal
427aa7e74c disable sentry perf (#1399) 2020-10-27 11:39:05 +05:30
Nikhil Nandagopal
790d202662 Update netlify.toml 2020-10-27 11:33:49 +05:30
Arpit Mohan
7758f5d750 Merge branch 'release' 2020-10-25 21:02:08 +05:30
Arpit Mohan
13fc69a2bb Disabling Sentry to check app load performance 2020-10-25 20:39:05 +05:30
Arpit Mohan
3cbb79c8b9 Merge branch 'release' 2020-10-25 13:11:34 +05:30
Arpit Mohan
2382af48e1 Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-10-25 12:37:47 +05:30
Nikhil Nandagopal
411c2c24c3
Added check for config crashing when entity properties are not present (#1394)
Co-authored-by: Arpit Mohan <mohanarpit@users.noreply.github.com>
2020-10-25 12:37:17 +05:30
Arpit Mohan
d502e08040 Fixing merge conflicts 2020-10-24 21:30:21 +05:30
Automated Github Action
00b1249461 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-10-24 15:07:55 +00:00
Hetu Nandu
ea0d873ac8
Fix JS switch failing when going back to normal (#1388)
Fixes: #1389
2020-10-24 19:59:53 +05:30
Automated Github Action
5f89256041 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-10-24 12:10:17 +00:00
Hetu Nandu
32469f50b2
Fix for app view not opening correct page (#1387)
Fixes: #1385
2020-10-24 17:15:16 +05:30
Arpit Mohan
2be2d441c6 Merge branch 'master' of github.com:appsmithorg/appsmith 2020-10-23 23:53:01 +05:30
Arpit Mohan
c092297dbc Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-10-23 23:37:43 +05:30
Hetu Nandu
f4d9277950
Fix this (#1379) 2020-10-23 23:32:59 +05:30
Arpit Mohan
d977befc54 Merge branch 'master' of github.com:appsmithorg/appsmith 2020-10-23 20:58:58 +05:30
Automated Github Action
4eaa52f520 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-10-23 15:07:54 +00:00
Arpit Mohan
c6d4902e3d
Adding microsoft SQL server plugin integration (#1374) 2020-10-23 20:36:45 +05:30
akash-codemonk
e9c40da8fd
Fix widget not having query data (#1372)
* Initialise the tableData and dynamic binding prop adding widget
2020-10-23 20:05:07 +05:30
Arpit Mohan
4cd9964649 Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-10-23 13:32:13 +05:30
akash-codemonk
9d27315213
Update datasource form config to include encrypted property (#1360) 2020-10-23 13:31:46 +05:30
Arpit Mohan
dd6cef5d82 Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-10-22 18:46:08 +05:30
Hetu Nandu
6dc40970ef
Fix async evaluation issues (#1348)
* Fix issue with deleted widgets still showing up in binding reference

* Fix for firefox not letting errors pass through
2020-10-22 18:45:50 +05:30
Arpit Mohan
365e9b6bf6 Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-10-22 17:56:35 +05:30
Shinn Lok
4768fd3848
Fix organization ordering by name on the homepage (#1177) 2020-10-22 17:53:51 +05:30
Automated Github Action
4470beeab1 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-10-22 12:10:31 +00:00
Akshay Avinash
474d95b9b4
Updated check to see appsmith editor link based on permissions (#1247) 2020-10-22 17:38:51 +05:30
Arpit Mohan
fc9562fb85 Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-10-22 16:42:00 +05:30
Arpit Mohan
74fe08f8bf
Adding the database changelog for Redis (#1346)
1. Fixing the build by excluding the slf4j-api from redis-plugin pom.xml
2. Adding the editor.json and form.json for the query pane & datasource pane.
3. Adding array handling in the Redis response by feeding all the output into a "result" key
2020-10-22 16:40:19 +05:30
Automated Github Action
e99e8d8673 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-10-22 08:09:01 +00:00
Prashant Chaubey
bf69c7d66b
Adding basic structure for plugin integrating with Redis (#1085)
Co-authored-by: nitesh261193 <nitesh261193@gmail.com>
2020-10-22 13:26:58 +05:30
Hetu Nandu
4ffbd16ea8 Fix Dropdown widget selection (#1340) 2020-10-22 01:43:25 +05:30