Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
610 commits
Select commit Hold shift + click to select a range
33a6c51
update mm step2
Dmi3yy Aug 26, 2013
c56a4ef
update mm step 3
Dmi3yy Aug 26, 2013
0477b99
Delete unnecessary class.smtp.php
yama Aug 26, 2013
5ea8d6d
update mm done
Dmi3yy Aug 26, 2013
2b66426
Fix MODxMailer default html mail
yama Aug 26, 2013
e03ba66
Feature #10124 Intcrement method Resource ID - lang
Dmi3yy Aug 26, 2013
3813ec5
Add function into MODxMailer
yama Aug 26, 2013
ddc157d
Feature #10124 Intcrement method Resource ID - done
Dmi3yy Aug 26, 2013
899b3b7
Fix MODxRE theme
yama Aug 26, 2013
1315835
Small fix
yama Aug 26, 2013
1472634
Feature #10125 Add new function - $modx->sendmail()
yama Aug 26, 2013
3c3f4e1
Use new mail function
yama Aug 26, 2013
8a91f45
fix search extender for utf-8
Dmi3yy Aug 26, 2013
ba9424b
MODx -> MODX
Dmi3yy Aug 26, 2013
6b170ea
MODx -> MODX
Dmi3yy Aug 26, 2013
eca9b0c
Fix $modx->sendmail()
yama Aug 26, 2013
0d61bf1
MODx -> MODX
Dmi3yy Aug 26, 2013
e6f0126
Use new mail function (send webuser password)
yama Aug 26, 2013
fa02b6e
fix html
Dmi3yy Aug 26, 2013
d2e6649
fix html in eventlog
Dmi3yy Aug 26, 2013
9eee482
fix html in user_management
Dmi3yy Aug 26, 2013
9c7e40c
fix html in web_user_management
Dmi3yy Aug 26, 2013
d028a75
Merge pull request #87 from yama/master-dmi3yy
Dmi3yy Aug 26, 2013
7f0a0e2
add htaccess in images
Dmi3yy Aug 26, 2013
b315c2a
user send messages by modx->sendmail
Dmi3yy Aug 26, 2013
a488ddb
Refactor #10126 Rewrite Export Static HTML function
yama Aug 26, 2013
987b5a1
Backup manager - Fix result message box
yama Aug 26, 2013
d7c45b4
Fix - Export function
yama Aug 26, 2013
653f00f
Refactor #10127 Rewrite Import HTML site function
yama Aug 26, 2013
82d1319
Merge branch 'master-dmi3yy' of https://github.com/yama/evolution int…
Dmi3yy Aug 26, 2013
f18b7ca
Fix phpThumb path issue
yama Aug 26, 2013
d913765
Merge pull request #89 from yama/master-dmi3yy
Dmi3yy Aug 26, 2013
d45bee8
update phpthumb class
Dmi3yy Aug 26, 2013
a58d5cd
update phpthumb config
Dmi3yy Aug 26, 2013
7f52688
update phpthumb filters function
Dmi3yy Aug 26, 2013
3354b53
update phpthumb done
Dmi3yy Aug 26, 2013
a4b4ec9
delete sample config in phpthumb
Dmi3yy Aug 26, 2013
43a0d68
fix MODX to MODX Evolution after install
Dmi3yy Aug 26, 2013
de3bb70
some fix in russian lang
Dmi3yy Aug 26, 2013
f7058d4
fix tpl
Dmi3yy Aug 26, 2013
fad2f3d
small fix
Dmi3yy Aug 26, 2013
c52fd00
small fix
Dmi3yy Aug 26, 2013
f97cde6
fix floater in MODxRE
Dmi3yy Aug 26, 2013
b655f5f
Fix - Backup manager
yama Aug 27, 2013
7f025b8
Small fix
yama Aug 27, 2013
7edd882
Merge branch 'master' of https://github.com/dmi3yy/evolution into mas…
yama Aug 27, 2013
e7da952
Missing jquery path
yama Aug 27, 2013
ba53d03
Unnecessary english lang entries
yama Aug 27, 2013
f24326f
Fix url in credit
yama Aug 27, 2013
a542502
Refactor #10131 Update jQuery version (1.4.4 -> 1.8.3)
yama Aug 27, 2013
77918bd
Refactor #10131 Update jQuery version (1.4.4 -> 1.8.3)
yama Aug 27, 2013
f416730
maybe typo
yama Aug 27, 2013
f89de3c
Fix - restore function
yama Aug 27, 2013
c5f800e
Fix - Backup manager
yama Aug 27, 2013
9aa6b35
Merge pull request #90 from yama/master-dmi3yy
Dmi3yy Aug 27, 2013
5b4d810
fix setting html
Dmi3yy Aug 27, 2013
13a6142
fix setup default value
Dmi3yy Aug 27, 2013
f776daa
fix modx manager path
Dmi3yy Aug 27, 2013
959f1d4
Refactor #10132 QM - Update jQuery ColorBox plugin
yama Aug 27, 2013
957129a
Refactor #10132 QM - Update jQuery ColorBox plugin
yama Aug 27, 2013
d87220b
Fix - TinyMCE text direction
yama Aug 27, 2013
c0e1bec
Fix - TinyMCE onchange_callback
yama Aug 27, 2013
29fe23d
KCFinder - Use other RTE except tinymce (etc..ckeditor)
yama Aug 27, 2013
a08b82c
Merge pull request #91 from yama/master-dmi3yy
Dmi3yy Aug 27, 2013
16dd42b
add some libs
Dmi3yy Aug 27, 2013
5aa021d
fix mm and new query
Dmi3yy Aug 27, 2013
a3d5df8
Feature #10137 Add new event OnLoadDocumentObject
yama Aug 28, 2013
a427245
Refactor #10139 Show templateWarning message when only documentDirty
yama Aug 28, 2013
3b61605
Merge pull request #93 from yama/temp
Dmi3yy Aug 29, 2013
b0d2bc1
Removing duplicate values
akool Aug 29, 2013
7f5538c
Merge pull request #94 from akool/patch-1
Dmi3yy Aug 29, 2013
17bea99
fix russian lang
Dmi3yy Aug 29, 2013
9fc4dd5
fix russian lang
Dmi3yy Aug 29, 2013
c0a709c
fix russian lang
Dmi3yy Aug 29, 2013
d10c60a
one more fix in russian lang
Dmi3yy Aug 29, 2013
18f8e88
small fix in nodes
Dmi3yy Aug 29, 2013
7a4ee63
add OnManagerNodePrerender and OnManagerNodeRender events
Dmi3yy Aug 29, 2013
a71d530
refactor nodes
Dmi3yy Aug 29, 2013
af59240
fix node
Dmi3yy Aug 29, 2013
6393ebe
fix tree function
Dmi3yy Aug 29, 2013
b027743
fix node
Dmi3yy Aug 29, 2013
6975b10
Bug #10142 database name with "-"
yama Aug 30, 2013
44671b1
Refactor #10148 Message check time interval in manager is very short
yama Aug 30, 2013
0c6a854
Fix - Execute module logging
yama Aug 30, 2013
ca5a914
Refactor #10149 Use placeholder filemanager_path and rb_base_dir in s…
yama Aug 30, 2013
174d854
Delete debug string
yama Aug 30, 2013
77e2936
Merge pull request #95 from yama/master
Dmi3yy Aug 30, 2013
2fe62a9
Update language files
yama Aug 30, 2013
77d14a5
Merge pull request #96 from yama/master
Dmi3yy Aug 30, 2013
eafaea0
Update italian.inc.php thanks banzai
yama Aug 30, 2013
c3f9fff
Merge pull request #97 from yama/master
Dmi3yy Aug 30, 2013
ae62a3a
fix margin in tree style
Dmi3yy Aug 30, 2013
7e6b9e2
Fix @6fcd467
yama Aug 31, 2013
292faee
Fix
yama Sep 1, 2013
f96bc3a
Fix - Use placeholder when install
yama Sep 1, 2013
52c623e
Update German language
yama Sep 1, 2013
cc2b3a6
Update italian language
yama Sep 1, 2013
b3379eb
Fix
yama Sep 1, 2013
7b483a9
Fix - MODxRE style
yama Sep 2, 2013
5b75df4
Fix - document_data.static.php icon
yama Sep 2, 2013
90bade4
Fix html
yama Sep 2, 2013
5a84e3a
1.0.11RC2
yama Sep 2, 2013
48196d4
Fix - Install language
yama Sep 2, 2013
309f1bf
Fix - MODxRE/style.css
yama Sep 2, 2013
41aaf7b
Fix - Install language
yama Sep 2, 2013
3dd5464
Add install/nederlands-utf8.inc.php
yama Sep 2, 2013
af83cab
Replace [[ListIndexer]] to [[Ditto]]
yama Sep 2, 2013
c9e18f2
Fix modxcms.com -> modx.com
yama Sep 2, 2013
e599f49
Fix Ditto DebugConsole
yama Sep 2, 2013
0b66995
Fix - Sample contents
yama Sep 2, 2013
d925124
Bug #10153 Can not update block user status when login
yama Sep 2, 2013
97b5926
Fix - Generate base_url in config.inc.php
yama Sep 2, 2013
26b9916
Refactor #10156 Improvement $modx->getDocuments() parameter value
yama Sep 2, 2013
61cae46
Fix - TinyMCE template button in toolbar
yama Sep 2, 2013
4ffcb6f
Merge pull request #98 from yama/master
Dmi3yy Sep 2, 2013
727186b
fix css warning
Dmi3yy Sep 2, 2013
be123c7
fix category for phpthumb
Dmi3yy Sep 2, 2013
20b6cc1
fix % in KCFinder translate
Dmi3yy Sep 2, 2013
65373d6
Small fix - MODxRE/style.css
yama Sep 2, 2013
9ad3afe
Fix - Elements edit screen tab fields
yama Sep 2, 2013
8e38eae
Merge branch 'master' of https://github.com/dmi3yy/evolution
yama Sep 2, 2013
d542770
Merge pull request #100 from yama/master
Dmi3yy Sep 2, 2013
b04cdc0
Fix - Elements edit screen tab fields (remain)
yama Sep 2, 2013
b07f40c
Fix - tinymce/functions.php
yama Sep 2, 2013
7f710f9
Merge pull request #101 from yama/master
Dmi3yy Sep 2, 2013
57da0cf
fix translit in kcfinder
Dmi3yy Sep 2, 2013
0db0425
Feature #10160 email notifies of system error
yama Sep 2, 2013
796c1b8
Fix
yama Sep 2, 2013
1e4b500
Merge pull request #102 from yama/master
Dmi3yy Sep 2, 2013
c471867
Fix - TinyMCE documentDirty check
yama Sep 3, 2013
af0c5a4
Fix - Login box width issue
yama Sep 3, 2013
8fb77e5
Merge pull request #103 from yama/master
Dmi3yy Sep 3, 2013
bed05b1
Refactor #10161 Remember last tab in access permissions pane
yama Sep 3, 2013
bb646d3
Merge pull request #104 from yama/master
Dmi3yy Sep 3, 2013
6e8e9a5
Bug #10162 Improved multi line @EVAL statement
yama Sep 3, 2013
a05853f
Merge pull request #105 from yama/master
Dmi3yy Sep 3, 2013
e6e12bd
fix pvalue in placeholder
Dmi3yy Sep 3, 2013
926d6d5
Update document.parser.class.inc.php
Dmi3yy Sep 3, 2013
a870191
Merge branch 'master' of https://github.com/dmi3yy/evolution
Dmi3yy Sep 3, 2013
108537b
roll back fix calendaer for opera
Dmi3yy Sep 4, 2013
97a4c52
fix data picker and opera
Dmi3yy Sep 4, 2013
5c0de42
Bug #10171 Ditto - TV name issue
yama Sep 4, 2013
35ef716
Fix - ditto/extenders/dateFilter.extender.inc.php
yama Sep 4, 2013
9c9ef00
Add unnamed action names
yama Sep 4, 2013
e5a98dc
Fix undefined variable
yama Sep 4, 2013
dd6c839
Fix undefined variable
yama Sep 4, 2013
a69d238
Fix - Front-end paging issue
yama Sep 4, 2013
1265eea
MODx -> MODX
yama Sep 4, 2013
2e0ab4f
Fix - Output json http header
yama Sep 4, 2013
ff8abe4
Merge pull request #106 from yama/master
Dmi3yy Sep 4, 2013
5754574
Update italian_country.inc.php thanks luigif
yama Sep 4, 2013
07de203
Merge pull request #107 from yama/master
Dmi3yy Sep 4, 2013
09f0930
Bug #10176 Ditto rss format - Missing link element
yama Sep 5, 2013
0a92dcd
Fix - modxmailer.class.inc.php
yama Sep 5, 2013
73f98d0
Bug #10177 Added - Ditto language entry
yama Sep 5, 2013
17c87ef
Update - Ditto japanese-utf8.inc.php
yama Sep 5, 2013
51b0332
Fix - send smtp function
yama Sep 5, 2013
e3a236c
Delete unnecessary css entry
yama Sep 5, 2013
d3346b3
Refactor #10178 Set permission to config.inc.php when install
yama Sep 5, 2013
21fb457
fix Ditto for php5.4
yama Sep 5, 2013
9953821
Merge pull request #108 from yama/master
Dmi3yy Sep 5, 2013
b82cfd1
Fix
yama Sep 5, 2013
2ab2919
Refactor #10180 ForgotManagerPassword - Improvement reset url
yama Sep 5, 2013
86ccffd
Bug #10181 FMP - Can not login when CAPTCHA mode
yama Sep 5, 2013
378f5e8
Small fix
yama Sep 5, 2013
c9ce3f6
Merge pull request #109 from yama/master
Dmi3yy Sep 5, 2013
f402cef
Important fix
yama Sep 5, 2013
a47cb85
Fix json IE issue
yama Sep 5, 2013
f984bd7
Ditto rss feed unnecessary line break
yama Sep 5, 2013
75fe144
Merge pull request #110 from yama/master
Dmi3yy Sep 5, 2013
36acdbb
eform-delete unused params
Dmi3yy Sep 5, 2013
9662e04
fix changelog.txt
Dmi3yy Sep 5, 2013
1c426f7
fix changelog
Dmi3yy Sep 5, 2013
ad1a8f4
fix version
Dmi3yy Sep 5, 2013
95ea69e
Delete unnecessary splitter
yama Sep 5, 2013
3dfbda2
Fix - save_settings.processor.php
yama Sep 5, 2013
84b4381
Obfuscation for smtp password save value
yama Sep 5, 2013
bc22ddc
Fix - KCFinder from docmanager/tv.ajax.php
yama Sep 5, 2013
d339c79
Fix - Can not boot TinyMCE
yama Sep 5, 2013
19cad3c
Fix - filebrowser call
yama Sep 5, 2013
14b3c8d
Small fix
yama Sep 6, 2013
8d83c66
Fix - MODxRE theme
yama Sep 6, 2013
4b6c72c
Merge pull request #111 from yama/master
Dmi3yy Sep 6, 2013
4cc0703
static file path in plugin
Dmi3yy Sep 6, 2013
566c9b8
Fix - Indent of resource tree
yama Sep 6, 2013
4f6af2a
Merge pull request #112 from yama/master
Dmi3yy Sep 6, 2013
c57e8e7
Fix update columns
yama Sep 7, 2013
7d58d13
Merge pull request #113 from yama/master
Dmi3yy Sep 7, 2013
617e747
Fix font issue
yama Sep 7, 2013
48d3cbf
add alias visible functionality
Dmi3yy Sep 7, 2013
e590fb8
small fix
Dmi3yy Sep 7, 2013
6b477df
Merge pull request #114 from yama/master
Dmi3yy Sep 7, 2013
13f52f4
fix for seo
Dmi3yy Sep 7, 2013
8b44bbe
i18n - FileSource plugin
yama Sep 7, 2013
fff0ce0
Small fix - html
yama Sep 7, 2013
2b9c4bb
FileSource Plugin - Code refactoring
yama Sep 8, 2013
1adb709
FileSource plugin - Replace line ending char
yama Sep 8, 2013
61e82e2
FileSource plugin - Replace line ending char
yama Sep 8, 2013
1c8dee1
FileSource plugin - Fix directory traversal
yama Sep 8, 2013
6b0c0e0
Merge pull request #116 from yama/temp
Dmi3yy Sep 8, 2013
598c31f
Fix - Auto modify .htaccess
yama Sep 9, 2013
8073870
Merge pull request #117 from yama/temp
Dmi3yy Sep 9, 2013
e23b094
Fix - Set default template
yama Sep 9, 2013
50c0bff
Merge pull request #118 from yama/temp
Dmi3yy Sep 9, 2013
0b41958
"alias_visible" field move to under "isfolder"
yama Sep 9, 2013
b33cbac
fix version
Dmi3yy Sep 9, 2013
ec26919
Merge pull request #119 from yama/temp
Dmi3yy Sep 9, 2013
dfe529b
fix changelog
Dmi3yy Sep 9, 2013
24a722b
rollback
Dmi3yy Sep 9, 2013
68f44eb
Fix - MODxRe theme
yama Sep 9, 2013
657440a
Merge pull request #120 from yama/temp
Dmi3yy Sep 9, 2013
fc8b6dc
Fix - IE10 Helvetica font problem
yama Sep 9, 2013
fc88a42
Style fix for IE 10
yama Sep 9, 2013
c7fd3f4
Merge pull request #121 from yama/temp
Dmi3yy Sep 9, 2013
143b51b
Fix
yama Sep 9, 2013
00390a3
Merge pull request #122 from yama/temp
Dmi3yy Sep 9, 2013
83ea886
Small fix
yama Sep 9, 2013
c7c97be
Use MODX tags in form and report chunk
yama Sep 9, 2013
432204a
Fix
yama Sep 9, 2013
86da89a
Merge pull request #123 from yama/temp
Dmi3yy Sep 9, 2013
12da071
fix date version
Dmi3yy Sep 10, 2013
5711c31
Fix - KCFinder Local File Disclosure
yama Sep 10, 2013
36ad309
Fix - eForm
yama Sep 10, 2013
d893325
Merge pull request #124 from yama/temp
Dmi3yy Sep 10, 2013
756c64e
Update Dutch language files
yama Sep 10, 2013
4ea59ca
Fix - portuguese-br language files
yama Sep 10, 2013
4570446
Update year in credit line and fix url
yama Sep 11, 2013
1f0b03f
Fix forum url
yama Sep 11, 2013
f84e72e
MODx -> MODX
yama Sep 11, 2013
78c4e9c
Fix url (modx.com)
yama Sep 11, 2013
9ca2070
Merge pull request #125 from yama/temp
Dmi3yy Sep 11, 2013
14125f9
small fix
Dmi3yy Sep 11, 2013
8e769c6
Fix - Problem of seo-strict function at the sub directory instance
yama Sep 11, 2013
71edebe
Fix font problem at the new install
yama Sep 11, 2013
d457979
Merge pull request #126 from yama/temp
Dmi3yy Sep 11, 2013
534fc95
fix in settings
Dmi3yy Sep 11, 2013
fa6a848
fix date version
Dmi3yy Sep 11, 2013
478fe98
MODX Evolution 1.0.11
opengeek Sep 11, 2013
83ee6cf
Fix typo spanish-utf8.inc.php
yama Sep 11, 2013
8cf50cc
Update language install/nederlands-utf8.inc.php
yama Sep 11, 2013
2bd83ed
Merge pull request #131 from yama/temp
jaygilmore Sep 11, 2013
9baa521
Fix typo
yama Sep 11, 2013
26efb7c
Merge pull request #127 from modxcms/master
Dmi3yy Sep 11, 2013
7251fb1
Fix russian-UTF8.inc.php
yama Sep 12, 2013
014dbd0
fix version
Dmi3yy Sep 12, 2013
74e25aa
fix changelog
Dmi3yy Sep 12, 2013
6ebd430
fix russian lang
Dmi3yy Sep 12, 2013
057c5a7
Merge remote-tracking branch 'origin/pr/132' into release-1.0.12
opengeek Sep 12, 2013
a76c9cc
Merge remote-tracking branch 'origin/pr/133' into release-1.0.12
opengeek Sep 12, 2013
04e262a
MODX Evolution 1.0.12
opengeek Sep 12, 2013
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
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ignore any files beginning with .
\.*
#\.*

