Commit Graph

624 Commits

Author SHA1 Message Date
Arpit Mohan
91fded3ddd Fixing merge conflicts 2020-11-03 07:40:53 +05:30
Sumanth Yedoti
a7ecfd0a6d
Fix(API): remove cursor in API HTTP methods field (#1512)
Fixes: #1249 
Co-authored-by: Yedoti Sumanth <sumanthyedoti@redd.in>
2020-11-02 20:33:46 +05:30
Arpit Mohan
773b069885 Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-11-02 15:07:32 +05:30
akash-codemonk
ac70e5be4d
Update query form UI (#1500) 2020-11-02 15:01:00 +05:30
Abhinav Jha
4f569f4996
Fix issue where datasource was missing for an action (#1498) 2020-11-02 14:58:20 +05:30
Automated Github Action
4c48d61a50 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-11-02 09:08:12 +00:00
akash-codemonk
fbfcfeed2a
Show template menu on click of datasource table (#1410) 2020-11-02 14:24:54 +05:30
Arpit Mohan
e3d5832a78 Merge branch 'master' into release 2020-10-31 17:43:06 +05:30
Arpit Mohan
90e9c131b1 Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-10-31 17:26:29 +05:30
devrk96
7d6a70d3ce
Feature: New create app flow (#1375)
* EditableTextWrapper component implemented

* create new app flow implemented

* test cases for new create new app flow fixed

* role update element fixed

* before-all hooks fixed

* createOrg test cases fixed

* loading state test added

* editableText input unique identifier added in test-cases

* updateApplication API alias name corrected

* removed the second className prop on same component

* PR feedback implemented
2020-10-31 12:10:51 +05:30
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
Automated Github Action
dbdd5a9742 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-10-30 11:08:58 +00:00
vicky-primathon
0508bbd115 Query table scroll issue fixed (#1464)
* Query table scroll issue fixed

* Table widget horizontal scroll fix
2020-10-30 16:20:35 +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
Automated Github Action
7eb11f0007 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-10-29 14:09:24 +00:00
akash-codemonk
9553fe9b19
Merge datasources and actions in explorer (#1285) 2020-10-29 19:23:10 +05:30
Automated Github Action
7e58c95ece Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-10-29 12:11:37 +00:00
devrk96
f6bb16a4e6
Fix: Invalid email error in invite modal (#1368)
* Invalid email error showing on entering incorrect email before submission

* error state name corrected

* colon removed from error message
2020-10-29 16:47:52 +05:30
Automated Github Action
3bc4ca12b3 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-10-28 12:11:09 +00:00
devrk96
5ebea89d98
Test cases: Application update (#1339)
* application name and icon update test cases implemented

* application icon update test case implemented
2020-10-28 17:36:30 +05:30
Automated Github Action
4a754f526b Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-10-28 11:07:52 +00:00
Hetu Nandu
44725c983e
Use global history on 500 page (#1446) 2020-10-28 16:29:34 +05:30
Automated Github Action
ab0f016f03 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-10-28 08:11:24 +00:00
Jeff Rescignano
c967c03494
Add "back to home" CTA on 500 page (#1319)
Fixes: #1303 
Co-authored-by: Hetu Nandu <hetunandu@gmail.com>
2020-10-28 13:38:52 +05:30
Arpit Mohan
ee683157a5 Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-10-28 11:10:06 +05:30
devrk96
15ab7809f8
Org name, email and website update test cases implemented (#1433) 2020-10-28 11:09:28 +05:30
Automated Github Action
07fdd867a6 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-10-27 05:09:54 +00:00
akash-codemonk
0f34c7f38f
Secure connection UI (#1358) 2020-10-27 10:32:32 +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
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
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
951935ac30 Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-10-21 15:35:32 +05:30
satbir121
81a92d40cb
Supporting 5 app cards till 1368px resolution (#1270)
* Supporting 5 app cards till 1368px resolution

* Removed unused var.
2020-10-21 14:53:40 +05:30
Automated Github Action
b1e55d4786 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-10-21 08:08:48 +00:00
akash-codemonk
f19810117b
Query editor styling fixes (#1318) 2020-10-21 13:24:10 +05:30
Automated Github Action
9f1681a2b7 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-10-21 05:07:38 +00:00
Hetu Nandu
655b160922
Web worker evaluation (#706)
- Adds Web workers and does evaluations in off the main thread
- Removes any need to store functions in the data tree and only keeps them around while evaluating
- Maintains a stored data tree in the redux state
- Evaluates based on editor events instead of state changes
2020-10-21 09:55:32 +05:30
Automated Github Action
aefd966aca Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-10-20 10:08:13 +00:00
Nikhil Nandagopal
5b35d93374 Merge branch 'master' into release 2020-10-20 15:34:01 +05:30
Nikhil Nandagopal
8a97f25b1d
Fix/example apps (#1315)
* added signup for public apps that are not example apps

* minor fix
2020-10-20 15:33:21 +05:30
Arpit Mohan
087078938c Fixing merge conflicts 2020-10-20 14:46:29 +05:30
akash-codemonk
380da11ef0
Query home page with datasource information (#1237) 2020-10-20 14:30:02 +05:30
Arpit Mohan
f080f3e7a0 Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-10-20 12:45:07 +05:30
satbir121
6c1e13a6e9
Revert create new app flow to use the old flow for now (#1265) 2020-10-20 12:44:39 +05:30