Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
786 commits
Select commit Hold shift + click to select a range
1b91411
Merge branch 'hotfix-1.1'
abhijitbonik Feb 27, 2018
5094de8
Merge branch 'hotfix-1.1' into develop
abhijitbonik Feb 27, 2018
0d1dbbf
Merge branch 'master' of https://github.com/fresearchgroup/Collaborat…
abhijitbonik Feb 27, 2018
b7b9960
Merge pull request #67 from fresearchgroup/develop
abhijitbonik Feb 28, 2018
1754ed3
Merge branch 'develop' into feature/contenttypes
abhijitbonik Feb 28, 2018
74d0859
Merge branch 'feature/UI' of https://github.com/fresearchgroup/Collab…
abhijitbonik Feb 28, 2018
3618956
models for user favourites
abhijitbonik Feb 28, 2018
c96f3c6
migrations and views favroites
abhijitbonik Feb 28, 2018
2dc6658
solr configuration added
abhijitbonik Feb 28, 2018
ae404cf
favourites for articles added
abhijitbonik Feb 28, 2018
6a234bd
favourites bug fixed
abhijitbonik Mar 1, 2018
2aa17fd
Added ansible script files
NithinSethumadhavan Mar 1, 2018
b53de6a
Merge pull request #69 from NithinSethumadhavan/feature/ansible
fresearchgroup Mar 1, 2018
01897f3
Added a single ansible script file for jenkins: single.yaml
NithinSethumadhavan Mar 5, 2018
14086ca
favourites articles display
abhijitbonik Mar 5, 2018
7db0f0b
Merge pull request #73 from NithinSethumadhavan/feature/ansible
fresearchgroup Mar 5, 2018
8aa2625
favourites changes
abhijitbonik Mar 6, 2018
5ab64d4
FAQs collapse changed
rushimanjrekar Mar 1, 2018
17ea427
communities dropdown changes
rushimanjrekar Mar 1, 2018
ccfaa84
evironment variable seperated using decouple
abhijitbonik Mar 7, 2018
4b80ad7
environmental variable added
abhijitbonik Mar 7, 2018
a1f8c47
env variables changed
abhijitbonik Mar 7, 2018
298c7c1
requirements updated
abhijitbonik Mar 7, 2018
588b6cb
Merge branch 'feature/UI' into feature/contenttypes
abhijitbonik Mar 7, 2018
c56c56c
Merge branch 'feature/contenttypes' into develop
abhijitbonik Mar 7, 2018
2f2f1ae
Merge branch 'develop'
abhijitbonik Mar 7, 2018
a07280e
Merge branch 'develop' of https://github.com/fresearchgroup/Collabora…
abhijitbonik Mar 7, 2018
41f49bc
Merge branch 'develop'
abhijitbonik Mar 7, 2018
eae5094
Merge branch 'master' into develop
abhijitbonik Mar 7, 2018
8fa5bf4
Explicit mention for python3.6
NithinSethumadhavan Mar 13, 2018
3b83994
Merge pull request #75 from NithinSethumadhavan/feature/ansible
firuza Mar 13, 2018
d22a8ef
course module added
abhijitbonik Mar 14, 2018
6b7ed0b
Merge branch 'develop' of https://github.com/fresearchgroup/Collabora…
abhijitbonik Mar 14, 2018
babbb8c
course module update with mptt topics
abhijitbonik Mar 14, 2018
577ae2c
course models map to community
abhijitbonik Mar 16, 2018
89ebbae
create course and create link logic added
abhijitbonik Mar 16, 2018
f895980
get course topics
abhijitbonik Mar 16, 2018
25d1fb2
added modal for creating a resource in community
firuza Mar 16, 2018
ea9b270
Merge branch 'develop' of https://github.com/fresearchgroup/Collabora…
firuza Mar 16, 2018
1398853
topics videos links added
abhijitbonik Mar 16, 2018
66cd158
modified icons of create resource modal
firuza Mar 16, 2018
32ef4ef
added modal for creating course
firuza Mar 16, 2018
3f8e052
Merge branch 'develop' of https://github.com/fresearchgroup/Collabora…
abhijitbonik Mar 16, 2018
41225ab
added CommunityCourse ORM
firuza Mar 16, 2018
e5361b1
renamed CommunityCourse ORM to CommunityCourses
firuza Mar 16, 2018
bfa7eff
template and views for creating a new course
firuza Mar 16, 2018
4331e09
displaying topics for a course in nested format
firuza Mar 16, 2018
659aa69
initial logic for editing course
firuza Mar 16, 2018
db4653f
changes
abhijitbonik Mar 19, 2018
139540e
Nginx and gunicorn configuration
NithinSethumadhavan Mar 19, 2018
431ca5c
Merge pull request #79 from NithinSethumadhavan/feature/ansible
firuza Mar 19, 2018
3af995c
merged test cases for group by kamlesh
kamleshrajpoot Mar 15, 2018
610a961
Merge branch 'develop' of https://github.com/fresearchgroup/Collabora…
firuza Mar 20, 2018
8456013
bar chart by kamlesh
kamleshrajpoot Mar 14, 2018
7ba794f
testcases for community by rishikesh
rushimanjrekar Mar 20, 2018
a635ba3
merged testcases for basic article by anjali
agrawalanjali Mar 16, 2018
e9651d4
Merge branch 'develop' of https://github.com/fresearchgroup/Collabora…
abhijitbonik Mar 20, 2018
5a52762
header files added in basicarticles test cases
abhijitbonik Mar 20, 2018
8a81dd6
add and edit topic name
firuza Mar 20, 2018
d4362b7
Merge branch 'develop' of https://github.com/fresearchgroup/Collabora…
firuza Mar 20, 2018
eae7a81
added draggable mptt to django-admin
firuza Mar 20, 2018
c7f5b5c
header files added to group test cases
abhijitbonik Mar 20, 2018
4b7969f
Merge branch 'develop' of https://github.com/fresearchgroup/Collabora…
abhijitbonik Mar 20, 2018
bf1ca54
cleaned code
firuza Mar 20, 2018
3d34f75
structured code
firuza Mar 20, 2018
36521d5
Merge branch 'develop' of https://github.com/fresearchgroup/Collabora…
firuza Mar 20, 2018
eae50c9
temporary UI for moving topics
firuza Mar 20, 2018
10d99b9
load move to select box on select of topic from dropdown list
firuza Mar 21, 2018
63db141
changing parent of a topic
firuza Mar 21, 2018
409cdeb
unique field removed
abhijitbonik Mar 21, 2018
d2babd6
merge migrations conflicts
abhijitbonik Mar 21, 2018
bb5952b
merge changes
abhijitbonik Mar 21, 2018
fd160b1
merge changes
abhijitbonik Mar 21, 2018
673b9e2
merge migrations files from master
abhijitbonik Mar 21, 2018
d64f456
null parent creation resolved
abhijitbonik Mar 21, 2018
230e5eb
resolved issue for key press
firuza Mar 21, 2018
0f5fcec
update readme
abhijitbonik Mar 22, 2018
4491d09
added license tag in readme.md
firuza Mar 22, 2018
b4ac1cb
update Readme
abhijitbonik Mar 22, 2018
7231a55
added codefact badge in readme file
fresearchgroup Mar 22, 2018
7cf36c7
Update README.md
fresearchgroup Mar 22, 2018
b83f1af
added travis to project
firuza Mar 23, 2018
0c89cb7
Merge branch 'develop' of https://github.com/fresearchgroup/Collabora…
firuza Mar 23, 2018
461ea9e
added travis badge to readme
fresearchgroup Mar 23, 2018
58f9aa1
resolved issue for moving topic to a root node
firuza Mar 23, 2018
c590362
Merge branch 'develop' of https://github.com/fresearchgroup/Collabora…
firuza Mar 23, 2018
72e130f
deleting topic from course
firuza Mar 23, 2018
e03ccfa
modified alert to bootstrap modal for deleting topic
firuza Mar 26, 2018
c693c50
resolved issue for displaying more than one word while editing course…
firuza Mar 26, 2018
12d999d
redirecting to login page while editing a course if user is logged ou…
firuza Mar 26, 2018
e0c57e2
some changes in barchart
kamleshrajpoot Mar 21, 2018
f1fcd97
Merge pull request #87 from kamleshrajpoot/develop
firuza Mar 27, 2018
630fe2e
course dashboard by rushikesh
kamleshrajpoot Mar 27, 2018
049a273
changes
abhijitbonik Apr 2, 2018
32def3f
community creation error resolve
abhijitbonik Apr 2, 2018
ac3a7a5
changes
abhijitbonik Apr 2, 2018
c92b779
changes
abhijitbonik Apr 2, 2018
dd1ce54
faq json updated
abhijitbonik Apr 4, 2018
e222207
update read me
abhijitbonik Mar 22, 2018
e98093c
updated database
abhijitbonik Apr 4, 2018
206a11a
adding travis configuration to master as well
firuza Apr 3, 2018
44e1310
course app updated
kamleshrajpoot Apr 4, 2018
f19d15b
Merge pull request #88 from kamleshrajpoot/develop
firuza Apr 4, 2018
7222222
bug fix for user in communtiy creation
firuza Apr 5, 2018
a450df3
changes done in edit_course
rushimanjrekar Apr 5, 2018
3ca8eba
merge changes
abhijitbonik Apr 5, 2018
caa3c55
updated readme
firuza Apr 5, 2018
67ff31a
changes done in edit_course.html
rushimanjrekar Apr 5, 2018
703b4f3
Merge pull request #91 from rushimanjrekar/develop
abhijitbonik Apr 5, 2018
bdc1431
Merge branch 'develop' of https://github.com/fresearchgroup/Collabora…
abhijitbonik Apr 5, 2018
ce1cdb2
course view modified
abhijitbonik Apr 5, 2018
f6e993b
course view code updated
abhijitbonik Apr 5, 2018
fcbe142
update, move and delete topics functions change
abhijitbonik Apr 5, 2018
041a507
get links of first topic of a course
abhijitbonik Apr 6, 2018
4b83e7a
display the first course video
abhijitbonik Apr 6, 2018
adc92b6
database updated with anonymous forum permission
abhijitbonik Apr 6, 2018
0fb77db
modified fieldnames for course
firuza Apr 9, 2018
dea6b2c
modified fieldnames in view and templates of course
firuza Apr 9, 2018
4ab5c5a
displaying community courses on communitycontent page using pagination
firuza Apr 9, 2018
805e554
some change
firuza Apr 9, 2018
52b6d66
creating course apis
abhijitbonik Apr 9, 2018
85a925d
Merge branch 'develop' into api
abhijitbonik Apr 9, 2018
5e0fbb6
removed conflict
firuza Apr 9, 2018
e7e5438
apis updated
abhijitbonik Apr 9, 2018
dfa081c
update tree menu
kamleshrajpoot Apr 9, 2018
4d5463f
Merge pull request #93 from kamleshrajpoot/develop
abhijitbonik Apr 9, 2018
53fc59f
serializer class updated with foreign ke creation fields
abhijitbonik Apr 9, 2018
3f11137
url modified
abhijitbonik Apr 10, 2018
7741c28
Merge branch 'api' into develop
abhijitbonik Apr 11, 2018
d5ba9cd
serializers for topics links added
abhijitbonik Apr 11, 2018
6d06ee6
llist api views for getting resource links added
abhijitbonik Apr 11, 2018
f068d31
course views updated
abhijitbonik Apr 11, 2018
d8857c3
serializers updated with authenticated or read only permissions
abhijitbonik Apr 11, 2018
28d2128
minor change: display content type on community content page
firuza Apr 11, 2018
95ef481
resolved bug while creating course
firuza Apr 11, 2018
933a7a6
updated
kamleshrajpoot Apr 11, 2018
090c858
ids added
Apr 11, 2018
00e3cfa
updated
kamleshrajpoot Apr 11, 2018
8591b47
ids addedin new_article
Apr 11, 2018
5b42d67
Merge pull request #95 from agrawalanjali/develop
firuza Apr 11, 2018
4345534
merge master
abhijitbonik Apr 11, 2018
2fca79d
Merge branch 'develop' of https://github.com/fresearchgroup/Collabora…
abhijitbonik Apr 11, 2018
91f136b
new line added
firuza Apr 12, 2018
1abb104
Added pagination.js jquery plugin MIT license
firuza Apr 12, 2018
653ea68
updated mygroups with pagination.js jquery
firuza Apr 12, 2018
a8f9952
updated mycommunities with pagination.js jquery
firuza Apr 12, 2018
a0031ec
adding infinite scroll by waypoints script
firuza Apr 13, 2018
b244b79
modified next page click to infinite scroll on community content page
firuza Apr 13, 2018
42986a4
course view template updated with nav tabs
abhijitbonik Apr 16, 2018
db33afa
single.yaml: Finish deployment script
NithinSethumadhavan Apr 16, 2018
92be5c7
javasript for loading corse links added
abhijitbonik Apr 16, 2018
963305b
videos links display with tabs
abhijitbonik Apr 16, 2018
d2b89b2
external links display with tabs
abhijitbonik Apr 16, 2018
6f72eca
cleaning tabs while moving to next topics
abhijitbonik Apr 16, 2018
a748cbc
load the first resource and make it active
abhijitbonik Apr 16, 2018
644224d
course initial details display on load
abhijitbonik Apr 16, 2018
b28deb8
iframe changed
abhijitbonik Apr 17, 2018
360c8f8
Adding private option in newgroup html and displaying only public gro…
firuza Apr 17, 2018
209dec5
modified groupview html page. displaying private/public
firuza Apr 17, 2018
6b9b3cf
displaying content from only public groups on community page
firuza Apr 17, 2018
679f6ce
Created GroupInvitations model
firuza Apr 17, 2018
bdff943
accept or reject group invitations
firuza Apr 17, 2018
71d9b1d
displaying group invitation on userdashboard
firuza Apr 17, 2018
5ee9c85
replacing join us with accept and reject invite on group page if invi…
firuza Apr 17, 2018
b8749e9
updated
kamleshrajpoot Apr 17, 2018
d03ecbf
updated
kamleshrajpoot Apr 17, 2018
6ddc58b
displaying group invitations in menu bar as dropdown
firuza Apr 19, 2018
2bd5f22
displaying message to admin when he/she invites a user in the group
firuza Apr 20, 2018
9dc4601
invite user in a group only if not invited
firuza Apr 20, 2018
c4e08d8
bug resolved: populating created_by when course is created
firuza Apr 20, 2018
a1a6a8f
Changes in course
rushimanjrekar Apr 23, 2018
c6802e4
Merge pull request #96 from NithinSethumadhavan/develop
firuza Apr 23, 2018
be5b4cd
Merge branch 'develop' into develop
firuza Apr 23, 2018
ae1db4f
Merge pull request #97 from rushimanjrekar/develop
firuza Apr 23, 2018
4256ad8
removing spaces which are creating issues
firuza Apr 25, 2018
1bdaafd
changes in template
abhijitbonik May 2, 2018
559bb27
changes in migrations
abhijitbonik May 2, 2018
c4d2734
displaying articles if exists for a topic
firuza May 2, 2018
40769de
missing div tag
firuza May 2, 2018
72f136f
update read me
abhijitbonik May 2, 2018
8c4abb6
made iframe for video and links responsive
firuza May 2, 2018
27bb1b0
cleaned some code
firuza May 2, 2018
4fe96ca
tweaked UI of course info
firuza May 3, 2018
6c0c524
update course info
firuza May 3, 2018
5dce2dc
link api for update and delete
abhijitbonik May 4, 2018
703b37d
resolved merge conflicts
firuza May 7, 2018
2dc1183
Added image filed to course models
firuza May 7, 2018
3fbac95
chosen default image for course
firuza May 7, 2018
71bfe48
updating course image
firuza May 7, 2018
29feb55
adding course image folder to gitignore
firuza May 7, 2018
8c6e97c
adding image while creating a course
firuza May 7, 2018
c3e4fdd
displaying course image on communitycontent page
firuza May 7, 2018
878168c
tweaked UI of viewcourse
firuza May 7, 2018
41982bf
displayed update course info tab
firuza May 7, 2018
877cc84
for updated
kamleshrajpoot May 7, 2018
27dc6e8
rsolving merge conflict
kamleshrajpoot May 7, 2018
c46afa4
resolved merge conflict
kamleshrajpoot May 7, 2018
23be19e
Merge branch 'develop' of https://github.com/fresearchgroup/Collabora…
firuza May 7, 2018
d9a20a4
displaying count of resources for every topic
firuza May 7, 2018
88b82fe
edit , delete button added
abhijitbonik May 9, 2018
1f70bf0
js for on click edit and delete
abhijitbonik May 9, 2018
d8b2a97
token key added to course view
abhijitbonik May 9, 2018
53b2c5a
delete functionality added
abhijitbonik May 9, 2018
b9ed0a5
updated delete api for links
abhijitbonik May 9, 2018
20192d8
trigger with jquery on change and bootstrap toggle buttons added
abhijitbonik May 9, 2018
a2e2fe7
merge develop to master
abhijitbonik May 10, 2018
f5c26f1
Added travis badge for master branch
firuza May 10, 2018
27c51a9
confirm before deleting resource
abhijitbonik May 10, 2018
1fe82f8
get the resource and load in modal form
abhijitbonik May 10, 2018
9982ffd
edit fuctionality added
abhijitbonik May 10, 2018
abf2c94
Merge branch 'master' of https://github.com/fresearchgroup/Collaborat…
abhijitbonik May 10, 2018
f4357e5
edit , delete on article resource
abhijitbonik May 10, 2018
329f34d
topic serializer added
abhijitbonik May 10, 2018
bcc4b0a
edit topics of resource , load on modal
abhijitbonik May 10, 2018
9ebf618
move links to topics with rest api implemented
abhijitbonik May 11, 2018
efed426
read me updated
abhijitbonik May 11, 2018
39fe95b
edit modal load for authenticatied user
abhijitbonik May 11, 2018
adb388b
destory topic article api added
abhijitbonik May 11, 2018
a059158
implemented deletion of topics article resourse using apis
abhijitbonik May 11, 2018
638e7e5
bug resolved for moving topics in a course
firuza May 14, 2018
ab16ff6
bug resolved for typecasting
firuza May 21, 2018
2d109c5
check user exists for displaying invitations
firuza May 21, 2018
81ef471
read.me updated with development installation
abhijitbonik May 21, 2018
8772de1
Merge branch 'master' of https://github.com/fresearchgroup/Collaborat…
abhijitbonik May 21, 2018
4160d4b
docker image of the project
abhijitbonik May 21, 2018
670984f
docker steps for installing the image
abhijitbonik May 21, 2018
6675685
docker image updated
abhijitbonik May 22, 2018
9163a3a
image updated with machina board base html file
abhijitbonik May 22, 2018
7a4078d
readme updated for installation
abhijitbonik May 22, 2018
1bdbdb9
docker image updated
abhijitbonik May 23, 2018
fde39fb
docker env
abhijitbonik May 23, 2018
a7064ac
Update models.py
Kaushik-Sridhar May 29, 2018
4e9d5cf
Update views.py
Kaushik-Sridhar May 29, 2018
020289f
First Commit
Kaushik-Sridhar Jun 6, 2018
55fd220
First Commit
Kaushik-Sridhar Jun 6, 2018
6043f29
Second commit
Kaushik-Sridhar Jun 7, 2018
c3b056e
Author Can't Vote his/her article.Third Commit
Kaushik-Sridhar Jun 11, 2018
b4ce552
Reputation System
Kaushik-Sridhar Jun 12, 2018
8ea8e83
Reputation System
Kaushik-Sridhar Jun 12, 2018
885d7ff
Reputation System.
Kaushik-Sridhar Jun 12, 2018
93e596c
Reputation System
Kaushik-Sridhar Jun 12, 2018
00938fa
Reputation System
Kaushik-Sridhar Jun 12, 2018
6642316
Reputation System
Kaushik-Sridhar Jun 12, 2018
85dd96b
Reputation System
Kaushik-Sridhar Jun 12, 2018
18f764b
revision compare for course articles
abhijitbonik Jun 12, 2018
4c5ef98
manage resource modified
abhijitbonik Jun 12, 2018
99ac26f
Fixed code factor bugs
Kaushik-Sridhar Jun 12, 2018
8249502
Fixed codefactor bugs
Kaushik-Sridhar Jun 12, 2018
a37239d
fixed bugs
Kaushik-Sridhar Jun 12, 2018
9ad7f4e
reputation changes and role changes implemented
Kaushik-Sridhar Jun 12, 2018
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
  •  
  •  
  •  
