Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity
13,528 Commits 1 Branch 0 Tags 507 MiB
084e28ab21
Commit Graph

13528 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Abhinav Jha
487bbb0d84 Merge branch 'fix/add-test-classnames' into 'release' 
Add classnames

See merge request theappsmith/internal-tools-client!432
 2020-03-30 14:21:21 +00:00
Abhinav Jha
5272505673 Add classnames 2020-03-30 14:21:21 +00:00
Trisha Anand
b92557c480 Merge branch 'bug/handle-newline-mustache-replacement' into 'release' 
Json serialisation fix : Double escape java to conserve \n

See merge request theappsmith/internal-tools-server!246
 2020-03-30 09:45:39 +00:00
Trisha Anand
e4ab1635cc Double escaping java to support "\n" to be conserved through the proxy. 2020-03-30 15:11:25 +05:30
Satbir Singh
e99f9c1ca7 Merge branch 'fix/button-safari' into 'release' 
Safari button fix

See merge request theappsmith/internal-tools-client!428
 2020-03-30 08:55:52 +00:00
Satbir Singh
26b51f2f04 Safari button fix 2020-03-30 08:55:52 +00:00
Satbir Singh
fbec031a4a Merge branch 'feature/persist-col' into 'release' 
Persist hidden column

See merge request theappsmith/internal-tools-client!411
 2020-03-30 08:16:43 +00:00
Satbir Singh
4d928292e4 Persist hidden column 2020-03-30 08:16:43 +00:00
Hetu Nandu
a2b5e71a1d Merge branch 'feature/add-view-pagenav-classes' into 'release' 
Add class name on Page Navs for testing

See merge request theappsmith/internal-tools-client!429
 2020-03-30 07:43:34 +00:00
Hetu Nandu
cb385b68b0 Add class name on Page Navs for testing 2020-03-30 07:43:34 +00:00
Arpit Mohan
9f9098268b Fixing the user service test cases 2020-03-29 17:06:20 +05:30
Arpit Mohan
036bd3a392 Fixing the test cases and SeedMongoData 
Only userServiceTest is failing now.
 2020-03-28 23:07:31 +05:30
Arpit Mohan
381f2f6b4f Resolving merge conflicts from release branch 2020-03-28 21:52:35 +05:30
Arpit Mohan
189ef1d16c Merge branch 'hotfix/json-serialization' into 'release' 
JSON serialization fix for dynamic binding

In the action execution, we now escape all the parameter values received in the dynamic binding. This is because Java unescapes values when it receives the HTTP request. Hence, ActionServiceImpl.execute() will escape the bindings again to ensure that the request to the backend API system still works.

See merge request theappsmith/internal-tools-server!245
 2020-03-28 13:48:41 +00:00
Arpit Mohan
9ce82bdcb6 Fixing json serialization issue for new line and JSON bodies. 
Now we escape all the bindings once on the server to ensure that the unescaping that Spring did is reversed.
 2020-03-28 13:48:41 +00:00
Arpit Mohan
f1eb890c62 Merge branch 'bug/mongobee-indexes' into 'release' 
Fix fields orders in compound indexes and duplicate slugs.

In the migration for creating slugs for existing organizations, we need to set unique slugs using the same logic as would be used when the organizations are created in the first place. For this, this MR updates the `addOrgSlugs` migration accordingly.

In the migration for **ensuring** (not necessarily **creating**) initial indexes, this MR changes the order of the fields in a couple of compound indexes. Unfortunately, if an compound index named `abc` exists with the field order `"f1", "f2"` and we try to **ensure** an index named `abc` with the field order `"f2", "f1"`, the ensuring fails with obscure errors. Although some resources online suggest that the field order in index does not matter, here, it does.

See merge request theappsmith/internal-tools-server!244
 2020-03-28 11:15:50 +00:00
Shrikant Kandula
35a2722305 Fix add-slug migration messing up existing slugs, if any. 
Migrations should be more resilient in regards to existing data.
 2020-03-28 11:15:50 +00:00
Arpit Mohan
e6830ed6a4 Merge branch 'bug/mongobee-indexes' into 'release' 
Use mongock for migrations.

Mongock is a fork of Mongobee with a better integration with
Spring. It also does not suffer from trying to access the
`system.indexes` collection.
See https://github.com/mongobee/mongobee/pull/87.

See merge request theappsmith/internal-tools-server!243
 2020-03-28 05:19:56 +00:00
Shrikant Kandula
31fa5a66f1 Use mongock for migrations. 
Mongock is a fork of Mongobee with a better integration with
Spring. It also does not suffer from trying to access the
`system.indexes` collection.
See https://github.com/mongobee/mongobee/pull/87.
 2020-03-28 10:08:11 +05:30
Shrikant Kandula
bfa0453a27 Merge branch 'feature/mongodb-migrations' into 'release' 
MongoDB Migrations and Organization Slug

See merge request theappsmith/internal-tools-server!241
 2020-03-27 14:52:25 +00:00
Shrikant Kandula
0947ddcd0f Remove findByName method for Organization domain. 
Organization names are no longer unique, so this method
doesn't make as much sense. The `findBySlug` should serve
in it's place.
 2020-03-27 14:52:25 +00:00
Hetu Nandu
38c731723b Merge branch 'feature/logLevelFlag' into 'release' 
LogLevel flag

See merge request theappsmith/internal-tools-client!422
 2020-03-27 12:46:29 +00:00
