Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity
747 Commits 1 Branch 0 Tags 507 MiB
4b9d8a9d43
Commit Graph

747 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Abhinav Jha
4b9d8a9d43 Merge branch 'feature/graph-components' into 'release' 
Feature/graph components

Support for Graph components, Line|Bar|Pie|Area|Column graphs added

See merge request theappsmith/internal-tools-client!334
 2020-03-13 12:06:42 +00:00
Vicky Bansal
adb7065b99 Feature/graph components 2020-03-13 12:06:41 +00:00
Hetu Nandu
afab653228 Merge branch 'fix/page-load-trigger-loading' into 'release' 
Fix page load not triggering

See merge request theappsmith/internal-tools-client!377
 2020-03-13 09:34:19 +00:00
Hetu Nandu
af247a181e trigger loading 2020-03-13 14:47:04 +05:30
Hetu Nandu
e6e2dd95db Merge branch 'fix/app-initialization' into 'release' 
Fix Page load actions on app switch issue

See merge request theappsmith/internal-tools-client!376
 2020-03-13 07:35:45 +00:00
Hetu Nandu
f30845a17b Merge branch 'fix/form-issues' into 'release' 
Fix issues with Form Widget

See merge request theappsmith/internal-tools-client!373
 2020-03-13 07:24:03 +00:00
Hetu Nandu
3faf95b882 Fix issues with Form Widget 2020-03-13 07:24:03 +00:00
Hetu Nandu
1bd5a8c5e7 fix page load actions issues 2020-03-13 01:57:39 +05:30
Nikhil Nandagopal
a83518d2ec Merge branch 'hotfix/filepicker' into 'release' 
fixed mb to byte conversion

See merge request theappsmith/internal-tools-client!374
 2020-03-11 14:40:35 +00:00
Nikhil Nandagopal
c98e3dc7c2 fixed mb to byte conversion 2020-03-11 20:07:12 +05:30
Satbir Singh
e1cc6f84db Merge branch 'feature/nav-events' into 'release' 
More events

* PAGE_LOAD
* NAVIGATE
* SIGNUP_CLICK
* LOGIN_CLICK
* DELETE_API_CLICK
* SAVE_API_CLICK
* RUN_API_CLICK
* NAVIGATION_EDITOR
* Renaming applications page to home.
* PAGE_SWITCH on header dropdown
* Added didDrop to WIDGET_CARD_DROP, WIDGET_CARD_DROP
* Removed PREVIEW_APP event because the feature isn't implemented.

See merge request theappsmith/internal-tools-client!365
 2020-03-11 13:59:46 +00:00
Satbir Singh
cfb967117c More events 2020-03-11 13:59:46 +00:00
Nikhil Nandagopal
3b01de3187 Merge branch 'hotfix/filepicker' into 'release' 
added label for file picker

See merge request theappsmith/internal-tools-client!371
 2020-03-11 12:06:05 +00:00
Arpit Mohan
c428032a8b Trying to get docker:dind to work on Gitlab CI 
At the moment Gitlab CI is failing because it's unable to find the docker service
 2020-03-11 16:38:56 +05:30
Arpit Mohan
edd4d7c362 Using gitlab CI environment variable for Git SHA instead of the git command 2020-03-11 15:20:35 +05:30
Arpit Mohan
21af31fb4f Merge branch 'fix/cypress-permissions' into 'release' 
Fix cypress permissions.

- Make `cypress/test.sh` executable
- Add `cypress/videos` and `results` to `.gitignore`. These are cypress test results.

See merge request theappsmith/internal-tools-client!370
 2020-03-11 09:39:10 +00:00
Arpit Mohan
c9f8e297f9 Merge branch 'feature/docker-build' into 'release' 
Docker Build and Gitlab CI

1. Adding the Dockerfile to build the appsmith-editor image and upload it to our Appsmith DockerHub account when code is merged into release/master.
2. dding the .gitlab-ci.yml file to run Cypress test cases on all merge requests. This ensures that we can continue to improve code quality with each merge.
3. Increasing the memory requirement during `craco build` to 4096 else it doesn't build in a container environment.

See merge request theappsmith/internal-tools-client!366
 2020-03-11 09:24:18 +00:00
Arpit Mohan
bb7633f5a6 Adding Docker build and cypress testing for all MRs, release & master branches. 2020-03-11 09:24:17 +00:00
Abhinav Jha
6b2e9dbfa5 Fix cypress permissions. 2020-03-11 14:51:08 +05:30
Nikhil Nandagopal
b64a456b92 added label for file picker 2020-03-11 13:47:21 +05:30
Nikhil Nandagopal
0e8aa2ecb6 Merge branch 'hotfix/filepicker' into 'release' 
Hotfix/filepicker

See merge request theappsmith/internal-tools-client!369
 2020-03-11 06:53:13 +00:00
Nikhil Nandagopal
ca6434430f minor fix 2020-03-10 16:12:04 +05:30
Pushpa B
b1bb4eb73e Merge branch 'feature/cypress-test' into 'release' 
Feature/cypress test

Cypress test automation for Login and publish app. added cypress test before pre-push

See merge request theappsmith/internal-tools-client!333
 2020-03-10 09:38:13 +00:00