18 changes: 18 additions & 0 deletions .env.docker
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
SECRET_KEY=s3cr3t
DEBUG=True
DB_NAME=django
DB_USER=root
DB_PASSWORD=root
DB_HOST=db
DB_PORT=3306
ALLOWED_HOSTS= localhost, 10.129.132.146
GOOGLE_RECAPTCHA_SECRET_KEY=s3cr3t
EMAIL_HOST=localhost
EMAIL_HOST_USER=
EMAIL_HOST_PASSWORD=
EMAIL_PORT=25
EMAIL_USE_TLS=False
DEFAULT_FROM_EMAIL=collaboratingcommunity@example.com
SOCIAL_AUTH_GOOGLE_OAUTH2_KEY=s3cr3t.apps.googleusercontent.com
SOCIAL_AUTH_GOOGLE_OAUTH2_SECRET=s3cr3t

18 changes: 18 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
SECRET_KEY=s3cr3t
DEBUG=True
DB_NAME=django
DB_USER=root
DB_PASSWORD=root
DB_HOST=localhost
DB_PORT=3306
ALLOWED_HOSTS= localhost, 10.129.132.146
GOOGLE_RECAPTCHA_SECRET_KEY=s3cr3t
EMAIL_HOST=localhost
EMAIL_HOST_USER=
EMAIL_HOST_PASSWORD=
EMAIL_PORT=25
EMAIL_USE_TLS=False
DEFAULT_FROM_EMAIL=collaboratingcommunity@example.com
SOCIAL_AUTH_GOOGLE_OAUTH2_KEY=s3cr3t.apps.googleusercontent.com
SOCIAL_AUTH_GOOGLE_OAUTH2_SECRET=s3cr3t

