Commit b9e5151
committed
Merge branch 'develop' into 7.0dev
# Conflicts:
# conf/_application.php
# htsrv/register.php
# inc/skins/model/_skin.class.php
# inc/widgets/widgets/_coll_avatar.widget.php
# install/_functions_evoupgrade.php
# rsc/build/b2evo_base.bmin.css
# rsc/js/build/bootstrap-evo_backoffice.bmin.js
# rsc/js/build/evo_backoffice.bmin.js
# skins/bootstrap_main_skin/style.min.css
# skins_adm/bootstrap/rsc/css/style.min.css760 files changed
Lines changed: 17023 additions & 12009 deletions
File tree
- _transifex
- conf
- htsrv
- inc
- _core
- model
- dataobjects
- db
- ui
- forms
- results
- _ext
- antispam
- model
- views
- central_antispam
- model
- views
- chapters
- model
- views
- collections
- model
- views
- comments
- model
- views
- cron
- jobs
- model
- views
- dashboard
- model
- email_campaigns
- model
- views
- files
- model
- views
- items
- model
- views
- inc
- links
- model
- views
- locales
- model
- views
- plugins
- model
- views
- polls
- model
- views
- regional
- model
- views
- rest
- sessions
- model
- views
- settings
- model
- views
- skins
- model
- views
- slugs
- model
- views
- tools
- model
- views
- users
- model
- passwords
- views
- widgets
- model
- views
- widgets
- xhtml_validator
- xmlrpc/apis
- install
- locales
- de_DE
- LC_MESSAGES
- fr_FR
- LC_MESSAGES
- ru_RU
- LC_MESSAGES
- plugins
- adsense_plugin
- basic_antispam_plugin
- code_highlight_plugin
- highlighters
- cookie_consent_plugin
- flowplayer_plugin
- geoip_plugin
- google_maps_plugin
- html5_mediaelementjs_plugin
- html5_videojs_plugin
- infodots_plugin
- markdown_plugin
- polls_plugin
- prism_plugin
- shortlinks_plugin
- star_plugin
- test_plugin
- videoplug_plugin
- watermark_plugin
- widescroll_plugin
- wikitables_plugin
- rsc/js/src
- skins_adm
- bootstrap
- rsc/css
- login
- skins_email
- skins_fallback_v5
- skins_fallback_v6
- skins
- asevo
- basic
- bootstrap_blog_skin
- bootstrap_forums_skin
- bootstrap_gallery_legacy
- bootstrap_gallery_skin
- bootstrap_main_skin
- bootstrap_manual_skin
- bootstrap_photoblog_skin
- dating_mood
- evopress
- photoalbums
- photoblog
- touch
- xmlsrv
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Large diffs are not rendered by default.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
15 | | - | |
| 15 | + | |
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
24 | | - | |
| 24 | + | |
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
| |||
57 | 57 | | |
58 | 58 | | |
59 | 59 | | |
60 | | - | |
| 60 | + | |
61 | 61 | | |
62 | 62 | | |
63 | 63 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
912 | 912 | | |
913 | 913 | | |
914 | 914 | | |
| 915 | + | |
| 916 | + | |
| 917 | + | |
| 918 | + | |
| 919 | + | |
| 920 | + | |
| 921 | + | |
| 922 | + | |
| 923 | + | |
| 924 | + | |
| 925 | + | |
| 926 | + | |
| 927 | + | |
| 928 | + | |
915 | 929 | | |
916 | 930 | | |
917 | 931 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
7 | | - | |
| 7 | + | |
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
10 | | - | |
| 10 | + | |
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
10 | | - | |
| 10 | + | |
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
10 | | - | |
| 10 | + | |
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
10 | | - | |
| 10 | + | |
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
10 | | - | |
| 10 | + | |
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
| |||
0 commit comments