Merge branch 'girafic-develop' into develop

This commit is contained in:
Andrey Antukh 2021-02-18 14:38:43 +01:00
commit 56c204509a
2 changed files with 124 additions and 11 deletions

View file

@ -4,10 +4,11 @@
### :sparkles: New features ### :sparkles: New features
- Add major refactor of internal pubsub/redis code; improves scalability and performance #640 - Add major refactor of internal pubsub/redis code; improves scalability and performance [#640](https://github.com/penpot/penpot/pull/640)
- Add optional loki integration. - Add optional loki integration [#645](https://github.com/penpot/penpot/pull/645)
- Add emailcatcher and ldap test containers to devenv. #506 - Add emailcatcher and ldap test containers to devenv. [#506](https://github.com/penpot/penpot/pull/506)
- Bounce & Complaint handling. - Add more presets for artboard [#654](https://github.com/penpot/penpot/pull/654)
- Bounce & Complaint handling [#635](https://github.com/penpot/penpot/pull/635)
- Disable groups interactions when holding "Ctrl" key (deep selection) - Disable groups interactions when holding "Ctrl" key (deep selection)
- New action in context menu to "edit" some shapes (binded to key "Enter") - New action in context menu to "edit" some shapes (binded to key "Enter")
@ -21,7 +22,13 @@
- Properly handle errors on github, gitlab and ldap auth backends. - Properly handle errors on github, gitlab and ldap auth backends.
- Properly mark profile auth backend (on first register/ auth with 3rd party auth provider). - Properly mark profile auth backend (on first register/ auth with 3rd party auth provider).
- Fix corner cases on invitation/signup flows. - Fix corner cases on invitation/signup flows.
- Add more improvements to french translation strings. - Add more improvements to french translation strings [#591](https://github.com/penpot/penpot/pull/591)
### :heart: Community contributions by (Thank you!)
- girafic [#538](https://github.com/penpot/penpot/pull/654)
- arkhi [#591](https://github.com/penpot/penpot/pull/591)
## 1.2.0-alpha ## 1.2.0-alpha

View file

@ -133,13 +133,25 @@
(def +size-presets+ (def +size-presets+
[{:name "APPLE"} [{:name "APPLE"}
{:name "iPhone X" {:name "iPhone 12/12 Pro"
:width 390
:height 844}
{:name "iPhone 12 Mini"
:width 360
:height 780}
{:name "iPhone 12 Pro Max"
:width 428
:height 926}
{:name "iPhone X/XS/11 Pro"
:width 375 :width 375
:height 812} :height 812}
{:name "iPhone XS Max/XR/11/11 Pro Max"
:width 414
:height 896}
{:name "iPhone 6/7/8 Plus" {:name "iPhone 6/7/8 Plus"
:width 414 :width 414
:height 736} :height 736}
{:name "iPhone 6/7/8" {:name "iPhone 6/7/8/SE2"
:width 375 :width 375
:height 667} :height 667}
{:name "iPhone 5/SE" {:name "iPhone 5/SE"
@ -154,26 +166,41 @@
{:name "iPad Pro 12.9in" {:name "iPad Pro 12.9in"
:width 1024 :width 1024
:height 1366} :height 1366}
{:name "Watch 44mm"
:width 368
:height 448}
{:name "Watch 42mm" {:name "Watch 42mm"
:width 312 :width 312
:height 390} :height 390}
{:name "Watch 40mm"
:width 324
:height 394}
{:name "Watch 38mm" {:name "Watch 38mm"
:width 272 :width 272
:height 340} :height 340}
{:name "GOOGLE"} {:name "ANDROID"}
{:name "Android mobile" {:name "Mobile"
:width 360 :width 360
:height 640} :height 640}
{:name "Android tablet" {:name "Tablet"
:width 768 :width 768
:height 1024} :height 1024}
{:name "Google Pixel 4a/5"
:width 393
:height 851}
{:name "Samsung Galaxy S20+/S21 Ultra"
:width 384
:height 854}
{:name "Samsung Galaxy A71/A51"
:width 412
:height 914}
{:name "MICROSOFT"} {:name "MICROSOFT"}
{:name "Surface Pro 3" {:name "Surface Pro 3"
:width 1440 :width 1440
:height 960} :height 960}
{:name "Surface Pro 4" {:name "Surface Pro 4/5/6/7"
:width 1368 :width 1368
:height 912} :height 912}
@ -184,9 +211,88 @@
{:name "Web 1366" {:name "Web 1366"
:width 1366 :width 1366
:height 768} :height 768}
{:name "Web 1024"
:width 1024
:height 768}
{:name "Web 1920" {:name "Web 1920"
:width 1920 :width 1920
:height 1080} :height 1080}
{:name "PRINT (72dpi)"}
{:name "A0"
:width 2384
:height 3370}
{:name "A1"
:width 1684
:height 2384}
{:name "A2"
:width 1191
:height 1684}
{:name "A3"
:width 842
:height 1191}
{:name "A4"
:width 595
:height 842}
{:name "A5"
:width 420
:height 595}
{:name "A6"
:width 297
:height 420}
{:name "Letter"
:width 612
:height 792}
{:name "DIN Lang"
:width 595
:height 281}
{:name "SOCIAL MEDIA"}
{:name "Instagram profile"
:width 320
:height 320}
{:name "Instagram post"
:width 1080
:height 1080}
{:name "Instagram story"
:width 1080
:height 1920}
{:name "Facebook profile"
:width 720
:height 720}
{:name "Facebook cover"
:width 820
:height 312}
{:name "Facebook post"
:width 1200
:height 630}
{:name "LinkedIn profile"
:width 400
:height 400}
{:name "LinkedIn cover"
:width 1584
:height 396}
{:name "LinkedIn post"
:width 1200
:height 627}
{:name "Twitter profile"
:width 400
:height 400}
{:name "Twitter header"
:width 1500
:height 500}
{:name "Twitter post"
:width 1024
:height 512}
{:name "Youtube profile"
:width 800
:height 800}
{:name "Youtube banner"
:width 2560
:height 1440}
{:name "Youtube thumb"
:width 1280
:height 720}
]) ])
(mf/defc options (mf/defc options