18 changes: 18 additions & 0 deletions .evn
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
SECRET_KEY=s3cr3t
DEBUG=True
DB_NAME=django
DB_USER=root
DB_PASSWORD=root
DB_HOST=localhost
DB_PORT=3306
ALLOWED_HOSTS= localhost, 10.129.132.146
GOOGLE_RECAPTCHA_SECRET_KEY=s3cr3t
EMAIL_HOST=localhost
EMAIL_HOST_USER=
EMAIL_HOST_PASSWORD=
EMAIL_PORT=25
EMAIL_USE_TLS=False
DEFAULT_FROM_EMAIL=collaboratingcommunity@example.com
SOCIAL_AUTH_GOOGLE_OAUTH2_KEY=s3cr3t.apps.googleusercontent.com
SOCIAL_AUTH_GOOGLE_OAUTH2_SECRET=s3cr3t

13 changes: 13 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
__pycache__/
*.py[cod]
.env
venv/
media/article
media/community
media/group
media/profile
media/course

# SQLite database files

*.sqlite3
22 changes: 22 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
language: python # => 1

python: # => 2
- "3.6"

services: # => 3
- mysql

env: # => 4
-DJANGO=1.11.7 DB=mysql

install: # => 5
- pip3 install -r requirements.txt

before_script: # => 6
- mysql -u root -e "SET PASSWORD FOR 'root'@'localhost' = PASSWORD('root')"
- mysql -e 'create database django;' -u root -proot
- cp .env.example .env

