Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity
16,958 Commits 1 Branch 0 Tags 507 MiB
d0162013f6
Commit Graph

16958 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Arpit Mohan
bfea59f354 Merge branch 'feature/email-templates' into 'release' 
Updating the communication emails to users for signup, forgot password and invite user flows

Also adding the Origin header to the BaseController create function. This is required by the user creation flow in order to customize the links in the email. For most of the controllers overriding the BaseController, the request header parameter is non-mandatory and can be skipped for testing or otherwise.

See merge request theappsmith/internal-tools-server!219
 2020-03-10 13:56:42 +00:00
Arpit Mohan
68fd2f21d9 Updating the communication emails to users for signup, forgot password and invite user flows 
Also adding the Origin header to the BaseController create function. This is required by the user creation flow in order to customize the links in the email. For most of the controllers overriding the BaseController, the request header parameter is non-mandatory and can be skipped for testing or otherwise.
 2020-03-10 18:58:28 +05:30
Nikhil Nandagopal
4eed03d370 Merge branch 'hotfix/filepicker' into 'master' 
minor fix

See merge request theappsmith/internal-tools-client!367
 2020-03-10 10:45:17 +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
Trisha Anand
580bfc76c7 Removing the soft delete right now. Due to the indexing this would lead to duplicate key errors. The index needs to be removed and the allowed naming should be done at application level. 2020-03-09 14:20:43 +05:30
Trisha Anand
e5f8f2bea9 Segment Events Fixed + Soft delete actions 2020-03-09 14:20:32 +05:30
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
Arpit Mohan
89dec71a07 Merge branch 'feature/user-profile' into 'release' 
Modifying the user profile endpoint to send organization and application details

For event tracking, we need the organization name and application names that a user is accessing. In order to reduce the number of API calls, we are returning this information along with the enhanced user profile API call `/profile`. Another endpoint was added instead of `/me` to maintain backwards compatibility.


See merge request theappsmith/internal-tools-server!213
 2020-03-06 06:17:01 +00:00
Arpit Mohan
35b0c22334 Adding /profile endpoint to return enhanced user profile to the client. 2020-03-06 06:17:00 +00:00
Satbir Singh
8c13eafde3 Merge branch 'feature/rem-events' into 'release' 
More events

See merge request theappsmith/internal-tools-client!346
 2020-03-06 04:59:24 +00:00
Satbir Singh
0b9a0cc6ab More events 2020-03-06 04:59:24 +00:00
Arpit Mohan
40964c3dfe WIP commit of trying to create an inheritance structure with permissions. 
Also, moving all permissions to READ & MANAGE. Not maintaining separate permissions to create, update & delete.
 2020-03-06 09:29:45 +05:30
Arpit Mohan
1475d9124a Fixing all the test cases for OrganizationService 
We still need to add a lot more test cases to ensure that no functionality has broken. But this is a start in the right direction.
 2020-03-05 19:35:24 +05:30
Arpit Mohan
c9a885d605 Modifying the create application flow in ApplicationPageService. All the tests in ApplicationService are passing 
In order to create an application with valid permissions, we copy the relevant permissions from the organization of the user. This involves changes to the organizationService and OrganizationRepository as well.
 2020-03-05 18:53:40 +05:30
Arpit Mohan
c813678f49 Adding the AclPermission enum to track all possible permissions globally 
Also moving the argument AclPermission to the custom Repository interface level. This is to ensure that all the service functions can invoke the same repository function with different permissions based on their requirements.
 2020-03-05 15:33:41 +05:30
Hetu Nandu
8654a87eea Merge branch 'fix/disparity-in-styles' into 'release' 
Fix disparity in the styles of local and release builds.

See merge request theappsmith/internal-tools-client!347
 2020-03-05 09:33:39 +00:00
Satbir Singh
5e912d23cc Merge branch 'fix/build' into 'release' 
No sentry source maps uploaded on local build.

See merge request theappsmith/internal-tools-client!348
 2020-03-05 09:17:11 +00:00
Satbir Singh
b9dfd0e71e No sentry source maps uploaded on local build. 2020-03-05 09:17:10 +00:00
Abhinav Jha
8b6eabd771 Fix disparity in the styles of local and release builds. 2020-03-05 14:11:32 +05:30
Arpit Mohan
c5e8f3bef4 Removing unnecessary and extra code in AclFilter, MongoAspect and CustomWebExpressionHandler 2020-03-04 19:12:34 +05:30
Arpit Mohan
243376642b Deleting the unnecessary annotations and aspects 2020-03-04 19:02:24 +05:30