Commit Graph

2977 Commits

Author SHA1 Message Date
Automated Github Action
4fe0fdc952 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-11-02 06:10:12 +00:00
Nikhil Nandagopal
2ec5b6297b
Fix/action splitting (#1497)
* fixed argument splitting logic to rely onregex instead of simple string split

* abstracted splitting function
2020-11-02 10:54:15 +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
Automated Github Action
8d469ad24f Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-10-30 13:04:52 +00:00
Nikhil Nandagopal
5c26ef5d07
Fixed Bindings Working inside action selectors (#1484)
* added functions to convert string to JS and JS to string while manipulating property pane values
refactored getters and setters to reuse functions instead of creating multiple functions

* minor fixes

* optimized the js conversion function and fixed an edge case

* minor fix for type setters

* abstracted enum getter

* dummy commit
2020-10-30 18:05:21 +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
Arpit Mohan
a65b915fb3 Fixing merge conflicts when back merging master into release 2020-10-30 15:33:43 +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
aef74b8aaa Dummy commit to trigger build 2020-10-30 14:41: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
Automated Github Action
d3ccf634f8 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-10-30 07:12:14 +00:00
akash-codemonk
d652c1485d
Update the action config with the datasource info (#1451) 2020-10-30 11:54:15 +05:30
Automated Github Action
9cdee5aee4 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-10-30 06:05:53 +00:00
Sumit Kumar
6cf4c10c4b Merge branch 'fix/setup_guide' of https://github.com/sumitsum/appsmith into fix/setup_guide 2020-10-30 01:17:50 +05:30
Sumit Kumar
d8e4b045b7 Update server and client setup guide. (#1437)
1. Add Linux specific requirements.
2. Add debug info for common build errors.
3. Correct build step or any other statement wherever required.
4. For more info please see the attachment here: https://github.com/appsmithorg/appsmith/issues/1437
2020-10-30 00:57:25 +05:30
Automated Github Action
2016c19b2f Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-10-29 19:04:39 +00:00
vicky-primathon
75c84cbba7
Map resetting when clicking on a marker fix (#1299) 2020-10-29 23:46:27 +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
Nuwan Sameera Alawatta
e782ca17e8
fix lightning bolt menu onhover bug (#1454)
* fix lightning bolt create new api onhover bug

* fix lightning bolt menu onhover bug
2020-10-29 19:00:04 +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
satbir121
540f2637b5
Adding zoom on image widget. (#1356)
* Adding zoom on image widget.

* Changing zoom level to step.

* Fixed typescript issue.

* Added zoom-in/out on Click.

* Removing bad code.
2020-10-29 16:44:39 +05:30
Arpit Mohan
f38df9febc Correcting typo in env variable in client.yml 2020-10-29 16:19:14 +05:30
Arpit Mohan
63329b3762 Fixing bad merge 2020-10-29 16:05:37 +05:30
Arpit Mohan
7668560738 Fixing merge conflicts 2020-10-29 15:51:04 +05:30
Arpit Mohan
591b51b6a9
Ensures that the master & release flows pick appropriate server Docker images (#1465) 2020-10-29 15:44:58 +05:30
Trisha Anand
d6ff4dedd6 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-10-29 15:04:00 +05:30
Trisha Anand
13e2cc2a63
[Do Not Merge]Brought down cloud migration time from 122 minutes to 9.5 minutes (#1441)
* [Do Not Merge]Brought down cloud migration time from 122 minutes to 9.5 minutes

* Removed commented code.
TODO : Figure out if we want to change the migration order numbers once the release environment is reverted back to pre original migration data.

* Added plugin id for the migrated action.

* Renamed the createIndex functions for new action and new page and added a drop collection command before creating the index. This ensures that if any developer has pulled code in the last two days, this migration does not negatively impact them
2020-10-29 15:03:41 +05:30
Automated Github Action
ccac36928f Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-10-29 09:08:35 +00:00
Nikhil Nandagopal
2d7ccdc515
flipped user id and instance id so that the ping can be correlated with the email from the install script (#1461) 2020-10-29 14:17:45 +05:30
Sumit Kumar
da907f58f3 Merge branch 'fix/setup_guide' of https://github.com/sumitsum/appsmith into fix/setup_guide 2020-10-29 13:46:12 +05:30