script: # => 7
- python3 manage.py test --keepdb Community Group BasicArticle

Empty file added BasicArticle/__init__.py
Empty file.
31 changes: 31 additions & 0 deletions BasicArticle/admin.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
from django.contrib import admin
from .models import Articles, ArticleViewLogs
# Register your models here.
from reversion_compare.admin import CompareVersionAdmin
from reversion_compare.mixins import CompareMixin
from django.db.models import Manager


_old_compare = CompareMixin.compare


def compare(self, obj, version1, version2):
def replace_taggit_field(version_ins):
for fieldname in version_ins.field_dict:
if isinstance(version_ins.field_dict[fieldname], Manager):
version_ins.field_dict[fieldname] = []
replace_taggit_field(version1)
replace_taggit_field(version2)
return _old_compare(self, obj, version1, version2)


CompareMixin.compare = compare



class VersionedArticleAdmin(CompareVersionAdmin):
pass


admin.site.register(Articles, VersionedArticleAdmin)
admin.site.register(ArticleViewLogs, VersionedArticleAdmin)
5 changes: 5 additions & 0 deletions BasicArticle/apps.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
from django.apps import AppConfig


class BasicarticleConfig(AppConfig):
name = 'BasicArticle'
5 changes: 5 additions & 0 deletions BasicArticle/forms.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
from django import forms