Pushpa B
067fdc2dee Feature/cypress test 2020-03-10 09:38:12 +00:00
Satbir Singh
78d1ede872 Merge branch 'release' into 'master' 
Release to master

See merge request theappsmith/internal-tools-client!364
 2020-03-09 10:36:24 +00:00
Satbir Singh
dc7ba9ccb3 Merge branch 'fix/rem-fetch-app' into 'release' 
Removed the extra call to fetch application data before load.

See merge request theappsmith/internal-tools-client!362
 2020-03-09 05:46:32 +00:00
Satbir Singh
43a35c2162 Removed the extra call to fetch application data before load. 2020-03-09 05:46:32 +00:00
Satbir Singh
b60232e8a1 Merge branch 'fix/sentry-staging-separate' into 'release' 
Separating Sentry stage events from production.

See merge request theappsmith/internal-tools-client!363
 2020-03-09 04:42:33 +00:00
Satbir Singh
e5e321bce7 Separating Sentry stage events from production. 2020-03-09 10:08:53 +05:30
Hetu Nandu
4299e80321 Merge branch 'release' into 'master' 
Release

See merge request theappsmith/internal-tools-client!360
 2020-03-06 14:38:54 +00:00
Hetu Nandu
4f6fc40617 Merge branch 'fix/input-validation-logic' into 'release' 
Fix input dirty check validation

See merge request theappsmith/internal-tools-client!359
 2020-03-06 14:33:06 +00:00
Hetu Nandu
bed2c6da07 fix input validation with dirty check 2020-03-06 19:59:10 +05:30
Hetu Nandu
991659f186 Merge branch 'fix/disabledefaultClickform' into 'release' 
Update widget config: Disable default click for form widget

See merge request theappsmith/internal-tools-client!358
 2020-03-06 14:14:50 +00:00
Hetu Nandu
284ce8580c added config 2020-03-06 19:35:24 +05:30
Satbir Singh
579fa24519 Merge branch 'release' into 'master' 
Release to master

See merge request theappsmith/internal-tools-client!352
 2020-03-06 14:02:21 +00:00
Abhinav Jha
4c6f285844 Merge branch 'fix/collision-calculations' into 'release' 
Fix issue where the dropzone was mistakenly colored as colliding.

See merge request theappsmith/internal-tools-client!356
 2020-03-06 11:08:20 +00:00
Abhinav Jha
173813b6fc Fix issue where the dropzone was mistakenly colored as colliding. 2020-03-06 16:11:46 +05:30
Satbir Singh
0836e9e1cc Merge branch 'fix/app-header' into 'release' 
Fixing the application header issue.

See merge request theappsmith/internal-tools-client!355
 2020-03-06 10:25:27 +00:00
Satbir Singh
a260b9f621 Fixing the application header issue. 2020-03-06 15:45:26 +05:30
Hetu Nandu
7360387281 Merge branch 'feature/form-widget' into 'release' 
Form Widget

See merge request theappsmith/internal-tools-client!336
 2020-03-06 09:45:21 +00:00
Hetu Nandu
d9dee9b16d Form Widget 2020-03-06 09:45:21 +00:00
Nikhil Nandagopal
eef83cb482 Merge branch 'feature/file-picker' into 'release' 
file picker fixes

See merge request theappsmith/internal-tools-client!354
 2020-03-06 09:41:13 +00:00
Abhinav Jha
5e662d1bfc Merge branch 'fix/P0-issues-4-single-click' into 'release' 
Fix/p0 issues 4 single click

- Fix invite users issue where selecting the roles dropdown used to cause a page reload.
- Remove DropTargetMask Component. Use DragLayerComponent to render Grids
- Fix canvas width to 1224px
- Fix n-1 page save issue. This issue caused the previous state of the canvas to be saved. Resulting in the latest changes not being reflected in the published view and on reload
- Remove Roboto font. It is not being used, however, was being downloaded
- Increase the min bottom row offset for the main container to 5.

See merge request theappsmith/internal-tools-client!353
 2020-03-06 09:33:20 +00:00
Abhinav Jha
e3d63f0b22 Remove roboto font. Change the property pane toggling mechanism. Increase max bottom row offset for main container from 2 to 5. Fix padding and offsets for the widget border component, resize handles. 2020-03-06 09:33:20 +00:00
Nikhil Nandagopal
f945236b88 Merge branch 'release' into feature/file-picker 2020-03-06 14:51:24 +05:30
Nikhil Nandagopal
0e98e4738a file picker fixes 2020-03-06 14:50:18 +05:30
Satbir Singh
e28637b1e3 Merge branch 'feature/analytics-staging' into 'release' 
Separating segment for production and staging.

See merge request theappsmith/internal-tools-client!350
 2020-03-06 08:14:59 +00:00
Satbir Singh
4c392c9c92 Separating segment for production and staging. 2020-03-06 08:14:59 +00:00
Satbir Singh
02a01c700a Merge branch 'fix/login-struct-change' into 'release' 
Updating login structure as per backend

See merge request theappsmith/internal-tools-client!351
 2020-03-06 06:54:44 +00:00
Satbir Singh
c2dcc435dc Updating login structure as per backend 2020-03-06 06:54:44 +00:00