Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity
5,314 Commits 1 Branch 0 Tags 507 MiB
7bd1e9587c
Commit Graph

5314 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tejaaswini Narendra
817f361a69 Merge branch 'fix/invite-users' into 'feature/acl' 
fix: Update minor UI changes

See merge request theappsmith/internal-tools-client!683
 2020-06-05 13:42:37 +00:00
Tejaaswini
7c3d18b7f6 Merge branch 'feature/acl' into fix/invite-users 2020-06-05 18:58:21 +05:30
Tejaaswini
926a6caed4 fix: Create API and curl import flow 2020-06-05 18:52:30 +05:30
Trisha Anand
f9d63f9881 Adding a 3P Api to a page now also expects the client to send the organization id. 2020-06-05 16:14:15 +05:30
Trisha Anand
1923f0ddea Merge branch 'feature/acl-datasource' into 'feature/acl-spring-object' 
ACL for datasource

See merge request theappsmith/internal-tools-server!362
 2020-06-05 10:05:23 +00:00
Trisha Anand
87aafd6cf4 Adding test case for testDatasource 
Refactoring the testDatasource code by moving the business logic to the service layer.
 2020-06-05 10:05:23 +00:00
Trisha Anand
9c2529105c Merge branch 'fix/update-create-datasource' into 'feature/acl' 
fix: pass organization id to create datasource APIs

See merge request theappsmith/internal-tools-client!687
 2020-06-05 09:29:15 +00:00
Tejaaswini
81c1e0d5f4 feat: pass orgId to createDatasource APIs 
- Set Current Organization Id based on the application that the user is accessing
- Send saved organization id in datasource creation APIs.
 2020-06-05 14:13:01 +05:30
Tejaaswini
d33188adc1 Merge branch 'release' into feature/acl 2020-06-05 13:39:01 +05:30
rashmipn
e3729a4ea0 Merge branch 'release' of gitlab.com:theappsmith/internal-tools-client into update/dsl 2020-06-05 09:18:59 +05:30
Hetu Nandu
410d2d1d2a Merge branch 'feature/evaluated-value' into 'release' 
Evaluated value popup

See merge request theappsmith/internal-tools-client!621
 2020-06-04 13:49:22 +00:00
Hetu Nandu
d9540f8927 Evaluated value popup 2020-06-04 13:49:22 +00:00
Tejaaswini
7a02d62682 Merge branch 'feature/acl' into fix/invite-users 2020-06-04 19:00:47 +05:30
Tejaaswini
efad40becd fix: Update UI changes 2020-06-04 18:42:19 +05:30
Trisha Anand
986a5bc1c5 Merge branch 'fix/invite-users' into 'feature/acl' 
fix- Update minor UI changes

See merge request theappsmith/internal-tools-client!677
 2020-06-04 12:15:09 +00:00
Tejaaswini Narendra
81df7326c5 fix- Update minor UI changes 2020-06-04 12:15:09 +00:00
Arpit Mohan
1a68b7f561 Fixing the DSL Json for default layouts in new pages. 2020-06-04 16:13:47 +05:30
vicky_primathon.in
19b8c46cc1 Merge branch 'feature/lightning-menu' of gitlab.com:theappsmith/internal-tools-client into feature/widget-actions-menu 2020-06-04 16:03:40 +05:30
vicky_primathon.in
cf0fa0fd22 Merge branch 'feature/lightning-menu' of gitlab.com:theappsmith/internal-tools-client into fix/icons-placement-issues 2020-06-04 16:03:05 +05:30
vicky_primathon.in
b72e8ecd0f lightning menu popover placement fixed 2020-06-04 15:25:44 +05:30
Tejaaswini
6c8eaf2aad fix: Minor UI changes 2020-06-04 14:47:08 +05:30
vicky_primathon.in
0062b3182f padding added in dynamic auto complete to show lightningmenu icon reverted 2020-06-04 14:22:48 +05:30
Arpit Mohan
c6a87eba51 Merge branch 'hotfix/change-default-page-name' into 'release' 
Modifying the default page name to Page1

Also creating a default empty layout when a new page is created. This ensures that the client can show the default message on new page creations.

See merge request theappsmith/internal-tools-server!363
 2020-06-04 08:16:54 +00:00
Trisha Anand
c7cd46bed4 Merge branch 'feature/acl-add-orgId-application-pages' into 'feature/acl-spring-object' 
Add OrgId to the output of the api used to return all the page ids and names given an application (id or name)