class NewArticleForm(forms.Form):
title = forms.CharField()
body = forms.CharField(widget=forms.Textarea)
25 changes: 25 additions & 0 deletions BasicArticle/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.6 on 2017-11-01 12:02
from __future__ import unicode_literals

from django.db import migrations, models


class Migration(migrations.Migration):

initial = True

dependencies = [
]

operations = [
migrations.CreateModel(
name='Articles',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('title', models.CharField(max_length=100)),
('body', models.TextField()),
('created_at', models.DateTimeField(auto_now_add=True)),
],
),
]
23 changes: 23 additions & 0 deletions BasicArticle/migrations/0002_articles_created_by.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.6 on 2017-11-01 12:14
from __future__ import unicode_literals

from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('BasicArticle', '0001_initial'),
]

operations = [
migrations.AddField(
model_name='articles',
name='created_by',
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='articles', to=settings.AUTH_USER_MODEL),
),
]
19 changes: 19 additions & 0 deletions BasicArticle/migrations/0003_remove_articles_created_by.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.7 on 2017-11-22 07:40
from __future__ import unicode_literals

from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
('BasicArticle', '0002_articles_created_by'),
]

operations = [
migrations.RemoveField(
model_name='articles',
name='created_by',
),
]
22 changes: 22 additions & 0 deletions BasicArticle/migrations/0004_articles_state.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.7 on 2018-01-04 13:42
from __future__ import unicode_literals

