GitHub Sale: sign up for any paid plan this week and pay nothing until January 1, 2009!  [ hide ]

tedkulp / cmsmadesimple-2-0 fork watch download tarball
public
Description: Git mirror of the CMS Made Simple 2.0 rewrite
Homepage: http://cmsmadesimple.org
Clone URL: git://github.com/tedkulp/cmsmadesimple-2-0.git 
Fixed merge
tedkulp (author)
Sun Sep 09 01:09:55 -0700 2007
commit  4978453c6368fd40690312e742cc2d7c095cec3a
tree    fbf2395a0e194d61b692bdc9467e422e717629fb
parent  a11ef674ead2618eb15652709b18c9aa06e5c4f0
cmsmadesimple-2-0 / results.txt
100644 157 lines (156 sloc) 11.01 kb
raw blame history 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157

Renamed lib/classes/class.groupoperations.inc.php => lib/classes/class.cms_group_operations.php
Auto-merged lib/classes/class.cms_group_operations.php
CONFLICT (rename/modify): Merge conflict in lib/classes/class.cms_group_operations.php  --  FIXED
Renamed lib/classes/class.module.inc.php => lib/classes/module/class.cms_module.php
Auto-merged lib/classes/module/class.cms_module.php
CONFLICT (rename/modify): Merge conflict in lib/classes/module/class.cms_module.php  --  FIXED
Renamed lib/classes/class.moduleloader.inc.php => lib/classes/module/class.cms_module_loader.php
Auto-merged lib/classes/module/class.cms_module_loader.php
Renamed lib/classes/module_support/modform.inc.php => lib/classes/module/module_support/modform.inc.php
Auto-merged lib/classes/module/module_support/modform.inc.php
CONFLICT (rename/modify): Merge conflict in lib/classes/module/module_support/modform.inc.php  --  FIXED
Renamed lib/classes/module_support/modredirect.inc.php => lib/classes/module/module_support/modredirect.inc.php
Auto-merged lib/classes/module/module_support/modredirect.inc.php
CONFLICT (rename/modify): Merge conflict in lib/classes/module/module_support/modredirect.inc.php  --  FIXED
Renamed lib/classes/module_support/modtemplates.inc.php => lib/classes/module/module_support/modtemplates.inc.php
Auto-merged lib/classes/module/module_support/modtemplates.inc.php
CONFLICT (rename/modify): Merge conflict in lib/classes/module/module_support/modtemplates.inc.php  --  FIXED
Renamed lib/config.functions.php => lib/classes/class.cms_config.php
Auto-merged lib/classes/class.cms_config.php
CONFLICT (rename/modify): Merge conflict in lib/classes/class.cms_config.php  --  FIXED
Auto-merged admin/addcontent.php
CONFLICT (content): Merge conflict in admin/addcontent.php  --  FIXED
Auto-merged admin/addcss.php
Auto-merged admin/addcssassoc.php
Auto-merged admin/addhtmlblob.php
CONFLICT (content): Merge conflict in admin/addhtmlblob.php  --  FIXED
Auto-merged admin/addtemplate.php
CONFLICT (content): Merge conflict in admin/addtemplate.php  --  FIXED
Auto-merged admin/addtemplateassoc.php
Auto-merged admin/adduser.php
Auto-merged admin/adduserplugin.php
Auto-merged admin/adminlog.php
Auto-merged admin/changegroupassign.php
CONFLICT (content): Merge conflict in admin/changegroupassign.php  --  FIXED
Auto-merged admin/deletecss.php
Auto-merged admin/deletehtmlblob.php
Auto-merged admin/deleteuserplugin.php
CONFLICT (content): Merge conflict in admin/deleteuserplugin.php  --  FIXED
Auto-merged admin/editbookmark.php
Auto-merged admin/editcontent.php
CONFLICT (content): Merge conflict in admin/editcontent.php  --  FIXED
Auto-merged admin/editcss.php
Auto-merged admin/editgroup.php
Auto-merged admin/edithtmlblob.php
CONFLICT (content): Merge conflict in admin/edithtmlblob.php  --  FIXED
Auto-merged admin/editprefs.php
Auto-merged admin/edittemplate.php
CONFLICT (content): Merge conflict in admin/edittemplate.php  --  FIXED
Auto-merged admin/edituser.php
Auto-merged admin/edituserplugin.php
CONFLICT (content): Merge conflict in admin/edituserplugin.php  --  FIXED
Auto-merged admin/eventhandlers.php
Auto-merged admin/footer.php
CONFLICT (content): Merge conflict in admin/footer.php  --  FIXED
Auto-merged admin/index.php
Auto-merged admin/lang/en_US/admin.inc.php
CONFLICT (content): Merge conflict in admin/lang/en_US/admin.inc.php  --  FIXED
Auto-merged admin/listbookmarks.php
CONFLICT (content): Merge conflict in admin/listbookmarks.php  --  FIXED
Auto-merged admin/listcontent.php
CONFLICT (content): Merge conflict in admin/listcontent.php  --  FIXED
Auto-merged admin/listcss.php
CONFLICT (content): Merge conflict in admin/listcss.php  --  FIXED
Auto-merged admin/listcssassoc.php
Auto-merged admin/listgroups.php
CONFLICT (content): Merge conflict in admin/listgroups.php  --  FIXED
Auto-merged admin/listhtmlblobs.php
CONFLICT (content): Merge conflict in admin/listhtmlblobs.php  --  FIXED
Auto-merged admin/listmodules.php
CONFLICT (content): Merge conflict in admin/listmodules.php  --  FIXED
Auto-merged admin/listtags.php
CONFLICT (content): Merge conflict in admin/listtags.php  --  FIXED
Auto-merged admin/listtemplates.php
Auto-merged admin/listusers.php
CONFLICT (content): Merge conflict in admin/listusers.php  --  FIXED
Auto-merged admin/listusertags.php
Auto-merged admin/login.php
CONFLICT (content): Merge conflict in admin/login.php  --  FIXED
Auto-merged admin/moduleinterface.php
Auto-merged admin/siteprefs.php
CONFLICT (content): Merge conflict in admin/siteprefs.php  --  FIXED
Auto-merged admin/style.php
Auto-merged admin/templatecss.php
CONFLICT (delete/modify): admin/themes/default/defaultTheme.php deleted in 2.0 and modified in HEAD. Version HEAD of admin/themes/default/defaultTheme.php left in tree.  --  DELETED
Auto-merged include.php
CONFLICT (content): Merge conflict in include.php  --  FIXED
Auto-merged index.php
CONFLICT (content): Merge conflict in index.php  --  FIXED
Auto-merged install/index.php
CONFLICT (add/add): Merge conflict in install/index.php  --  FIXED
CONFLICT (delete/modify): install/install.php deleted in HEAD and modified in 2.0. Version 2.0 of install/install.php left in tree.  --  DELETED
Auto-merged install/schemas/extra.sql
CONFLICT (content): Merge conflict in install/schemas/extra.sql  --  FIXED
Auto-merged install/upgrade.php
CONFLICT (content): Merge conflict in install/upgrade.php  --  FIXED
Auto-merged install/upgrades/upgrade.25.to.26.php
CONFLICT (add/add): Merge conflict in install/upgrades/upgrade.25.to.26.php  --  FIXED (took the 2.0 one)
Auto-merged install/upgrades/upgrade.26.to.27.php
CONFLICT (add/add): Merge conflict in install/upgrades/upgrade.26.to.27.php  --  FIXED (took the 2.0 one)
Removed lib/Tree/Tree.php
Auto-merged lib/adodb_lite/adodb-datadict.inc.php
Auto-merged lib/adodb_lite/adodbSQL_drivers/mysql/mysql_datadict.inc
CONFLICT (content): Merge conflict in lib/adodb_lite/adodbSQL_drivers/mysql/mysql_datadict.inc  --  FIXED
Auto-merged lib/adodb_lite/adodbSQL_drivers/mysql/mysql_driver.inc
CONFLICT (content): Merge conflict in lib/adodb_lite/adodbSQL_drivers/mysql/mysql_driver.inc  --  FIXED
Auto-merged lib/classes/class.admintheme.inc.php
CONFLICT (content): Merge conflict in lib/classes/class.admintheme.inc.php  --  FIXED
Removed lib/classes/class.bookmark.inc.php
Removed lib/classes/class.bookmarkoperations.inc.php
CONFLICT (delete/modify): lib/classes/class.content.inc.php deleted in 2.0 and modified in HEAD. Version HEAD of lib/classes/class.content.inc.php left in tree.  --  DELETED
CONFLICT (delete/modify): lib/classes/class.contentoperations.inc.php deleted in 2.0 and modified in HEAD. Version HEAD of lib/classes/class.contentoperations.inc.php left in tree.  --  DELETED
CONFLICT (delete/modify): lib/classes/class.events.inc.php deleted in 2.0 and modified in HEAD. Version HEAD of lib/classes/class.events.inc.php left in tree.  --  DELETED
CONFLICT (delete/modify): lib/classes/class.global.inc.php deleted in 2.0 and modified in HEAD. Version HEAD of lib/classes/class.global.inc.php left in tree.  --  DELETED
CONFLICT (delete/modify): lib/classes/class.globalcontentoperations.inc.php deleted in 2.0 and modified in HEAD. Version HEAD of lib/classes/class.globalcontentoperations.inc.php left in tree.  --  DELETED
Removed lib/classes/class.group.inc.php
CONFLICT (delete/modify): lib/classes/class.moduleoperations.inc.php deleted in 2.0 and modified in HEAD. Version HEAD of lib/classes/class.moduleoperations.inc.php left in tree.  --  DELETED
CONFLICT (delete/modify): lib/classes/class.pageinfo.inc.php deleted in 2.0 and modified in HEAD. Version HEAD of lib/classes/class.pageinfo.inc.php left in tree.  --  DELETED
Removed lib/classes/class.recentpage.inc.php
CONFLICT (delete/modify): lib/classes/class.stylesheet.inc.php deleted in 2.0 and modified in HEAD. Version HEAD of lib/classes/class.stylesheet.inc.php left in tree.  --  DELETED
CONFLICT (delete/modify): lib/classes/class.stylesheetoperations.inc.php deleted in 2.0 and modified in HEAD. Version HEAD of lib/classes/class.stylesheetoperations.inc.php left in tree.  --  DELETED
CONFLICT (delete/modify): lib/classes/class.template.inc.php deleted in 2.0 and modified in HEAD. Version HEAD of lib/classes/class.template.inc.php left in tree.  --  DELETED
CONFLICT (delete/modify): lib/classes/class.templateoperations.inc.php deleted in 2.0 and modified in HEAD. Version HEAD of lib/classes/class.templateoperations.inc.php left in tree.  --  DELETED
CONFLICT (delete/modify): lib/classes/class.user.inc.php deleted in 2.0 and modified in HEAD. Version HEAD of lib/classes/class.user.inc.php left in tree.  --  DELETED
CONFLICT (delete/modify): lib/classes/class.useroperations.inc.php deleted in 2.0 and modified in HEAD. Version HEAD of lib/classes/class.useroperations.inc.php left in tree.  --  DELETED
Auto-merged lib/classes/contenttypes/Content.inc.php
CONFLICT (content): Merge conflict in lib/classes/contenttypes/Content.inc.php  --  FIXED
Auto-merged lib/classes/contenttypes/Link.inc.php
CONFLICT (content): Merge conflict in lib/classes/contenttypes/Link.inc.php  --  FIXED
Removed lib/classes/module_support/modlang.inc.php
CONFLICT (delete/modify): lib/content.functions.php deleted in 2.0 and modified in HEAD. Version HEAD of lib/content.functions.php left in tree.  --  DELETED
Auto-merged lib/filemanager/ImageManager/Classes/Thumbnail.php
Auto-merged lib/filemanager/ImageManager/Classes/Transform.php
Auto-merged lib/misc.functions.php
CONFLICT (content): Merge conflict in lib/misc.functions.php  --  FIXED (Took the 2.0 one, will have to backport methods...  but would rather find more API-like places to put these anyway)
CONFLICT (delete/modify): lib/module.functions.php deleted in 2.0 and modified in HEAD. Version HEAD of lib/module.functions.php left in tree.  --  DELETED
Auto-merged lib/page.functions.php
CONFLICT (content): Merge conflict in lib/page.functions.php  --  FIXED
Auto-merged lib/translation.functions.php
Auto-merged plugins/function.cms_module.php
CONFLICT (content): Merge conflict in plugins/function.cms_module.php  --  FIXED
Auto-merged plugins/function.cms_selflink.php
CONFLICT (content): Merge conflict in plugins/function.cms_selflink.php  --  FIXED
Auto-merged plugins/function.contact_form.php
CONFLICT (content): Merge conflict in plugins/function.contact_form.php  --  FIXED
Auto-merged plugins/function.content.php
Auto-merged plugins/function.metadata.php
CONFLICT (content): Merge conflict in plugins/function.metadata.php  --  FIXED
Auto-merged plugins/function.news.php
CONFLICT (content): Merge conflict in plugins/function.news.php  --  FIXED
CONFLICT (delete/modify): preview.php deleted in 2.0 and modified in HEAD. Version HEAD of preview.php left in tree.  --  DELETED
Auto-merged release-cleanup.sh
Removed stylesheet.css
Auto-merged stylesheet.php
CONFLICT (content): Merge conflict in stylesheet.php  --  FIXED
Auto-merged version.php
CONFLICT (content): Merge conflict in version.php  --  FIXED