Hetu Nandu
3b3cab3a5f LogLevel flag 2020-03-27 12:46:29 +00:00
Abhinav Jha
454b32aa3c Merge branch 'fix/update-default-widget-rows' into 'release' 
Update default widget columns

See merge request theappsmith/internal-tools-client!427
 2020-03-27 12:30:52 +00:00
Abhinav Jha
1cc7d58c73 Update default widget rows 2020-03-27 17:36:30 +05:30
Abhinav Jha
91546b198d Merge branch 'fix/modal-config-scroll' into 'release' 
Fix Modal scroll behaviour.

Modal now can be set to scroll contents by the user using the property config.
Earlier it was always scrolling.

See merge request theappsmith/internal-tools-client!426
 2020-03-27 10:56:26 +00:00
Abhinav Jha
f829e8f79a Fix Modal scroll behaviour. 2020-03-27 10:56:26 +00:00
Satbir Singh
96f3e6c5a7 Merge branch 'fix/tooltip-overlap' into 'release' 
Fixing tooltip overlap with dynamic input hint

See merge request theappsmith/internal-tools-client!418
 2020-03-27 10:37:29 +00:00
Satbir Singh
4631b61adb Fixing tooltip overlap with dynamic input hint 2020-03-27 10:37:29 +00:00
Abhinav Jha
7a32b313a1 Merge branch 'feature/modal-widget' into 'release' 
Modal Widget

See merge request theappsmith/internal-tools-client!361
 2020-03-27 09:02:11 +00:00
Abhinav Jha
a0872b97f2 Generate widgets from blueprint. Close previously open modals when showing a modal. Fix unicode page name issue in pagelist sidebar 2020-03-27 09:02:11 +00:00
Nikhil Nandagopal
dca0a1d3db disabled water mark fusion charts 2020-03-27 12:44:09 +05:30
Arpit Mohan
a46efda121 Merge branch 'bug/refactor-widget-name' into 'release' 
Refactor of names shouldn't be allowed if there is no DSL present in the layout

See merge request theappsmith/internal-tools-server!242
 2020-03-25 12:54:23 +00:00
Trisha Anand
89215fab43 In case of the erroneous state of no DSL, don't allow refactor names. 2020-03-25 18:19:27 +05:30
Trisha Anand
acb7437c6b Merge branch 'bug/add-to-page-transient-fields' into 'release' 
Transient fields being set before returning the created action in case of rapid api template

After adding a rapid api template, the action created was being returned. This has been extended so that the transient fields required for UI are also set before returning the created action.

See merge request theappsmith/internal-tools-server!240
 2020-03-24 19:15:02 +00:00
Trisha Anand
a7cceaf0f1 After adding a rapid api template, the action created was being returned. This has been extended so that the transient fields required for UI are also set before returning the created action. 2020-03-24 19:15:02 +00:00
Hetu Nandu
cabcd2e0a2 Merge branch 'fix/api-pane-init' into 'release' 
Fix api pane initialization issue

Fixes: https://www.notion.so/appsmith/When-the-API-page-is-refreshed-it-is-redirecting-to-the-Home-page-a75166abfdef41348262c0c3669d33b5



See merge request theappsmith/internal-tools-client!410
 2020-03-24 14:05:19 +00:00
Hetu Nandu
6a22201e81 Fix api pane initialization issue 2020-03-24 14:05:19 +00:00
Hetu Nandu
305288919e Merge branch 'release' into 'master' 
Release

See merge request theappsmith/internal-tools-client!417
 2020-03-24 14:03:40 +00:00
Trisha Anand
3b6c043637 Merge branch 'feature/add-pluginid-action' into 'release' 
Added transient field plugin id to set in action everytime its read.

See merge request theappsmith/internal-tools-server!239
 2020-03-24 11:47:17 +00:00
Trisha Anand
c12cb88265 Added transient field plugin id to set in action everytime its read. 2020-03-24 17:13:30 +05:30
Hetu Nandu
21a1550fff Merge branch 'fix/Table-Spec-BugFix' into 'release' 
Duplicate element bug fix in Table_spec file

See merge request theappsmith/internal-tools-client!416
 2020-03-24 11:40:15 +00:00
Moolya
8ed32b95d9 Duplicate element bug fix in Table_spec file 2020-03-24 16:31:40 +05:30
Hetu Nandu
45cf72d350 Merge branch 'feature/datatree-evaluation-instrumentation' into 'release' 
Performance instrumentation

See merge request theappsmith/internal-tools-client!414
 2020-03-23 12:40:17 +00:00
Hetu Nandu
80db9eb030 Performance instrumentation 2020-03-23 12:40:17 +00:00
Abhinav Jha
30eb6d6439 Merge branch 'fix/chart-component-title-align' into 'release' 
chart component title left aligned

See merge request theappsmith/internal-tools-client!381
 2020-03-23 07:09:19 +00:00
vicky_primathon.in
e57d8bab7e chart title alignment changes 2020-03-23 12:18:06 +05:30
vicky_primathon.in
5cf1a0dde6 Merge branch 'release' of gitlab.com:theappsmith/internal-tools-client into fix/chart-component-title-align 2020-03-21 10:10:17 +05:30
Pushpa B
a5bf7d10cc Merge branch 'feature/EditCommonWidgets' into 'release' 
Feature/edit common widgets

See merge request theappsmith/internal-tools-client!398
 2020-03-20 14:21:25 +00:00
Pushpa B
35e480d7e1 Feature/edit common widgets 2020-03-20 14:21:24 +00:00