from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

dependencies = [
('workflow', '0001_initial'),
('BasicArticle', '0003_remove_articles_created_by'),
]

operations = [
migrations.AddField(
model_name='articles',
name='state',
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='articleworkflow', to='workflow.Transitions'),
),
]
19 changes: 19 additions & 0 deletions BasicArticle/migrations/0005_remove_articles_state.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.7 on 2018-01-07 11:39
from __future__ import unicode_literals

from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
('BasicArticle', '0004_articles_state'),
]

operations = [
migrations.RemoveField(
model_name='articles',
name='state',
),
]
23 changes: 23 additions & 0 deletions BasicArticle/migrations/0006_articles_created_by.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.7 on 2018-01-07 11:44
from __future__ import unicode_literals

from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('BasicArticle', '0005_remove_articles_state'),
]

operations = [
migrations.AddField(
model_name='articles',
name='created_by',
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='article_author', to=settings.AUTH_USER_MODEL),
),
]
20 changes: 20 additions & 0 deletions BasicArticle/migrations/0007_articles_views.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.7 on 2018-01-07 13:20
from __future__ import unicode_literals

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('BasicArticle', '0006_articles_created_by'),
]

operations = [
migrations.AddField(
model_name='articles',
name='views',
field=models.PositiveIntegerField(default=0),
),
]
26 changes: 26 additions & 0 deletions BasicArticle/migrations/0008_articleviewlogs.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.7 on 2018-01-07 14:37
from __future__ import unicode_literals

