Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit 58d063b
Merge: 4879f22 8a0c083
Author: Fabrizio Balliano <[email protected]>
Date:   Sun Sep 10 21:53:03 2023 +0100

    Merge branch 'next' into tinymce6

commit 8a0c083
Merge: 7b20aa2 26843d6
Author: Fabrizio Balliano <[email protected]>
Date:   Sun Sep 10 21:49:01 2023 +0100

    Merge branch 'main' into next

commit 7b20aa2
Author: Fabrizio Balliano <[email protected]>
Date:   Fri Sep 8 21:48:15 2023 +0100

    Fixed some PHPCS errors (OpenMage#3502)

commit 710d35d
Merge: 6b7dbf1 26e80e7
Author: Fabrizio Balliano <[email protected]>
Date:   Fri Sep 8 16:24:47 2023 +0100

    Merge branch 'main' into next

commit 6b7dbf1
Author: Fabrizio Balliano <[email protected]>
Date:   Fri Sep 8 16:24:17 2023 +0100

    Fixed implementation of SessionHandlerInterface in Mage_Core_Model_Resource_Session (OpenMage#3499)

    Co-authored-by: Mohamed ELIDRISSI <[email protected]>
    Co-authored-by: Ng Kiat Siong <[email protected]>

commit 08c6e41
Merge: 36593b5 ccbaa15
Author: Fabrizio Balliano <[email protected]>
Date:   Fri Sep 8 10:26:23 2023 +0100

    Merge branch 'main' into next

commit 36593b5
Merge: fdb003a 0b3d782
Author: Fabrizio Balliano <[email protected]>
Date:   Thu Sep 7 23:24:48 2023 +0100

    Merge branch 'main' into next

commit 4879f22
Merge: f2b033a fdb003a
Author: Fabrizio Balliano <[email protected]>
Date:   Wed Sep 6 10:13:11 2023 +0100

    Merge branch 'next' into tinymce6

commit fdb003a
Merge: 6e42c67 0f032f3
Author: Fabrizio Balliano <[email protected]>
Date:   Tue Sep 5 10:20:13 2023 +0100

    Merge branch 'main' into next

commit 6e42c67
Merge: bfd49a9 8558c35
Author: Fabrizio Balliano <[email protected]>
Date:   Mon Sep 4 14:54:15 2023 +0100

    Merge branch 'main' into next

commit bfd49a9
Merge: c55ecea 10b63c1
Author: Fabrizio Balliano <[email protected]>
Date:   Thu Aug 31 18:25:16 2023 +0100

    Merge branch 'main' into next

commit c55ecea
Merge: 94b44ac 046450a
Author: Fabrizio Balliano <[email protected]>
Date:   Thu Aug 31 11:49:16 2023 +0100

    Merge branch 'main' into next

commit f2b033a
Author: Fabrizio Balliano <[email protected]>
Date:   Wed Aug 30 15:26:43 2023 +0100

    TinyMCE 6.7.0

commit 94b44ac
Merge: aaa410d 2a2a2fb
Author: Colin Mollenhour <[email protected]>
Date:   Tue Aug 29 11:38:49 2023 -0400

    Merge remote-tracking branch 'openmage/main' into next

commit b8b39a3
Merge: b832fc5 aaa410d
Author: Fabrizio Balliano <[email protected]>
Date:   Tue Aug 29 10:28:23 2023 +0300

    Merge branch 'next' into tinymce6

commit aaa410d
Merge: d633770 621f21f
Author: Fabrizio Balliano <[email protected]>
Date:   Tue Aug 29 08:28:06 2023 +0100

    Merge branch 'main' into next

commit b832fc5
Author: Tony <[email protected]>
Date:   Fri Aug 25 13:11:29 2023 +0200

    fix openmage plugins breaks help (OpenMage#20)

commit 2cd4e0a
Author: Tony <[email protected]>
Date:   Wed Aug 23 11:53:50 2023 +0200

    fix icon openmagevariable (OpenMage#19)

commit 3a2ff97
Author: Fabrizio Balliano <[email protected]>
Date:   Wed Aug 23 09:33:17 2023 +0100

    Fixed "api.setActive is not a funcion"

commit 37f44a2
Author: Fabrizio Balliano <[email protected]>
Date:   Wed Aug 23 09:13:52 2023 +0100

    Fixed widget label

commit 0bc43f4
Author: Fabrizio Balliano <[email protected]>
Date:   Tue Aug 22 15:05:46 2023 +0100

    New layout for menus and menubars

commit 5dd9689
Author: Fabrizio Balliano <[email protected]>
Date:   Mon Aug 21 13:24:43 2023 +0100

    Toolbar mode scrolling

commit 1658ac3
Merge: 51f9491 d633770
Author: Fabrizio Balliano <[email protected]>
Date:   Mon Aug 21 12:46:39 2023 +0300

    Merge branch 'next' into tinymce6

commit d633770
Author: Fabrizio Balliano <[email protected]>
Date:   Mon Aug 21 12:17:37 2023 +0300

    RWD: removed enquire.js and converted to window.matchMedia (OpenMage#3208)

    Co-authored-by: Justin Beaty <[email protected]>

commit 51f9491
Merge: fd09b2f 15ffca5
Author: Fabrizio Balliano <[email protected]>
Date:   Mon Aug 21 11:13:33 2023 +0300

    Merge branch 'next' into tinymce6

commit 15ffca5
Merge: 146e878 e266417
Author: Fabrizio Balliano <[email protected]>
Date:   Mon Aug 21 09:13:02 2023 +0100

    Merge branch 'main' into next

commit fd09b2f
Author: Fabrizio Balliano <[email protected]>
Date:   Sun Aug 20 19:39:00 2023 +0100

    removed emoticons plugin, it is useless since our DB is not utf8mb4

commit 2d1c88e
Author: Fabrizio Balliano <[email protected]>
Date:   Sun Aug 20 17:54:18 2023 +0200

    more similar formatting between these two files

commit 7737fec
Author: Fabrizio Balliano <[email protected]>
Date:   Sun Aug 20 17:34:01 2023 +0200

    removed openmage colors from variables/widgets icons

commit 9247d52
Author: Tony <[email protected]>
Date:   Sun Aug 20 11:31:09 2023 +0200

    add searchandreplace, embedded media, fontfamily (OpenMage#18)

commit b4e4840
Author: Fabrizio Balliano <[email protected]>
Date:   Tue Aug 15 10:44:45 2023 +0200

    tinymce 6.6.2

commit 1eb6a06
Merge: 9b48a81 146e878
Author: Fabrizio Balliano <[email protected]>
Date:   Tue Aug 15 11:41:58 2023 +0300

    Merge branch 'next' into tinymce6

commit 9b48a81
Author: Fabrizio Balliano <[email protected]>
Date:   Tue Aug 15 10:41:23 2023 +0200

    Fixed php82 bug

commit 146e878
Merge: 9c7f6de 1668e3d
Author: Fabrizio Balliano <[email protected]>
Date:   Tue Aug 15 10:29:59 2023 +0200

    Merge branch main

commit a5941cd
Author: Tony <[email protected]>
Date:   Tue Aug 8 22:18:49 2023 +0200

    restore sysconfig original behavior (OpenMage#17)

commit d739ce3
Author: Tony <[email protected]>
Date:   Tue Aug 8 12:56:56 2023 +0200

    fix tab changed on first load (OpenMage#16)

commit d2cdcca
Author: Tony <[email protected]>
Date:   Tue Aug 8 09:25:26 2023 +0200

    set min-height (OpenMage#15)

commit 18f4196
Author: Tony <[email protected]>
Date:   Mon Aug 7 23:07:22 2023 +0200

    Fix prototype errors in chrome

commit 750a10c
Author: Tony <[email protected]>
Date:   Mon Aug 7 09:07:20 2023 +0200

    Tinymce skin config (OpenMage#13)

    * fix insert variable

    * temporary disable openmage widgets

    * fix insert widget

    * rebrand openmage variables

    * fix media browser callback

    * clean

    * removed empty lines

    * removed empty line

    * here we need the empty newline char ehhehe

    * we need newline at the end of the file

    * set toolbar buttons

    * reorder and fix

    * add skin default dark / draft the language support

    * stylish openmage widget

    * phpcs

    * vscode fucking things

    * first attempt to fix translator

    * fix system config multiple values depends

    * add tinymce skins to config

    * fix multiple alert errors in chrome

    * fix multiple alert errors in chrome

    * restore

    * copyright

    * tinymce-5 default skin

    ---------

    Co-authored-by: Fabrizio Balliano <[email protected]>

commit 3d36452
Author: Fabrizio Balliano <[email protected]>
Date:   Sun Aug 6 10:36:18 2023 +0200

    languages

commit 9b80c42
Author: Fabrizio Balliano <[email protected]>
Date:   Sun Aug 6 10:36:00 2023 +0200

    languages

commit 11d3133
Author: Fabrizio Balliano <[email protected]>
Date:   Sun Aug 6 09:52:07 2023 +0200

    removed custom css

commit 218a0f1
Author: Fabrizio Balliano <[email protected]>
Date:   Sun Aug 6 09:41:04 2023 +0200

    small cleanup

commit a7f3026
Author: Fabrizio Balliano <[email protected]>
Date:   Sun Aug 6 09:39:43 2023 +0200

    small cleanup

commit fb7d6cb
Merge: 885a440 9c7f6de
Author: Fabrizio Balliano <[email protected]>
Date:   Sun Aug 6 09:33:44 2023 +0200

    Merge branch next

commit 885a440
Author: Tony <[email protected]>
Date:   Sun Aug 6 09:31:26 2023 +0200

    fix tinymce openmage variable and widget plugins and toolbar buttuns (OpenMage#12)

    * fix insert variable

    * temporary disable openmage widgets

    * fix insert widget

    * rebrand openmage variables

    * fix media browser callback

    * clean

    * removed empty lines

    * removed empty line

    * here we need the empty newline char ehhehe

    * we need newline at the end of the file

    * set toolbar buttons

    * reorder and fix

    * add skin default dark / draft the language support

    * stylish openmage widget

    * phpcs

    ---------

    Co-authored-by: Fabrizio Balliano <[email protected]>

commit 4cbdd82
Author: Fabrizio Balliano <[email protected]>
Date:   Wed Aug 2 17:47:25 2023 +0100

    updated to 6.6.1

commit 9c7f6de
Merge: 4e8d0e5 d8cf078
Author: Fabrizio Balliano <[email protected]>
Date:   Fri Jul 28 09:30:30 2023 +0100

    Merge branch 'main' into next

commit 4e8d0e5
Merge: 7754300 875661e
Author: Fabrizio Balliano <[email protected]>
Date:   Mon Jul 24 20:53:48 2023 +0100

    Merge branch 'main' into next

commit 7754300
Merge: 56fa540 f578a5c
Author: Fabrizio Balliano <[email protected]>
Date:   Mon Jul 24 14:53:23 2023 +0100

    Merge branch 'main' into next

commit 1069158
Author: Tony <[email protected]>
Date:   Fri Jul 21 12:25:08 2023 +0100

    encode/decode images directives

commit 1f98220
Merge: 1408f42 56fa540
Author: Fabrizio Balliano <[email protected]>
Date:   Fri Jul 21 12:01:43 2023 +0100

    Merge branch 'next' into tinymce6

commit 56fa540
Merge: 2b58041 4840185
Author: Fabrizio Balliano <[email protected]>
Date:   Fri Jul 21 09:09:54 2023 +0100

    Merge branch 'main' into next

commit 2b58041
Merge: 94d69b5 8572935
Author: Fabrizio Balliano <[email protected]>
Date:   Wed Jul 19 16:24:05 2023 +0100

    Merge branch 'main' into next

commit 94d69b5
Merge: 5f3e3b0 0cb5439
Author: Fabrizio Balliano <[email protected]>
Date:   Wed Jul 19 13:36:44 2023 +0100

    Merge branch 'main' into next

commit 5f3e3b0
Author: luigifab <[email protected]>
Date:   Mon Jul 17 12:48:52 2023 +0200

    Removed all deprecated _Mysql4_ classes (OpenMage#2730)

    * Remove Mysql4 class

    * Remove deprecatedNode

    * Rename class with Mysql4

    * Remove deprecatedNode compatibility

    * PHPStan update

    * Add migration script

    ---------

    Co-authored-by: Fabrizio Balliano <[email protected]>

commit 1408f42
Author: Fabrizio Balliano <[email protected]>
Date:   Sat Jul 15 22:57:29 2023 +0100

    updated to 6.6.0

commit bdcf3ff
Merge: c32e341 49951c1
Author: Fabrizio Balliano <[email protected]>
Date:   Sat Jul 15 22:53:54 2023 +0100

    merged branch next

commit 19048e0
Author: luigifab <[email protected]>
Date:   Sat Jul 15 23:49:39 2023 +0200

    Remove onmouseover/onmouseout from adminhtml menu (OpenMage#2737)

    Co-authored-by: Fabrizio Balliano <[email protected]>

commit 49951c1
Merge: 54f8074 a508ae5
Author: Fabrizio Balliano <[email protected]>
Date:   Sat Jul 15 15:42:40 2023 +0100

    Merge branch 'main' into next

commit 54f8074
Merge: b836666 8aae6e2
Author: Fabrizio Balliano <[email protected]>
Date:   Wed Jul 12 13:08:11 2023 +0100

    Merge branch 'main' into next

commit b836666
Author: Fabrizio Balliano <[email protected]>
Date:   Tue Jul 11 10:25:33 2023 +0100

    Fixed PHPStan warnings for branch "next" (PHP 8.1) (OpenMage#3269)

commit 5ea608f
Merge: 68900aa c36f57d
Author: Fabrizio Balliano <[email protected]>
Date:   Tue Jul 11 10:17:04 2023 +0100

    Merge branch 'main' into next

commit 68900aa
Merge: 5711907 d8bd81b
Author: Fabrizio Balliano <[email protected]>
Date:   Mon Jul 10 15:31:27 2023 +0100

    Merge branch 'main' into next

commit 5711907
Merge: 80dae5c 6892dee
Author: Fabrizio Balliano <[email protected]>
Date:   Tue Jul 4 19:53:20 2023 +0100

    Merge branch 'main' into next

commit 80dae5c
Merge: eaca57c 2764d0c
Author: Fabrizio Balliano <[email protected]>
Date:   Mon Jul 3 20:10:25 2023 +0100

    Merge branch 'main' into next

commit eaca57c
Merge: f157bc4 b20f568
Author: Fabrizio Balliano <[email protected]>
Date:   Fri Jun 30 08:16:38 2023 +0100

    Merge branch 'main' into next

commit f157bc4
Merge: 7d8e8b3 752debd
Author: Fabrizio Balliano <[email protected]>
Date:   Tue Jun 27 09:22:55 2023 +0100

    Merge branch 'main' into next

commit 7d8e8b3
Merge: 4feffa3 97e200d
Author: Fabrizio Balliano <[email protected]>
Date:   Sun Jun 25 18:25:56 2023 +0100

    Merge branch 'main' into next

commit 4feffa3
Merge: 66c2c20 b4cee73
Author: Fabrizio Balliano <[email protected]>
Date:   Fri Jun 23 11:17:43 2023 +0100

    Merge branch 'main' into next

commit 66c2c20
Merge: 0e0617d 0992d8c
Author: Fabrizio Balliano <[email protected]>
Date:   Thu Jun 22 07:22:10 2023 +0200

    Merge branch 'main' into next

commit 0e0617d
Merge: cc78b50 9b8eded
Author: Fabrizio Balliano <[email protected]>
Date:   Wed Jun 21 11:56:10 2023 +0200

    Merge branch 'main' into next

commit cc78b50
Merge: cc8b6c2 15f7623
Author: Fabrizio Balliano <[email protected]>
Date:   Mon Jun 19 08:47:13 2023 +0100

    Merge branch 'main' into next

commit cc8b6c2
Merge: 6a36dd9 3b14b96
Author: Fabrizio Balliano <[email protected]>
Date:   Thu Jun 15 09:43:12 2023 +0100

    Merge branch 'main' into next

commit 6a36dd9
Merge: bfabcdf 3f07160
Author: Fabrizio Balliano <[email protected]>
Date:   Thu Jun 15 09:08:40 2023 +0100

    Merge branch 'main' into next

commit bfabcdf
Merge: 7145d4f f703211
Author: Fabrizio Balliano <[email protected]>
Date:   Wed Jun 14 23:21:54 2023 +0100

    Merge branch 'main' into next

commit 7145d4f
Merge: e3d1626 dc52061
Author: Fabrizio Balliano <[email protected]>
Date:   Mon Jun 12 12:08:26 2023 +0100

    Merge branch 'main' into next

commit e3d1626
Merge: b478bde 1431628
Author: Fabrizio Balliano <[email protected]>
Date:   Thu Jun 8 08:39:06 2023 +0200

    Merge branch 'main' into next

commit b478bde
Merge: a1a66eb 2f606b9
Author: Fabrizio Balliano <[email protected]>
Date:   Wed Jun 7 09:49:50 2023 +0200

    Merge branch 'main' into next

commit a1a66eb
Merge: b844f34 820a805
Author: Fabrizio Balliano <[email protected]>
Date:   Sun Jun 4 18:03:31 2023 +0200

    Merge branch 'main' into next

commit b844f34
Merge: a80a482 f8069c4
Author: Fabrizio Balliano <[email protected]>
Date:   Wed May 31 08:55:05 2023 +0200

    Merge branch 'main' into next

commit a80a482
Author: Fabrizio Balliano <[email protected]>
Date:   Wed May 31 08:54:09 2023 +0200

    Removed unnecessary auto_detect_line_endings (OpenMage#3283)

commit 4beb3d7
Merge: 1c93e5b 1f54fc7
Author: Fabrizio Balliano <[email protected]>
Date:   Tue May 30 17:14:03 2023 +0200

    Merge branch 'main' into next

commit 1c93e5b
Merge: d7a095d 68cb9ec
Author: Fabrizio Balliano <[email protected]>
Date:   Sun May 21 12:04:57 2023 +0100

    Merge branch 'main' into next

commit d7a095d
Merge: 4a2f1f4 d6927f9
Author: Fabrizio Balliano <[email protected]>
Date:   Thu May 18 22:16:36 2023 +0100

    Merge branch 'main' into next

commit 4a2f1f4
Merge: 29a8f2c ce8622c
Author: Fabrizio Balliano <[email protected]>
Date:   Tue May 16 16:30:34 2023 +0100

    Merge branch 'main' into next

commit 29a8f2c
Author: Fabrizio Balliano <[email protected]>
Date:   Tue May 16 15:25:23 2023 +0100

    RWD theme: updated jQuery to 3.7.0 (OpenMage#3204)

commit 8fb4c4c
Merge: 3a1f906 e0d615e
Author: Fabrizio Balliano <[email protected]>
Date:   Mon May 15 19:53:00 2023 +0100

    Merge branch 'main' into next

commit 3a1f906
Merge: d468bc2 00da425
Author: Fabrizio Balliano <[email protected]>
Date:   Mon May 15 15:10:59 2023 +0100

    Merge branch 'main' into next

commit c32e341
Merge: f584bfe d468bc2
Author: Fabrizio Balliano <[email protected]>
Date:   Mon May 15 10:56:40 2023 +0100

    Merge branch 'next' into tinymce6

commit d468bc2
Merge: 6fce49b f12eb44
Author: Fabrizio Balliano <[email protected]>
Date:   Mon May 15 09:03:02 2023 +0100

    Merge branch 'main' into next

commit 6fce49b
Merge: a07b648 63595d0
Author: Fabrizio Balliano <[email protected]>
Date:   Sat May 13 14:13:51 2023 +0100

    Merge branch 'main' into next

commit a07b648
Merge: bb9cfc1 c0d136a
Author: Fabrizio Balliano <[email protected]>
Date:   Sat May 13 13:06:58 2023 +0100

    Merge branch 'main' into next

commit bb9cfc1
Author: Fabrizio Balliano <[email protected]>
Date:   Sat May 13 11:37:02 2023 +0100

    Converted RWD's default logos to SVG (and removed some Magento names) (OpenMage#3148)

commit fe3980a
Merge: 27ae828 4da40b1
Author: Fabrizio Balliano <[email protected]>
Date:   Fri May 12 16:47:38 2023 +0100

    Merge branch 'main' into next

commit 27ae828
Author: Fabrizio Balliano <[email protected]>
Date:   Wed May 10 09:10:27 2023 +0100

    Removed unmatched errors from PHPStan baseline after PHP8.1 upgrade (OpenMage#3240)

commit 1c29995
Author: Fabrizio Balliano <[email protected]>
Date:   Tue May 9 20:49:13 2023 +0100

    Removed scriptaculous/dragdrop.js from frontend (OpenMage#3215)

commit f584bfe
Merge: 4dc6a93 1a3aefb
Author: Fabrizio Balliano <[email protected]>
Date:   Tue May 9 20:01:37 2023 +0100

    Merge branch 'tinymce6' of github.com:fballiano/openmage into tinymce6

commit 4dc6a93
Author: Fabrizio Balliano <[email protected]>
Date:   Tue May 9 20:01:30 2023 +0100

    fix for image upload when tinymce is not enabled

commit 1a3aefb
Merge: 437b4da 976591d
Author: Fabrizio Balliano <[email protected]>
Date:   Tue May 9 19:55:12 2023 +0100

    Merge branch 'next' into tinymce6

commit 976591d
Merge: a7413b8 460ce65
Author: Fabrizio Balliano <[email protected]>
Date:   Tue May 9 19:36:08 2023 +0100

    Merge branch 'main' into next

commit 437b4da
Author: Fabrizio Balliano <[email protected]>
Date:   Tue May 9 18:55:13 2023 +0100

    file selector starts to work

commit a7413b8
Author: Fabrizio Balliano <[email protected]>
Date:   Tue May 9 17:19:59 2023 +0100

    Removed double span element from HTML buttons (OpenMage#3123)

commit 318ff9f
Author: Fabrizio Balliano <[email protected]>
Date:   Tue May 9 16:47:28 2023 +0100

    close window image was ugly

commit d43ca5c
Author: Fabrizio Balliano <[email protected]>
Date:   Tue May 9 16:32:44 2023 +0100

    removed tinyMceEditors hash from prototypejs

commit 828ef09
Author: Fabrizio Balliano <[email protected]>
Date:   Tue May 9 16:00:15 2023 +0100

    Fixed showing of plugin buttons

commit 56908d5
Merge: 938aff0 15c441e
Author: Fabrizio Balliano <[email protected]>
Date:   Tue May 9 14:06:11 2023 +0100

    Merge branch 'tinymce6' of github.com:fballiano/openmage into tinymce6

commit 938aff0
Author: Fabrizio Balliano <[email protected]>
Date:   Tue May 9 14:05:55 2023 +0100

    upgraded to 6.4.2

commit 15c441e
Merge: 51f3fd9 36f4fdb
Author: Fabrizio Balliano <[email protected]>
Date:   Tue May 9 14:03:37 2023 +0100

    Merge branch 'next' into tinymce6

commit 36f4fdb
Author: Fabrizio Balliano <[email protected]>
Date:   Fri May 5 09:02:33 2023 +0200

    Github workflows now run on PHP 8.1 (OpenMage#3163)

commit b639beb
Merge: 0a16e58 6b683d7
Author: Fabrizio Balliano <[email protected]>
Date:   Thu May 4 11:21:23 2023 +0200

    Merge branch 'main' into next

commit 0a16e58
Author: Fabrizio Balliano <[email protected]>
Date:   Wed May 3 15:43:02 2023 +0200

    [BC] Unified CSRF configuration (OpenMage#3147)

commit 78bd803
Merge: 210aa81 d3dcc76
Author: Fabrizio Balliano <[email protected]>
Date:   Tue May 2 22:34:47 2023 +0200

    Merge branch 'main' into next

commit 210aa81
Merge: bad757d cefa503
Author: Fabrizio Balliano <[email protected]>
Date:   Sat Apr 29 18:05:40 2023 +0100

    Merge branch 'main' into next

commit 51f3fd9
Author: Fabrizio Balliano <[email protected]>
Date:   Wed Apr 26 15:37:25 2023 +0100

    something starts to work

commit 38e3527
Author: Fabrizio Balliano <[email protected]>
Date:   Tue Apr 25 18:22:50 2023 +0100

    renames plugin javascript files

commit a6ccefd
Author: Fabrizio Balliano <[email protected]>
Date:   Tue Apr 25 18:16:01 2023 +0100

    typo

commit 138fda1
Author: Fabrizio Balliano <[email protected]>
Date:   Tue Apr 25 18:14:05 2023 +0100

    typo

commit c87b2cd
Author: Fabrizio Balliano <[email protected]>
Date:   Tue Apr 25 18:12:41 2023 +0100

    Coverted part of the "variable" plugin

commit c8fe0b5
Author: Fabrizio Balliano <[email protected]>
Date:   Tue Apr 25 17:58:26 2023 +0100

    First test converting the plugins

commit 3683b2d
Author: Fabrizio Balliano <[email protected]>
Date:   Tue Apr 25 17:22:57 2023 +0100

    First commit

commit bad757d
Author: Fabrizio Balliano <[email protected]>
Date:   Tue Apr 25 13:52:55 2023 +0100

    PHP8.1 is now the minimum required version for OM v21 (OpenMage#3160)

commit 0db9446
Merge: 13926d8 cde7af5
Author: Fabrizio Balliano <[email protected]>
Date:   Tue Apr 25 13:35:41 2023 +0100

    Merge branch 'main' into next

commit 13926d8
Merge: 62c3715 c71585a
Author: Fabrizio Balliano <[email protected]>
Date:   Sun Apr 23 00:28:23 2023 +0100

    Merge branch 'main' into next

commit 62c3715
Merge: 3775e0d 4874e5c
Author: Fabrizio Balliano <[email protected]>
Date:   Tue Apr 18 09:43:11 2023 +0100

    Merge branch 'main' into next

commit 3775e0d
Merge: 31601cb bd7d45a
Author: Fabrizio Balliano <[email protected]>
Date:   Thu Apr 13 15:52:09 2023 +0200

    Merge branch 'main' into next

commit 31601cb
Merge: 88a4156 f2f9f5d
Author: Fabrizio Balliano <[email protected]>
Date:   Thu Apr 13 15:49:44 2023 +0200

    Merge branch 'main' into next

commit 88a4156
Merge: eaa1b47 81702bc
Author: Fabrizio Balliano <[email protected]>
Date:   Thu Apr 13 15:19:49 2023 +0200

    Merge branch 'main' into next

commit eaa1b47
Author: Fabrizio Balliano <[email protected]>
Date:   Mon Apr 10 22:36:49 2023 +0100

    [BC] Added form key validation to Contacts form (OpenMage#3146)

    Co-authored-by: Mohamed ELIDRISSI <[email protected]>
  • Loading branch information
empiricompany committed Sep 18, 2023
1 parent a0fbfbd commit 5d1311b
Show file tree
Hide file tree
Showing 1,085 changed files with 8,278 additions and 124,637 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ UPS shut down their old CGI APIs so we removed the support for it from the Mage_

- PHP 8.1 as minimum required version
- Removed scriptaculous/dragdrop.js (#3215)
- RWD theme: updated jQuery to 3.7.0 (#3204)
- RWD theme: updated jQuery to 3.7.0 (#3204), removed enquire.js (#3208)
- Unified CSRF configuration (#3147) and added form key validation to Contacts form (#3146)
- Removed double span element from HTML buttons (#3123)
- Removed all deprecated Mysql4_ classes (#2730). If there are any old modules/extensions in your installation that use such classes, you must run `shell/rename-mysql4-class-to-resource.php` in the command line in order to convert them. Backup all files before running the script
Expand Down
25 changes: 0 additions & 25 deletions app/code/core/Mage/Admin/Model/Mysql4/Acl.php

This file was deleted.

25 changes: 0 additions & 25 deletions app/code/core/Mage/Admin/Model/Mysql4/Acl/Role.php

This file was deleted.

25 changes: 0 additions & 25 deletions app/code/core/Mage/Admin/Model/Mysql4/Acl/Role/Collection.php

This file was deleted.

25 changes: 0 additions & 25 deletions app/code/core/Mage/Admin/Model/Mysql4/Permissions/Collection.php

This file was deleted.

25 changes: 0 additions & 25 deletions app/code/core/Mage/Admin/Model/Mysql4/Role.php

This file was deleted.

25 changes: 0 additions & 25 deletions app/code/core/Mage/Admin/Model/Mysql4/Role/Collection.php

This file was deleted.

25 changes: 0 additions & 25 deletions app/code/core/Mage/Admin/Model/Mysql4/Roles.php

This file was deleted.

25 changes: 0 additions & 25 deletions app/code/core/Mage/Admin/Model/Mysql4/Roles/Collection.php

This file was deleted.

25 changes: 0 additions & 25 deletions app/code/core/Mage/Admin/Model/Mysql4/Roles/User/Collection.php

This file was deleted.

25 changes: 0 additions & 25 deletions app/code/core/Mage/Admin/Model/Mysql4/Rules.php

This file was deleted.

25 changes: 0 additions & 25 deletions app/code/core/Mage/Admin/Model/Mysql4/Rules/Collection.php

This file was deleted.

25 changes: 0 additions & 25 deletions app/code/core/Mage/Admin/Model/Mysql4/User.php

This file was deleted.

25 changes: 0 additions & 25 deletions app/code/core/Mage/Admin/Model/Mysql4/User/Collection.php

This file was deleted.

1 change: 0 additions & 1 deletion app/code/core/Mage/Admin/etc/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
</admin>
<admin_resource>
<class>Mage_Admin_Model_Resource</class>
<deprecatedNode>admin_mysql4</deprecatedNode>
<entities>
<user>
<table>admin_user</table>
Expand Down
25 changes: 0 additions & 25 deletions app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox.php

This file was deleted.

Loading

0 comments on commit 5d1311b

Please sign in to comment.