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
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211 | diff -ruN trunk/developer_portal/management/commands/initdb.py developer-ubuntu-com/developer_portal/management/commands/initdb.py
--- trunk/developer_portal/management/commands/initdb.py 2016-01-18 10:23:37.132091437 -0800
+++ developer-ubuntu-com/developer_portal/management/commands/initdb.py 2016-01-18 10:24:04.556068048 -0800
@@ -47,17 +47,11 @@
adminperms.sites.add(settings.SITE_ID)
if hasattr(settings, 'EDITOR_GROUP') and settings.EDITOR_GROUP != "":
-<<<<<<< TREE
- print "Configuring "+settings.EDITOR_GROUP+" group."
- editors, created = PageUserGroup.objects.get_or_create(name=settings.EDITOR_GROUP, defaults={'created_by': admin})
- page_perms = Permission.objects.filter(content_type__app_label='cms', content_type__name='page')
-=======
print("Configuring {} group.".format(settings.EDITOR_GROUP))
editors, created = PageUserGroup.objects.get_or_create(
name=settings.EDITOR_GROUP, defaults={'created_by': admin})
page_perms = Permission.objects.filter(
content_type__app_label='cms', content_type__model='page')
->>>>>>> MERGE-SOURCE
editors.permissions.add(*list(page_perms))
print("Configuring global permissions for group.")
diff -ruN trunk/developer_portal/settings.py developer-ubuntu-com/developer_portal/settings.py
--- trunk/developer_portal/settings.py 2016-01-18 10:23:37.140091429 -0800
+++ developer-ubuntu-com/developer_portal/settings.py 2016-01-18 10:28:19.192271372 -0800
@@ -290,11 +290,8 @@
'toolbar': 'Zinnia',
},
}
-<<<<<<< TREE
# Allow iframes in ckeditor
-=======
->>>>>>> MERGE-SOURCE
TEXT_ADDITIONAL_TAGS = ('iframe',)
TEXT_ADDITIONAL_ATTRIBUTES = ('scrolling', 'allowfullscreen', 'frameborder')
@@ -321,8 +318,6 @@
#'PAGINATE_BY': 10,
}
-<<<<<<< TREE
-=======
MIGRATION_MODULES = {
'cms': 'cms.migrations',
'cmsplugin_zinnia': 'cmsplugin_zinnia.migrations',
@@ -340,7 +335,6 @@
'zinnia': 'zinnia.migrations',
}
->>>>>>> MERGE-SOURCE
LOGGING = {
'version': 1,
'disable_existing_loggers': False,
diff -ruN trunk/Makefile developer-ubuntu-com/Makefile
--- trunk/Makefile 2016-01-18 10:23:37.144091424 -0800
+++ developer-ubuntu-com/Makefile 2016-01-18 10:27:57.060228295 -0800
@@ -14,13 +14,8 @@
swift-perms:
@echo "Setting up Swift bucket permissions"
-<<<<<<< TREE
@if [ "${SWIFT_CONTAINER_NAME}" = "" ]; then echo "Using default upload container"; http_proxy="${swift_proxy}" https_proxy="${swift_proxy}" swift post --read-acl '.r:*' devportal_uploaded; else http_proxy="${swift_proxy}" https_proxy="${swift_proxy}" swift post --read-acl '.r:*' $(SWIFT_CONTAINER_NAME); fi
@if [ "${SWIFT_STATICCONTAINER_NAME}" = "" ]; then echo "Using default static container"; http_proxy="${swift_proxy}" https_proxy="${swift_proxy}" swift post --read-acl '.r:*' devportal_static; else http_proxy="${swift_proxy}" https_proxy="${swift_proxy}" swift post --read-acl '.r:*' $(SWIFT_STATICCONTAINER_NAME); fi
-=======
- @if [ "${SWIFT_CONTAINER_NAME}" = "" ]; then echo "Using default upload container"; swift post --read-acl '.r:*' devportal_uploaded; else swift post --read-acl '.r:*' $(SWIFT_CONTAINER_NAME); fi
- @if [ "${SWIFT_STATICCONTAINER_NAME}" = "" ]; then echo "Using default static container"; swift post --read-acl '.r:*' devportal_static; else swift post --read-acl '.r:*' $(SWIFT_STATICCONTAINER_NAME); fi
->>>>>>> MERGE-SOURCE
update-apidocs:
@if [ $(DATABASE_URL) ]; then DJANGO_SETTINGS_MODULE=charm_settings ./update_apidocs.sh > ${PWD}/../../logs/update_apidocs.log 2>${PWD}/../../logs/update_apidocs_errors.log; fi
@@ -56,20 +51,12 @@
collectstatic: collectstatic.done
collectstatic.done:
@echo "Collecting static files"
-<<<<<<< TREE
@http_proxy="${swift_proxy}" https_proxy="${swift_proxy}" python manage.py collectstatic -v 0 --noinput --settings charm_settings 2>/dev/null
-=======
- @python manage.py collectstatic -v 0 --noinput --settings charm_settings 2>/dev/null
->>>>>>> MERGE-SOURCE
@touch collectstatic.done
collectstatic.debug:
@echo "Debugging output from collectstatic"
-<<<<<<< TREE
@http_proxy="${swift_proxy}" https_proxy="${swift_proxy}" python manage.py collectstatic -v 1 --noinput --settings charm_settings
-=======
- @python manage.py collectstatic -v 1 --noinput --settings charm_settings
->>>>>>> MERGE-SOURCE
update-pip-cache:
@echo "Updating pip-cache"
diff -ruN trunk/pip-cache-revno.txt developer-ubuntu-com/pip-cache-revno.txt
--- trunk/pip-cache-revno.txt 2016-01-18 10:23:37.144091424 -0800
+++ developer-ubuntu-com/pip-cache-revno.txt 2016-01-18 10:24:36.800053475 -0800
@@ -1,5 +1 @@
-<<<<<<< TREE
-14
-=======
20
->>>>>>> MERGE-SOURCE
diff -ruN trunk/requirements.txt developer-ubuntu-com/requirements.txt
--- trunk/requirements.txt 2016-01-18 10:23:37.144091424 -0800
+++ developer-ubuntu-com/requirements.txt 2016-01-18 10:25:06.780051747 -0800
@@ -1,15 +1,3 @@
-<<<<<<< TREE
-oslo.config==1.6.0
-oslo.i18n==1.2.0
-oslo.serialization==1.2.0
-oslo.utils==1.2.0
-Django==1.6.8
-Markdown==2.6.2
-South==1.0.1
-Pillow==2.6.1
-beautifulsoup4==4.4.0
-cmsplugin-zinnia==0.6
-=======
Django==1.8.8
django-template-debug==0.3.5
oslo.config==3.1.0
@@ -20,26 +8,12 @@
cmsplugin-zinnia==0.8
Markdown==2.6.5
beautifulsoup4==4.4.1
->>>>>>> MERGE-SOURCE
dj-database-url==0.3.0
-django-admin-enhancer==0.1.3.1
-django-appconf==0.6
-django-blog-zinnia==0.14.2
-django-ckeditor==4.4.7
+django-admin-enhancer==1.0.0
+django-appconf==1.0.1
+django-blog-zinnia==0.15.2
+django-ckeditor==5.0.2
django-ckeditor-updated==4.4.4
-<<<<<<< TREE
-django-classy-tags==0.5.1
-django-cms==3.0.6
-django-contrib-comments==1.5
-django-meta==0.2.0
-django-meta-mixin==0.1.1
-django-missing==0.1.13
-django-mptt==0.7.4
-django-parler==1.1.1
-django-polymorphic==0.6
-django-reversion==1.8.4
-django-sekizai==0.7
-=======
django-classy-tags==0.7.0
django-cms==3.2.0
django-contrib-comments==1.6.2
@@ -50,57 +24,29 @@
django-polymorphic==0.8.1
django-reversion==1.9.3
django-sekizai==0.9.0
->>>>>>> MERGE-SOURCE
django-swiftstorage==1.1.0
-<<<<<<< TREE
-django-tagging==0.3.3
-django-taggit==0.12.2
-django-taggit-autosuggest==0.2.5
-=======
django-tagging==0.4
django-taggit==0.17.6
django-taggit-autosuggest==0.2.8
->>>>>>> MERGE-SOURCE
django-taggit-templatetags==0.2.5
django-templatetag-sugar==1.0
django-xmlrpc==0.1.5
-<<<<<<< TREE
-djangocms-admin-style==0.2.2
-djangocms-link==1.5
-djangocms-picture==0.1
-djangocms-snippet==1.3
-djangocms-text-ckeditor==2.4.2
-=======
djangocms-admin-style==1.0.8
djangocms-link==1.7.1
djangocms-picture==0.2.0
djangocms-snippet==1.7.1
djangocms-text-ckeditor==2.8.1
->>>>>>> MERGE-SOURCE
djangocms-utils==0.9.5
-<<<<<<< TREE
-djangocms-video==0.1
-python-keystoneclient==0.11.2
-python-swiftclient==2.3.1
-pytz==2014.7
-=======
djangocms-video==0.2.0
python-keystoneclient==1.3.3
python-swiftclient==2.6.0
pytz==2015.7
->>>>>>> MERGE-SOURCE
simple-translation==0.8.6
-simplejson==3.6.5
+simplejson==3.8.1
wsgiref==0.1.2
-zinnia-wysiwyg-ckeditor==1.1
-Pygments==1.6
+zinnia-wysiwyg-ckeditor==1.3
+Pygments==2.0.2
django-pygments==0.1
-<<<<<<< TREE
-django-openid-auth==0.5
-python-openid==2.2.4
-djangorestframework==3.0.4
-=======
django-openid-auth==0.7
python-openid==2.2.5
djangorestframework==3.3.2
->>>>>>> MERGE-SOURCE
|