from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

dependencies = [
('BasicArticle', '0007_articles_views'),
]

operations = [
migrations.CreateModel(
name='ArticleViewLogs',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('ip', models.CharField(max_length=40)),
('session', models.CharField(max_length=40)),
('created', models.DateTimeField(auto_now_add=True)),
('article', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='articleviews', to='BasicArticle.Articles')),
],
),
]
22 changes: 22 additions & 0 deletions BasicArticle/migrations/0009_articles_state.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.7 on 2018-01-08 10:36
from __future__ import unicode_literals

from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

dependencies = [
('workflow', '0001_initial'),
('BasicArticle', '0008_articleviewlogs'),
]

operations = [
migrations.AddField(
model_name='articles',
name='state',
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='articleworkflow', to='workflow.States'),
),
]
20 changes: 20 additions & 0 deletions BasicArticle/migrations/0010_articles_image.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.7 on 2018-01-18 08:34
from __future__ import unicode_literals

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('BasicArticle', '0009_articles_state'),
]

operations = [
migrations.AddField(
model_name='articles',
name='image',
field=models.ImageField(null=True, upload_to='articles'),
),
]
20 changes: 20 additions & 0 deletions BasicArticle/migrations/0011_auto_20180118_0858.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.7 on 2018-01-18 08:58
from __future__ import unicode_literals

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('BasicArticle', '0010_articles_image'),
]

operations = [
migrations.AlterField(
model_name='articles',
name='image',
field=models.ImageField(null=True, upload_to='article'),
),
]
Loading