# and any files in the cache directory
/assets/cache/*
Expand Down
2 changes: 2 additions & 0 deletions assets/.thumbs/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<h2>Un authorized access</h2>
You're not allowed to access file folder
2 changes: 2 additions & 0 deletions assets/backup/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<h2>Un authorized access</h2>
You're not allowed to access file folder
2 changes: 0 additions & 2 deletions assets/cache/.gitignore

This file was deleted.

2 changes: 2 additions & 0 deletions assets/cache/images/.htaccess
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
order deny,allow
allow from all
2 changes: 2 additions & 0 deletions assets/cache/images/ht.access
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
order deny,allow
allow from all
2 changes: 2 additions & 0 deletions assets/cache/images/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<h2>Unauthorized access</h2>
You're not allowed to access file folder
2 changes: 2 additions & 0 deletions assets/cache/siteManager.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?php
define("MGR_DIR", "manager");
2 changes: 1 addition & 1 deletion assets/docs/index.html
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<h2>Unauthorized access</h2>
<h2>Unauthorized access</h2>
You're not allowed to access file folder
560 changes: 280 additions & 280 deletions assets/docs/license.txt

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/export/index.html
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<h2>Unauthorized access</h2>
<h2>Unauthorized access</h2>
You're not allowed to access file folder
2 changes: 1 addition & 1 deletion assets/flash/index.html
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<h2>Unauthorized access</h2>
<h2>Unauthorized access</h2>
You're not allowed to access file folder
2 changes: 1 addition & 1 deletion assets/images/index.html
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<h2>Unauthorized access</h2>
<h2>Unauthorized access</h2>
You're not allowed to access file folder
19 changes: 0 additions & 19 deletions assets/js/README.txt

This file was deleted.

14 changes: 0 additions & 14 deletions assets/js/csshover3.htc

This file was deleted.

95 changes: 0 additions & 95 deletions assets/js/frankensleight.js

This file was deleted.

2 changes: 1 addition & 1 deletion assets/js/index.html
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<h2>Unauthorized access</h2>
<h2>Unauthorized access</h2>
You're not allowed to access file folder
Loading