Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2488 commits
Select commit Hold shift + click to select a range
ab44760
F: Strange behaviour in Chrome with content sometimes being empty on …
Deesen Dec 7, 2016
80ced52
F: fix #1067
Dmi3yy Dec 7, 2016
c6df52f
Merge pull request #1069 from Deesen/develop
Dmi3yy Dec 7, 2016
a79b763
Merge remote-tracking branch 'refs/remotes/modxcms/develop' into develop
Nicola1971 Dec 7, 2016
32e27ad
F: Added message "Please disable register_globals!"
Deesen Dec 7, 2016
634f268
Merge pull request #1070 from Deesen/develop
Dmi3yy Dec 7, 2016
bb5905b
Update login.processor.php
bossloper Dec 7, 2016
50798ed
Update actionlist.inc.php
bossloper Dec 7, 2016
05af9cd
Revert
yama Dec 8, 2016
87cc593
Fix
yama Dec 8, 2016
fad57a7
Safety measure
yama Dec 8, 2016
e018213
Update - language fles
yama Dec 8, 2016
153a43b
F: Demo content ur alias spelling mistake
bossloper Dec 8, 2016
d425f6d
Merge pull request #1076 from bossloper/patch-1
Dmi3yy Dec 8, 2016
2befcb0
Merge pull request #1078 from modxcms/_safe_eval_debug
Dmi3yy Dec 8, 2016
2e319be
F: tinymce block to - class
Dmi3yy Dec 8, 2016
532e4c0
Refactor: Installer
yama Dec 8, 2016
1f723c1
Merge pull request #1071 from bossloper/patch-2
Dmi3yy Dec 8, 2016
10b0549
D: Remove 'recently edited' and 'online users' from System Info Report
bossloper Dec 8, 2016
96bca9b
Merge remote-tracking branch 'refs/remotes/modxcms/develop' into develop
Dec 8, 2016
ae04d3f
#1083 F: Wayfinder not display correct restricted documents
yama Dec 9, 2016
bbf78bb
#1081 I: Added "browser-spellcheck" to plugin-config
Deesen Dec 9, 2016
e29249c
Fixed input height
sashabeep Dec 9, 2016
e6891de
F: Adapted "active_users" to new mechanismn, related to #945
Deesen Dec 9, 2016
f005214
OnManagerMainFrameHeaderHTMLBlock for DocManager module
Nicola1971 Dec 9, 2016
09fca84
OnManagerMainFrameHeaderHTMLBlock for Extras module
Nicola1971 Dec 9, 2016
0975638
Merge remote-tracking branch 'refs/remotes/modxcms/develop' into develop
Nicola1971 Dec 9, 2016
3d1f883
fix https://github.com/modxcms/evolution/issues/1049 Translation miss…
Nicola1971 Dec 9, 2016
7eaea30
#1089 F: Cached and nested snippets not working
yama Dec 10, 2016
e39b9d6
#1089 Ditto - Be sure to expand [!uncached!] in tpl-chunk
yama Dec 10, 2016
21fabe6
Fix: Ditto - sql error of &documents parameter
yama Dec 10, 2016
9830311
#1081 F: Added missing buttons and organized toolbars more clean
Deesen Dec 10, 2016
b2d922e
#1086 F: Convert tree-translations to UTF-8 before json_encode()
Deesen Dec 10, 2016
1b200fa
#1054 F: Enter-key updates datefield now, but only when entered time …
Deesen Dec 10, 2016
252d2f7
#1086 F: Convert tree-translations to UTF-8 before json_encode()
Deesen Dec 12, 2016
bbc580d
#1091 F: Show also uncategorized elements in category-view
Deesen Dec 12, 2016
585f1fd
Merge pull request #1080 from bossloper/patch-3
yama Dec 12, 2016
574bc61
Merge pull request #1084 from Deesen/develop
yama Dec 12, 2016
bdbc1b4
Merge pull request #1087 from sashabeep/patch-2
yama Dec 12, 2016
5da3415
Merge pull request #1088 from Deesen/weblogin_active_users
yama Dec 12, 2016
9b0e95d
Merge pull request #1090 from Nicola1971/develop
yama Dec 12, 2016
39b10fc
Fix: Does not work if PHx plugin is installed
yama Dec 12, 2016
7f1c22a
Fix - Malfunction when PHx plugin is installed
yama Dec 12, 2016
4420c57
I: Showing $modx->dumpSnippets
yama Dec 12, 2016
bc44f6d
Remove comment out
yama Dec 12, 2016
0fe2f02
Fix - $modx->cleanUpMODXTags()
yama Dec 12, 2016
ab3b1d2
Security: Set false $GLOBALS at $modx->safeEval()
yama Dec 12, 2016
e632d18
Refactor
yama Dec 12, 2016
f23f24a
New - $modx->atBindFileContent()
yama Dec 12, 2016
80003c8
R: Replace ProcessFile() to $modx->atBindFileContent()
yama Dec 12, 2016
37fe7bb
#1092 TV @FILE binding not working
yama Dec 12, 2016
8c07d55
Refactor: tab1_site_settings.inc.php
yama Dec 12, 2016
596902f
New: $modx->getExtFromFilename()
yama Dec 12, 2016
2eaea99
Fix: Nested snippet call issue
yama Dec 12, 2016
926c1a0
Refactor: $modx->parseDocumentSource()
yama Dec 12, 2016
2de6a5c
Refactor: $modx->atBindInclude()
yama Dec 12, 2016
9f18969
[F] #109 Document Manager Layout
Nicola1971 Dec 12, 2016
d8bdd8b
Refactor: config.inc.php
yama Dec 13, 2016
1c0e026
[F] #1097 The login state is synchronized at multiple sites
yama Dec 13, 2016
6c313d8
[R] $modx->atBindFileContent()
yama Dec 13, 2016
39851d5
Merge pull request #1094 from Nicola1971/develop
Dmi3yy Dec 13, 2016
73f98a8
i: need more tests, for fix aliasListing + alias_visible
Dmi3yy Dec 13, 2016
3b0fe5f
[F] #1089 Not work nested values in snippet call
yama Dec 14, 2016
e9db670
Merge remote-tracking branch 'refs/remotes/modxcms/develop' into develop
Nicola1971 Dec 14, 2016
9feea66
D: logo.png not used
Dmi3yy Dec 14, 2016
9430124
Merge remote-tracking branch 'refs/remotes/modxcms/develop' into develop
Dec 14, 2016
b6afe95
[I] Installer styles
Dec 14, 2016
f9143a7
[I] MODxRE2 theme improvements
Dec 14, 2016
fbb2ac7
[I] MODxRE2 Top nav lvl 2 darker hover
Dec 15, 2016
3a4087d
[F] #1110 English-british.inc.php not detected
yama Dec 15, 2016
da91183
[I] Other languages fonts update
Dec 15, 2016
52d0a7b
Merge remote-tracking branch 'refs/remotes/modxcms/develop' into develop
Dec 15, 2016
0bd2f33
F: #1026 Standard input label format, remove colon
bossloper Dec 15, 2016
6bc3a77
Update mutate_module.dynamic.php
bossloper Dec 15, 2016
6f4486f
Update mutate_templates.dynamic.php
bossloper Dec 15, 2016
e334269
Update mutate_tmplvars.dynamic.php
bossloper Dec 15, 2016
f1bb21b
Update mutate_plugin.dynamic.php
bossloper Dec 15, 2016
0076143
Update mutate_module.dynamic.php
bossloper Dec 15, 2016
53f7651
Update mutate_templates.dynamic.php
bossloper Dec 15, 2016
78b201a
Update mutate_tmplvars.dynamic.php
bossloper Dec 15, 2016
a9fc31a
Update mutate_htmlsnippet.dynamic.php
bossloper Dec 15, 2016
582cbb2
Update mutate_snippet.dynamic.php
bossloper Dec 15, 2016
fe8a371
Merge remote-tracking branch 'refs/remotes/modxcms/develop' into develop
Nicola1971 Dec 15, 2016
3355344
Update mutate_snippet.dynamic.php
bossloper Dec 15, 2016
ee25dde
Update mutate_plugin.dynamic.php
bossloper Dec 15, 2016
2e7bfac
Update plugin.filesource.php
bossloper Dec 15, 2016
eee4c39
Merge remote-tracking branch 'refs/remotes/modxcms/develop' into develop
Nicola1971 Dec 15, 2016
c3c5b6a
Merge pull request #1109 from pmfx/develop
Dmi3yy Dec 15, 2016
7ab1068
Merge pull request #1112 from bossloper/patch-4
Dmi3yy Dec 15, 2016
d416cda
Merge remote-tracking branch 'refs/remotes/modxcms/develop' into develop
Dec 15, 2016
28d6bfe
Merge remote-tracking branch 'refs/remotes/modxcms/develop' into develop
Nicola1971 Dec 15, 2016
633dd49
[F] various fixes to manager elements
Nicola1971 Dec 15, 2016
0579d1d
new language string element_filter_msg
Nicola1971 Dec 15, 2016
9aa3cee
Merge pull request #1113 from Nicola1971/develop
Dmi3yy Dec 15, 2016
cdf2b6a
Merge remote-tracking branch 'refs/remotes/modxcms/develop' into develop
Nicola1971 Dec 15, 2016
6028fb8
[F] ditto & ajaxsearch etomite_charset > modx_charset
Nicola1971 Dec 15, 2016
a0fd6ec
[F] typo in wayfinder/examples/cssplay/dropline.css
Nicola1971 Dec 15, 2016
2295e87
Merge remote-tracking branch 'refs/remotes/modxcms/develop' into develop
Dec 15, 2016
4538faf
Merge remote-tracking branch 'modxcms/develop' into develop
Dec 15, 2016
e48100e
TinyMCE4 restyle
Dec 15, 2016
7dbcc9c
F: fix #1107 error with plugin ajaxSubmit
Dmi3yy Dec 15, 2016
73a6a85
Merge branch 'develop' of https://github.com/modxcms/evolution into d…
Dmi3yy Dec 15, 2016
7a95114
Merge remote-tracking branch 'refs/remotes/modxcms/develop' into develop
Dec 15, 2016
7a2d630
[F] #1089 Issue of snippet call
yama Dec 16, 2016
cec120b
[F] Set lock-expire minimum fallback to 120 seconds / 2min
Deesen Dec 16, 2016
4ac8c1b
[C] $modx->evalSnippets()
yama Dec 16, 2016
87999cb
Merge remote-tracking branch 'refs/remotes/modxcms/develop' into develop
Dec 16, 2016
83d7ee8
Merge pull request #1114 from Nicola1971/develop
Dmi3yy Dec 16, 2016
d31a2be
Merge pull request #1116 from fourroses666/develop
Dmi3yy Dec 16, 2016
f18327e
Merge remote-tracking branch 'modxcms/develop' into develop
fourroses666 Dec 17, 2016
5671bc6
TinyMCE4 icon font style fix
fourroses666 Dec 17, 2016
c51b898
Merge pull request #1122 from fourroses666/develop
Dmi3yy Dec 17, 2016
eb7315e
Merge remote-tracking branch 'modxcms/develop' into develop
fourroses666 Dec 17, 2016
d5a7f19
Images not visible Apache 2.0
fourroses666 Dec 17, 2016
daf9d7e
Merge pull request #1123 from fourroses666/develop
Dmi3yy Dec 17, 2016
e6f3145
[I] #1124 Filemanager: Added duplicateFile, renameFolder, renameFile
Deesen Dec 19, 2016
e226e5f
[F] #1120 QM: Added periodical server-ping to assure keeping session …
Deesen Dec 19, 2016
484c969
[F] Remove all locks when no valid user sessions exist to avoid confu…
Deesen Dec 19, 2016
ee27843
[F] Clean-up expired locks at login
Deesen Dec 19, 2016
030e64e
[O] Small improvements
Deesen Dec 19, 2016
173b403
[F] [*var@docid*]
yama Dec 19, 2016
caa8c74
[I] $modx->parseText()
yama Dec 19, 2016
280a653
[I] #1027 Added "OK"-button to datePicker for mobile devices
Deesen Dec 19, 2016
0789f8c
Merge remote-tracking branch 'refs/remotes/modxcms/develop' into develop
Dec 19, 2016
90d3cdc
Merge pull request #1126 from Deesen/develop
Dmi3yy Dec 19, 2016
61dc680
Merge remote-tracking branch 'refs/remotes/modxcms/develop' into develop
Dec 19, 2016
c08383c
[F] #1130 Tabs FileManager and FileBrowser missing
yama Dec 21, 2016
61a2263
Merge remote-tracking branch 'refs/remotes/modxcms/develop' into develop
Dec 21, 2016
1ed16a8
Fix error if empty $options in tinymce
Dmi3yy Dec 21, 2016
86a50ae
F: fix $_GET[‘q’] in sendStrictURI
Dmi3yy Dec 21, 2016
23ba9a2
F: fix virtualDir warning
Dmi3yy Dec 21, 2016
4924745
F: Nesting level from 10 to 200
Dmi3yy Dec 21, 2016
e6f29d5
Merge remote-tracking branch 'refs/remotes/modxcms/develop' into develop
Dec 21, 2016
345c5b3
[I] #1131 Add file insert button for weblink field
bossloper Dec 21, 2016
ecb4d1b
Update style.css
bossloper Dec 21, 2016
c378b24
only load js once if weblink
bossloper Dec 22, 2016
ecbe34e
Update weblink help
bossloper Dec 22, 2016
e866359
Merge remote-tracking branch 'refs/remotes/modxcms/develop' into develop
Nicola1971 Dec 22, 2016
b835fea
[I] #1124 added missing string files_directory_is_empty (Files Manager)
Nicola1971 Dec 23, 2016
fb722d8
[I] #1124 added styles for restyled Files Manager
Nicola1971 Dec 23, 2016
8368ea1
[I] #1124 Files Manager icons with Font Awesome
Nicola1971 Dec 23, 2016
b264cb5
[R] #1124 Refactor/Restyle Files Manager
Nicola1971 Dec 23, 2016
53a49cc
Merge pull request #1137 from Nicola1971/develop
Dmi3yy Dec 23, 2016
660163d
[Fix] Issue of nesting tags
yama Dec 24, 2016
b691cfb
[Fix] Empty placeholder parse issue
yama Dec 24, 2016
9c73a69
[Fix] Modifire parse issue
yama Dec 24, 2016
5f5ec32
Merge remote-tracking branch 'refs/remotes/modxcms/develop' into develop
Dec 25, 2016
b68ece7
Merge branch 'develop' into patch-5
Dmi3yy Dec 26, 2016
11316d7
Merge pull request #1136 from bossloper/patch-5
Dmi3yy Dec 26, 2016
12a7cc1
up version
Dmi3yy Dec 26, 2016
2a825d8
[R] #1115
Dmi3yy Dec 26, 2016
3990ab0
Update changeling
Dmi3yy Dec 26, 2016
a77f6f9
update Russian Lang
Dmi3yy Dec 26, 2016
4a126d0
#1024 Display "Multiple Sessions found for this user" / avoid "Forgot…
Deesen Dec 1, 2016
b9489ed
#1024 Added "sid" to DB-table (using $modx->sid = md5(session_id()); …
Deesen Dec 1, 2016
15a28df
#1024 Removed unnecessary md5() for $modx->sid
Deesen Dec 19, 2016
5682b87
#1024 Added $modx->cleanupMultipleActiveUsers()
Deesen Dec 26, 2016
0ffee7c
#1024 Added `sid` to table active_user_locks
Deesen Dec 26, 2016
ba0b893
#1024 Replaced check against "internalKey" by "sid"
Deesen Dec 26, 2016
30a2d4e
#1024 Replaced check against "internalKey" by "sid", added function c…
Deesen Dec 26, 2016
8cbb924
[I] #1024 Added unique icon for users logged-in with multiple browser…
Deesen Dec 26, 2016
fbb43a0
Merge remote-tracking branch 'origin/multi_browser_sid' into multi_br…
Deesen Dec 26, 2016
c268b0c
[F] replace query 3.1.1 from https://code.jquery.com/jquery-3.1.1.mi…
Dmi3yy Dec 26, 2016
5034a32
Merge remote-tracking branch 'refs/remotes/modxcms/develop' into develop
Dec 26, 2016
3a07b4b
[F] #1119 Assure "session_timeout" is always "mail_check_timeperiod" …
Deesen Dec 26, 2016
96b0486
Corrected "session_timeout_msg", added "multiple_sessions_msg"
Deesen Dec 26, 2016
650cb07
[F] Lock Elements: Fixed keys
Deesen Dec 26, 2016
fe188a2
#1024 Added auto-increment ID again for active_user_locks to fix mult…
Deesen Dec 26, 2016
cb5dab0
Merge pull request #1141 from Deesen/multi_browser_sid
Dmi3yy Dec 26, 2016
ef5e2d8
Merge branch 'develop' into develop
Dmi3yy Dec 26, 2016
f11db8f
Merge pull request #1142 from Deesen/develop
Dmi3yy Dec 26, 2016
db9633c
fix for SimpleTab on 1.2.1
Dmi3yy Dec 27, 2016
6deac49
Merge remote-tracking branch 'refs/remotes/modxcms/develop' into develop
Nicola1971 Dec 27, 2016
89743a0
Merge remote-tracking branch 'refs/remotes/modxcms/develop' into develop
Dec 27, 2016
9e54164
ElementsInTree update
Dec 27, 2016
2426fd1
Merge pull request #1145 from pmfx/develop
Dmi3yy Dec 27, 2016
4f9582e
Merge branch 'develop' of https://github.com/modxcms/evolution into d…
Dmi3yy Dec 27, 2016
f83a821
Merge remote-tracking branch 'refs/remotes/modxcms/develop' into develop
Nicola1971 Dec 27, 2016
885b522
ElementsInTree - replaced hardcoded text placeholder with language st…
Nicola1971 Dec 27, 2016
eb7ea0d
replaced text placeholder with language string
Dec 27, 2016
f1c5c8a
Merge remote-tracking branch 'refs/remotes/modxcms/develop' into develop
Dec 27, 2016
96bbd48
Merge pull request #1146 from Nicola1971/develop
Dmi3yy Dec 27, 2016
8463e10
[S] #1143 Update PHPMailer
Dmi3yy Dec 27, 2016
102fc59
Merge branch 'develop' of https://github.com/modxcms/evolution into d…
Dmi3yy Dec 27, 2016
71c1f25
Report issues link updated
Dec 27, 2016
a26614d
Merge pull request #1147 from pmfx/develop
Dmi3yy Dec 27, 2016
1cb2897
Merge remote-tracking branch 'refs/remotes/modxcms/develop' into develop
Dec 27, 2016
a0be46a
[F] 100% width for all inputs
Deesen Dec 27, 2016
a00ca56
Merge pull request #1148 from Deesen/develop
Dmi3yy Dec 27, 2016
b08a2cd
[F] #1149 @SELECT for checkboxes
Deesen Dec 27, 2016
e3d6cf9
Merge pull request #1150 from Deesen/develop
Dmi3yy Dec 27, 2016
46ae45f
[F] #1144 Replaced $modx->parseText() by modxRTEbridge->parsePlacehol…
Deesen Dec 27, 2016
5a56b4f
Merge pull request #1151 from Deesen/develop
Dmi3yy Dec 27, 2016
de18340
[F] #1144 Nested tags issue
yama Dec 27, 2016
9b5bad6
Merge remote-tracking branch 'refs/remotes/modxcms/develop' into develop
Dec 28, 2016
219be2b
[S] #1143 update phpMailer to 5.2.21
Dmi3yy Dec 29, 2016
7262d14
#1143
Dmi3yy Dec 29, 2016
331e44b
Revert "#1143"
Dmi3yy Dec 29, 2016
e2f6188
Only delete no good, and not work on upgrade mode
Dmi3yy Dec 29, 2016
cf07850
Merge remote-tracking branch 'refs/remotes/modxcms/develop' into develop
Dec 30, 2016
eca190a
Merge remote-tracking branch 'refs/remotes/modxcms/develop' into develop
Nicola1971 Jan 2, 2017
6813e05
[I] #1024 icons and styles for Online Users widget (dashboard)
Nicola1971 Jan 2, 2017
c585dd6
[E] #1160 Run Module from Module Config
Nicola1971 Jan 2, 2017
b61c5ba
Merge remote-tracking branch 'refs/remotes/modxcms/develop' into develop
Nicola1971 Jan 2, 2017
cad2e21
https://github.com/modxcms/evolution/issues/1160
Nicola1971 Jan 2, 2017
54c928e
Merge pull request #1158 from Nicola1971/develop
Dmi3yy Jan 3, 2017
9790de0
Revert @de18340
yama Jan 3, 2017
9430731
Merge remote-tracking branch 'refs/remotes/modxcms/develop' into develop
Jan 3, 2017
5d89d30
[R] toAlias add .txt. (good use for robots.txt ))
Dmi3yy Jan 4, 2017
3ba4a1a
[I] #1154 Added new plugin-event "OnBeforeParseParams" to allow repla…
Deesen Jan 5, 2017
7d80601
version 1.2.1RC2 of Jan 05, 2017
Deesen Jan 5, 2017
ec7269b
Merge remote-tracking branch 'refs/remotes/modxcms/develop' into develop
Nicola1971 Jan 5, 2017
d90cd2d
1.2.1 Italian language for installer
Nicola1971 Jan 5, 2017
72d911d
1.2.1 Italian language for manager
Nicola1971 Jan 5, 2017
371dd5d
[F] #1164 Do not trigger "save" when Alt-Key is pressed
Deesen Jan 5, 2017
40f496a
[F] #1169 Fix MODX_CORE_PATH for renamed manager-path
Deesen Jan 5, 2017
8e75ecf
[F] #1166 Check if iconv() is available as required, added missing "O…
Deesen Jan 6, 2017
3d491be
[F] #1166 Check if iconv() is available, provide $_lang for pre-check…
Deesen Jan 6, 2017
7d513d6
Merge remote-tracking branch 'modxcms/develop' into develop
Jan 6, 2017
452fcec
Update Dutch Manager language
Jan 6, 2017
7759cc9
Updated Polish language to 1.2.1
Jan 6, 2017
126a06c
lang attribute
Jan 6, 2017
37100dd
small change
Jan 6, 2017
549145b
Merge pull request #1163 from Nicola1971/develop
Dmi3yy Jan 6, 2017
923581f
Merge pull request #1172 from fourroses666/develop
Dmi3yy Jan 6, 2017
3fb7bfe
Merge pull request #1173 from pmfx/develop
Dmi3yy Jan 6, 2017
675f5ca
Merge remote-tracking branch 'refs/remotes/modxcms/develop' into develop
Jan 6, 2017
3233000
[F] #1174 Keep correct path when renaming paths/files
Deesen Jan 6, 2017
ecb9745
[I] #1134 style_formats: Transform simple-format "Title1,class1|Title…
Deesen Jan 7, 2017
c0b3897
[F] Fix custom RTE-params per TV (like {"theme":"inline","editor":"CK…
Deesen Jan 7, 2017
8e6cc22
[F] Show Richtext-editors of TVs also when resource is of type weblink
Deesen Jan 7, 2017
f9d12cb
Merge branch 'develop' of https://github.com/modxcms/evolution into d…
Dmi3yy Jan 7, 2017
f8dc135
[I] #854 Allow uploads for multiple files
Deesen Jan 7, 2017
0f116a9
Merge remote-tracking branch 'refs/remotes/modxcms/develop' into develop
Jan 9, 2017
41f23f5
Update duplicate_content.processor.php
zatomant Jan 9, 2017
2d8171e
Merge pull request #1179 from M-xm/patch-1
Dmi3yy Jan 9, 2017
dc9d774
Merge remote-tracking branch 'refs/remotes/modxcms/develop' into develop
Jan 10, 2017
422bbcb
Wrong link
Jako Jan 10, 2017
a0f2a52
Resource breadcrumbs bottom-border
Jan 10, 2017
fa584d9
[F] setLastClickedElement in tree.php
Dmi3yy Jan 10, 2017
0d730a8
Merge branch 'develop' of https://github.com/modxcms/evolution into d…
Dmi3yy Jan 10, 2017
6f404c6
[Improved] Debug information
yama Jan 11, 2017
203c260
Merge pull request #1165 from Deesen/develop
Dmi3yy Jan 11, 2017
df865d3
Merge pull request #1180 from Jako/patch-2
Dmi3yy Jan 11, 2017
9f67e07
Merge pull request #1181 from pmfx/develop
Dmi3yy Jan 11, 2017
0d60e42
1.2.1
Dmi3yy Jan 11, 2017
2a46216
[O] Added "improved debug-info"
Deesen Jan 11, 2017
230930a
[F] "top.tree.setLastClickedElement() is undefined" when clicking act…
Deesen Jan 11, 2017
252e3dd
Merge pull request #1183 from Deesen/develop
Dmi3yy Jan 11, 2017
41267f9
Merge pull request #1103 from modxcms/develop
Dmi3yy Jan 11, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 2 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
.gitattributes export-ignore
.tx export-ignore
.gitignore export-ignore
.tx export-ignore
16 changes: 8 additions & 8 deletions .tx/config
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
[main]
host = https://www.transifex.com
lang_map = bg: bulgarian, cs: czech, da: danish, de: german, es: spanish-utf8, fa: persian, fi: finnish, fr: francais-utf8, he: hebrew, it: italian, ja: japanese-utf8, nl: nederlands-utf8, no: norsk, pl: polish-utf8, pt_BR: portuguese-br-utf8, pt: portuguese, ru: russian-UTF8, sv: svenska-utf8, zh: chinese
lang_map = bg: bulgarian, cs: czech, da: danish, de: german, es: spanish-utf8, fa: persian, fi: finnish, fr: francais-utf8, he: hebrew, it: italian, ja: japanese-utf8, nl: nederlands-utf8, no: norsk, pl: polish-utf8, pt_BR: portuguese-br-utf8, pt: portuguese, ru: russian-UTF8, sv: svenska-utf8, uk: ukranian, zh: chinese

[modx-evolution.installer]
file_filter = install/lang/<lang>.inc.php
source_file = install/lang/english.inc.php
source_lang = en
type = PHP_ALT_ARRAY
lang_map = bg: bulgarian, cs: czech, da: danish, de: german, es: spanish-utf8, fa: persian, fi: finnish-utf8, fr: francais-utf8, he: hebrew, it: italian, ja: japanese-utf8, nl: nederlands-utf8, no: norwegian, pl: polish-utf8, pt_BR: portuguese-br-utf8, pt: portuguese, ru: russian-UTF8, sv: svenska, zh: chinese
lang_map = bg: bulgarian, cs: czech, da: danish, de: german, es: spanish-utf8, fa: persian, fi: finnish-utf8, fr: francais-utf8, he: hebrew, it: italian, ja: japanese-utf8, nl: nederlands-utf8, no: norwegian, pl: polish-utf8, pt_BR: portuguese-br-utf8, pt: portuguese, ru: russian-UTF8, sv: svenska, uk: ukranian, zh: chinese

[modx-evolution.countrylist]
file_filter = manager/includes/lang/country/<lang>_country.inc.php
Expand All @@ -26,40 +26,40 @@ file_filter = assets/snippets/ditto/lang/<lang>.inc.php
source_file = assets/snippets/ditto/lang/english.inc.php
source_lang = en
type = PHP_ALT_ARRAY
lang_map = bg: bulgarian-utf8, cs: czech, da: danish, de: german, es: spanish, fa: persian, fi: finnish, fr: francais-utf8, he: hebrew, it: italian, ja: japanese-utf8, nl: nederlands, no: norwegian, pl: polish-utf8, pt_BR: portuguese-br, pt: portuguese, ru: russian-UTF8, sv: svenska-utf8, zh: chinese
lang_map = bg: bulgarian-utf8, cs: czech, da: danish, de: german, es: spanish, fa: persian, fi: finnish, fr: francais-utf8, he: hebrew, it: italian, ja: japanese-utf8, nl: nederlands, no: norwegian, pl: polish-utf8, pt_BR: portuguese-br, pt: portuguese, ru: russian-UTF8, sv: svenska-utf8, uk: ukranian, zh: chinese

[modx-evolution.eform]
file_filter = assets/snippets/eform/lang/<lang>.inc.php
source_file = assets/snippets/eform/lang/english.inc.php
source_lang = en
type = PHP_ALT_ARRAY
lang_map = bg: bulgarian, cs: czech, da: danish, de: german, es: spanish-utf8, fa: persian, fi: finnish, fr: francais-utf8, he: hebrew, it: italian, ja: japanese-utf8, nl: nederlands-utf8, no: norwegian, pl: polish, pt_BR: portuguese-br, pt: portuguese, ru: russian-UTF8, sv: svenska-utf8, zh: chinese
lang_map = bg: bulgarian, cs: czech, da: danish, de: german, es: spanish-utf8, fa: persian, fi: finnish, fr: francais-utf8, he: hebrew, it: italian, ja: japanese-utf8, nl: nederlands-utf8, no: norwegian, pl: polish, pt_BR: portuguese-br, pt: portuguese, ru: russian-UTF8, sv: svenska-utf8, uk: ukranian, zh: chinese

[modx-evolution.docmanager]
file_filter = assets/modules/docmanager/lang/<lang>.inc.php
source_file = assets/modules/docmanager/lang/english.inc.php
source_lang = en
type = PHP_ALT_ARRAY
lang_map = bg: bulgarian, cs: czech, da: danish, de: german, es: spanish-utf8, fa: persian, fi: finnish, fr: francais-utf8, he: hebrew, it: italian, ja: japanese-utf8, nl: nederlands-utf8, no: norwegian, pl: polish-utf8, pt_BR: portuguese-br, pt: portuguese, ru: russian-UTF8, sv: svenska-utf8, zh: chinese
lang_map = bg: bulgarian, cs: czech, da: danish, de: german, es: spanish-utf8, fa: persian, fi: finnish, fr: francais-utf8, he: hebrew, it: italian, ja: japanese-utf8, nl: nederlands-utf8, no: norwegian, pl: polish-utf8, pt_BR: portuguese-br, pt: portuguese, ru: russian-UTF8, sv: svenska-utf8, uk: ukranian, zh: chinese

[modx-evolution.ajaxsearch]
file_filter = assets/snippets/ajaxSearch/lang/<lang>.inc.php
source_file = assets/snippets/ajaxSearch/lang/english-utf8.inc.php
source_lang = en
type = PHP_ALT_ARRAY
lang_map = bg: bulgarian, cs: czech, da: danish, de: german, es: spanish-utf8, fa: persian, fi: finnish, fr: francais-utf8, he: hebrew, it: italian, ja: japanese-utf8, nl: nederlands-utf8, no: norsk-utf8, pl: polish-utf8, pt_BR: portuguese-br, pt: portuguese, ru: russian-UTF8, sv: svenska-utf8, zh: chinese
lang_map = bg: bulgarian, cs: czech, da: danish, de: german, es: spanish-utf8, fa: persian, fi: finnish, fr: francais-utf8, he: hebrew, it: italian, ja: japanese-utf8, nl: nederlands-utf8, no: norsk-utf8, pl: polish-utf8, pt_BR: portuguese-br, pt: portuguese, ru: russian-UTF8, sv: svenska-utf8, uk: ukranian, zh: chinese

[modx-evolution.filesource]
file_filter = assets/plugins/filesource/lang/<lang>.inc.php
source_file = assets/plugins/filesource/lang/english.inc.php
source_lang = en
type = PHP_ALT_ARRAY
lang_map = bg: bulgarian, cs: czech, da: danish, de: german, es: spanish-utf8, fa: persian, fi: finnish, fr: francais-utf8, he: hebrew, it: italian, ja: japanese-utf8, nl: nederlands-utf8, no: norwegian, pl: polish-utf8, pt_BR: portuguese-br, pt: portuguese, ru: russian-UTF8, sv: svenska-utf8, zh: chinese
lang_map = bg: bulgarian, cs: czech, da: danish, de: german, es: spanish-utf8, fa: persian, fi: finnish, fr: francais-utf8, he: hebrew, it: italian, ja: japanese-utf8, nl: nederlands-utf8, no: norwegian, pl: polish-utf8, pt_BR: portuguese-br, pt: portuguese, ru: russian-UTF8, sv: svenska-utf8, uk: ukranian, zh: chinese

[modx-evolution.tinymce]
file_filter = assets/plugins/tinymce/lang/<lang>.inc.php
source_file = assets/plugins/tinymce/lang/english.inc.php
source_lang = en
type = PHP_ALT_ARRAY
lang_map = bg: bulgarian, cs: czech, da: danish, de: german, es: spanish-utf8, fa: persian, fi: finnish, fr: francais-utf8, he: hebrew, it: italian, ja: japanese-utf8, nl: nederlands-utf8, no: norwegian, pl: polish-utf8, pt_BR: portuguese-br, pt: portuguese, ru: russian-UTF8, sv: svenska-utf8, zh: chinese
lang_map = bg: bulgarian, cs: czech, da: danish, de: german, es: spanish-utf8, fa: persian, fi: finnish, fr: francais-utf8, he: hebrew, it: italian, ja: japanese-utf8, nl: nederlands-utf8, no: norwegian, pl: polish-utf8, pt_BR: portuguese-br, pt: portuguese, ru: russian-UTF8, sv: svenska-utf8, uk: ukranian, zh: chinese

34 changes: 34 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# MODX Evolution

**What is MODX**

MODX is an open source Content Management System and Application Framework. Initially inspired by Etomite 0.6, MODX is an ongoing project written by Raymond Irving and a core team of contributors at the MODX Project. MODX is distributed under the GPL license and is now run by a professional team of developers from all over the world. Visit the Forums for more information.

MODX provides a fast, lightweight and powerful framework on which to deploy and secure your website and web applications. For example, it gives you a true system for registered web users and groups that is separate from administration users. You can grant some web users access to one page and others access to another page. For content management, you can easily duplicate documents, folders (and all their children!), chunks and snippets. Most significant, though, is MODX's ability to empower you to quickly and easily create and maintain a rich and dynamic website like never before.

MODX Evolution requires **PHP version 5.3 and higher**.

### Screenshots

![screenshot_1](https://cloud.githubusercontent.com/assets/523389/20504423/97db8bf8-b047-11e6-9eef-550c1c7d34f2.jpg)

![screenshot_2](https://cloud.githubusercontent.com/assets/523389/20504414/926ceec8-b047-11e6-8760-3d11d6610977.jpg)

![screenshot_3](https://cloud.githubusercontent.com/assets/523389/20504420/956ef5d0-b047-11e6-9460-7c7a471bada6.jpg)

### References

Official Website:
https://modx.com/community/modx-evolution

Download:
https://modx.com/download/evolution/

Previous Releases:
https://modx.com/download/evolution/previous-releases.html

Extras:
https://modx.com/extras/?product=evolution

Documentation:
https://docs.modx.com/evolution/1.0
2 changes: 1 addition & 1 deletion assets/cache/images/.htaccess
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
order deny,allow
allow from all
allow from all
5 changes: 5 additions & 0 deletions assets/docs/.htaccess
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
IndexIgnore */*
<Files "changelog.txt">
Order Allow,Deny
Deny from all
</Files>
Loading