See merge request theappsmith/internal-tools-server!364
 2020-06-04 08:08:15 +00:00
Trisha Anand
9e1742c289 Add OrgId to the output of the api used to return all the page ids and names given an application (id or name) 2020-06-04 08:08:15 +00:00
Aditya Acharya
303363cb60 Merge branch 'Binding/ChartText' into 'release' 
Binding/chart text

See merge request theappsmith/internal-tools-client!673
 2020-06-04 07:50:39 +00:00
Aditya Acharya
3f10d16bfb Binding/chart text 2020-06-04 07:50:39 +00:00
Arpit Mohan
1ac69bab50 Modifying the default page name to Page1 
Also creating a default empty layout when a new page is created. This ensures that the client can show the default message on new page creations.
 2020-06-04 13:05:34 +05:30
Satbir Singh
b3d79e1542 Merge branch 'fix/ff' into 'release' 
Enabling Optimizely through ad blockers.

See merge request theappsmith/internal-tools-client!667
 2020-06-04 07:13:36 +00:00
Satbir Singh
11b2995387 Enabling Optimizely through ad blockers. 2020-06-04 07:13:36 +00:00
rashmipn
eea9e837fb Updated the dsl's 2020-06-04 12:32:07 +05:30
Tejaaswini
4e9685b8d5 fix-Update minor UI changes 2020-06-04 12:28:30 +05:30
rashmipn
3541d16f95 Updated the dsl 2020-06-04 12:06:21 +05:30
Hetu Nandu
086f9559a9 Merge branch 'fix/autocomplete-bugs' into 'release' 
Fix autocomplete visibility bugs

See merge request theappsmith/internal-tools-client!674
 2020-06-03 17:27:24 +00:00
Hetu Nandu
44e657fe12 refactored function name 
reverted binding logic
 2020-06-03 17:27:24 +00:00
Trisha Anand
e02242ff59 Merge branch 'fix/invite-user' into 'feature/acl' 
Invite user API integration

See merge request theappsmith/internal-tools-client!676
 2020-06-03 13:54:42 +00:00
Tejaaswini Narendra
52e70e479f fix:Minor UI changes 
- add ellipsis for the application title
- align org name, list of applications
- increase font size of org name
- increase size of create application icon
- add name for create application card
- remove create application button
 2020-06-03 13:54:42 +00:00
vicky_primathon.in
199e70955e Merge branch 'feature/lightning-menu' of gitlab.com:theappsmith/internal-tools-client into feature/widget-actions-menu 2020-06-03 18:01:21 +05:30
vicky_primathon.in
3e5d7eeb34 Merge branch 'feature/lightning-menu' of gitlab.com:theappsmith/internal-tools-client into fix/icons-placement-issues 2020-06-03 18:00:28 +05:30
vicky_primathon.in
b38b5b3a30 lightning menu border changes 2020-06-03 17:51:18 +05:30
Satbir Singh
3b729bc470 Merge branch 'fix/react-table-widget' into 'release' 
Fix/react table widget

See merge request theappsmith/internal-tools-client!599
 2020-06-03 10:50:10 +00:00
Vicky Bansal
c2efa63eba Fix/react table widget 2020-06-03 10:50:10 +00:00
vicky_primathon.in
86a8c49e73 isHover state removed from dynamic auto complete 2020-06-03 15:23:32 +05:30
vicky_primathon.in
d537fbcebd Merge branch 'feature/lightning-menu' of gitlab.com:theappsmith/internal-tools-client into fix/icons-placement-issues 2020-06-03 15:22:01 +05:30
vicky_primathon.in
b7ee43da39 merge conflicts resolved 2020-06-03 15:21:07 +05:30
vicky_primathon.in
210a4f3e71 merge conflicts resolved 2020-06-03 15:19:18 +05:30
vicky_primathon.in
2f6211e01b syntax highlight for code in action selectors 2020-06-03 15:09:17 +05:30
vicky_primathon.in
5259756bf6 Merge branch 'feature/syntax-highlighting' of gitlab.com:theappsmith/internal-tools-client into feature/widget-actions-menu 2020-06-03 12:48:40 +05:30
vicky_primathon.in
f55b76b582 Merge branch 'master' of gitlab.com:theappsmith/internal-tools-client into feature/widget-actions-menu 2020-06-03 12:45:28 +05:30
vicky_primathon.in
b28d1e6f5f lightning menu changes merged 2020-06-03 12:44:17 +05:30