Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
574 commits
Select commit Hold shift + click to select a range
631fef5
map css fix
Dec 7, 2017
e74e2a1
Merge pull request #59 from Social-projects-Rivne/feature/css-fix
Dec 7, 2017
a9955ce
merge fixes
Dec 7, 2017
02b8027
Merge pull request #60 from Social-projects-Rivne/feature/merge-fix
Dec 7, 2017
e2e5c2e
small changes in templates
KostSvitlana Dec 7, 2017
e0af216
Merge pull request #61 from Social-projects-Rivne/feature/some_changes
KostSvitlana Dec 7, 2017
6c87a7d
delete description, add user and open_date fields
Dec 8, 2017
4d00818
fix merge conflicts
Dec 8, 2017
74f2b10
Merge pull request #62 from Social-projects-Rivne/fix/users_list
forever-Agriculture Dec 9, 2017
2d8ea32
Fix errors, when user edit profile
andrewRv Dec 10, 2017
bfba939
map UI upgrades
Dec 10, 2017
5ed47a5
Merge pull request #64 from Social-projects-Rivne/feature/map-UI-upgrade
Dec 11, 2017
2999656
add pagination on issue page
KostSvitlana Dec 11, 2017
0698d0c
change basic template
Dec 11, 2017
8d10a26
add css file fot the page
Dec 11, 2017
807daeb
Validator fixes
andrewRv Dec 11, 2017
0264e33
markers with status
Dec 11, 2017
92c7ff3
fixed search
KostSvitlana Dec 11, 2017
7951ac2
fix pep8
KostSvitlana Dec 11, 2017
a4eb63a
fix pep8
KostSvitlana Dec 11, 2017
5c5223d
Merge pull request #65 from Social-projects-Rivne/feature/pagination
KostSvitlana Dec 11, 2017
972ee9f
fix/change_comments: fix ugly usability
Oksana098 Dec 12, 2017
c5dc592
fix/change_comments: fix sorting in issues
Oksana098 Dec 12, 2017
7d48633
Merge pull request #66 from Social-projects-Rivne/user_profile_fixes
andrewRv Dec 12, 2017
cee70dc
Merge pull request #67 from Social-projects-Rivne/feature/status-markers
Dec 12, 2017
a56b349
Merge branch 'develop' of https://github.com/Social-projects-Rivne/rv…
Oksana098 Dec 12, 2017
ce78343
Merge pull request #68 from Social-projects-Rivne/fix-search
KostSvitlana Dec 12, 2017
3a2cbec
add django-imagekid
KostSvitlana Dec 12, 2017
3a304ef
small template fixes
andrewRv Dec 12, 2017
38ca6a4
Merge pull request #70 from Social-projects-Rivne/profile_fixes
andrewRv Dec 12, 2017
d52ede0
map comments
Dec 12, 2017
897d5bb
map UI fixes
Dec 13, 2017
98b5cf3
new design for issue_detatiled
Dec 13, 2017
e59dcbf
map role access
Dec 13, 2017
b2dfec2
Merge pull request #71 from Social-projects-Rivne/feature/map-comments
Dec 14, 2017
cd91469
create thumbnails
KostSvitlana Dec 14, 2017
57bc066
add pagination on user page
KostSvitlana Dec 14, 2017
3322364
create image map fix
Dec 14, 2017
2c59c88
add deleting attachments
andrewRv Dec 14, 2017
5b73ca8
Merge branch 'develop' into profile_fixes
andrewRv Dec 14, 2017
f7498d2
fix pylint
andrewRv Dec 14, 2017
e7e2c9f
modifyed comments
Dec 14, 2017
3ef09bd
comments UI fix
Dec 15, 2017
16d342f
Update issues.py
Dec 15, 2017
f7ebb50
add modulethumbnails.py
KostSvitlana Dec 15, 2017
fd1e268
some fix
KostSvitlana Dec 15, 2017
614c6c7
Merge pull request #73 from Social-projects-Rivne/feature/user-pagina…
KostSvitlana Dec 15, 2017
0a2c2e1
Update .travis.yml
Dec 15, 2017
d1c10ab
fix empty directory
andrewRv Dec 15, 2017
2f25882
Update .travis.yml
Dec 15, 2017
6420498
Update .travis.yml
Dec 15, 2017
595313c
Merge pull request #72 from Social-projects-Rivne/feature/map-access
Dec 15, 2017
dd3ec1d
Merge branch 'develop' into profile_fixes
andrewRv Dec 15, 2017
dcd1d99
pylint fix
andrewRv Dec 15, 2017
d34fddd
Merge pull request #74 from Social-projects-Rivne/profile_fixes
andrewRv Dec 15, 2017
aeb65b4
pylint ignore
KostSvitlana Dec 15, 2017
4241b91
Merge branch 'feature/thumbnail' of https://github.com/Social-project…
KostSvitlana Dec 15, 2017
b6a0832
Merge pull request #75 from Social-projects-Rivne/feature/thumbnail
KostSvitlana Dec 15, 2017
7e9bdfe
map users actions
Dec 17, 2017
94a2b92
comments UI upgrade
Dec 18, 2017
5b86b15
Merge pull request #76 from Social-projects-Rivne/feature/map-actions
Dec 18, 2017
af34ef7
show photos on issue page
KostSvitlana Dec 18, 2017
3df598a
add media_folder in config
KostSvitlana Dec 18, 2017
6783400
add blank line
KostSvitlana Dec 18, 2017
6622281
readme fix
Dec 19, 2017
e96444f
Merge pull request #77 from Social-projects-Rivne/feature/show-attach…
KostSvitlana Dec 19, 2017
4104ffd
Merge pull request #78 from Social-projects-Rivne/feature/readme-fix
Dec 19, 2017
2864e09
add script for download attachments
andrewRv Dec 19, 2017
082386d
Fix venv
alevitsky Dec 20, 2017
6704655
Fix add user
alevitsky Dec 20, 2017
8dd292b
Readonly location
alevitsky Dec 20, 2017
d680e15
Add new status and category
alevitsky Dec 20, 2017
1e885bb
Changed form in template
alevitsky Dec 20, 2017
32c71e2
Refactor modal confirm
alevitsky Dec 20, 2017
7919ecb
Improve and fix flash messages
alevitsky Dec 20, 2017
34f879d
Improve requirements
alevitsky Dec 20, 2017
8ac4a51
Add email notification to add user
alevitsky Dec 20, 2017
76a55f4
Add email settings to Readme
alevitsky Dec 20, 2017
9dc0d8e
Fix email settings in Readme
alevitsky Dec 20, 2017
18606af
Mod Panel Access in Template
alevitsky Dec 20, 2017
234acb8
comments deletion
Dec 20, 2017
c2ec92b
fill test attachments, add issues images
andrewRv Dec 20, 2017
43cf5bd
pep8 fix
andrewRv Dec 20, 2017
2850c01
fix pylint
andrewRv Dec 20, 2017
7c837eb
Merge pull request #80 from Social-projects-Rivne/feature/comments-de…
Dec 21, 2017
2935945
Merge pull request #81 from Social-projects-Rivne/feature/download_at…
andrewRv Dec 21, 2017
68ac377
rewrite detailed-issue view
Dec 21, 2017
6876f19
add template mod_list.html
alevitsky Dec 22, 2017
c62a102
add template for permission
alevitsky Dec 22, 2017
6fdba5c
add template edit issue
alevitsky Dec 22, 2017
2b07ed1
add template confirm delete
alevitsky Dec 22, 2017
23da5b5
add template confirm restore
alevitsky Dec 22, 2017
14e7468
add urls for moderator panel
alevitsky Dec 22, 2017
3b6c389
add settings for search
alevitsky Dec 22, 2017
16249d8
add permission to bse template
alevitsky Dec 22, 2017
365df05
add deletion and restore to models
alevitsky Dec 22, 2017
7762d97
add forms edit issue for moderator
alevitsky Dec 22, 2017
1462e4f
add views for mod list, edit, delete and restore
alevitsky Dec 22, 2017
8d00826
small fix
alevitsky Dec 22, 2017
08246ea
small fix
alevitsky Dec 22, 2017
7641644
fix thumbnails
KostSvitlana Dec 22, 2017
d85005d
add tag tab filter
Oksana098 Dec 23, 2017
fdd9e6e
fix width button
Oksana098 Dec 23, 2017
a6f9d19
Merge branch 'develop' into fix-tabulation
Oksana098 Dec 23, 2017
b8463b7
fix typos base_html typos
Dec 24, 2017
885ab6d
change routes
KostSvitlana Dec 24, 2017
110e826
add bootstrap in search forms
KostSvitlana Dec 24, 2017
fde4a27
Improve pagination
alevitsky Dec 25, 2017
1eaca21
fix delete button
alevitsky Dec 25, 2017
3b4c0ff
chat with moderator
andrewRv Dec 25, 2017
54fa4a3
Merge pull request #87 from Social-projects-Rivne/add-bootstrap
KostSvitlana Dec 25, 2017
e6be407
Merge pull request #86 from Social-projects-Rivne/change-routes
KostSvitlana Dec 25, 2017
fdfc010
Merge pull request #85 from Social-projects-Rivne/fix-thumbnails-v2
KostSvitlana Dec 25, 2017
a7d6589
Merge pull request #88 from Social-projects-Rivne/feature/chat_with_m…
andrewRv Dec 25, 2017
65c06a1
add sort
alevitsky Dec 25, 2017
2ba6ec6
some improve and fix
alevitsky Dec 25, 2017
a489534
some fix
alevitsky Dec 25, 2017
303811b
some fix
alevitsky Dec 25, 2017
cc76934
Merge branch 'develop' into mod_panel
alevitsky Dec 25, 2017
5214f59
some fix
alevitsky Dec 25, 2017
b2c3390
some fix
alevitsky Dec 25, 2017
c0bab94
add deleting thumb with image
andrewRv Dec 25, 2017
7009e5d
fix pylint
andrewRv Dec 25, 2017
a5c3787
Merge pull request #90 from Social-projects-Rivne/feature/deleting_im…
andrewRv Dec 25, 2017
5f78733
Merge pull request #89 from Social-projects-Rivne/mod_panel
alevitsky Dec 25, 2017
7c11dd8
map thumbs fix
Dec 25, 2017
93541f0
Merge branch 'develop' into fix/map-thumbs
Dec 25, 2017
dc7f9ad
add deletion attachments
KostSvitlana Dec 25, 2017
2237f3c
Merge pull request #91 from Social-projects-Rivne/fix/map-thumbs
Dec 25, 2017
1374312
Merge branch 'develop' into feature/delete_attachment
KostSvitlana Dec 25, 2017
2626c59
add blank lines
KostSvitlana Dec 25, 2017
ccb6cee
Merge branch 'feature/delete_attachment' of https://github.com/Social…
KostSvitlana Dec 25, 2017
ddf6b17
Merge pull request #92 from Social-projects-Rivne/feature/delete_atta…
KostSvitlana Dec 25, 2017
e3b03a7
small fix
alevitsky Dec 26, 2017
7e87a2e
Merge pull request #94 from Social-projects-Rivne/mod_panel
alevitsky Dec 26, 2017
3e1715e
heroku
Dec 26, 2017
1938ee2
heroku
Dec 26, 2017
c9e9446
pep8 fix
Dec 26, 2017
a0c1043
folders fix
Dec 26, 2017
57f295a
folders fix
Dec 26, 2017
515209a
folders fix
Dec 26, 2017
4feaacb
comfig fix
Dec 26, 2017
0809087
gitignore fix
Dec 26, 2017
68f3120
add nickname field
Dec 26, 2017
ce88ec5
add modal dialog
KostSvitlana Dec 26, 2017
dcfa64f
add users, some fix
KostSvitlana Dec 26, 2017
6fbc434
Merge pull request #96 from Social-projects-Rivne/fix-deletions
KostSvitlana Dec 26, 2017
1db3925
imgs fix
Dec 26, 2017
a0f1498
resolve conflicts
Dec 26, 2017
6251a51
temporary add detailed_view back
Dec 26, 2017
9103418
fix merge
Dec 26, 2017
f659311
fix media conflict
Dec 26, 2017
1a76232
pep8 fix
Dec 26, 2017
051e261
fix issue status null, add show issue in table on profile, draggable …
andrewRv Dec 26, 2017
1f48251
Merge pull request #95 from Social-projects-Rivne/feature/heroku
Dec 26, 2017
d00ba52
fix search
KostSvitlana Dec 26, 2017
5ca75bc
add whitespace
KostSvitlana Dec 26, 2017
abf649d
Merge pull request #99 from Social-projects-Rivne/feature/fixes
andrewRv Dec 26, 2017
843fe46
Merge pull request #97 from Social-projects-Rivne/add-users
KostSvitlana Dec 26, 2017
ba2545a
comment fix
Dec 26, 2017
ad13c35
Merge pull request #101 from Social-projects-Rivne/fix/comment-width
Dec 26, 2017
706f075
Merge pull request #100 from Social-projects-Rivne/fix-search
KostSvitlana Dec 26, 2017
2aa52d6
change thumbnails url
KostSvitlana Dec 26, 2017
c9610bb
Merge pull request #102 from Social-projects-Rivne/small-fix
KostSvitlana Dec 26, 2017
940fdcd
Merge pull request #98 from Social-projects-Rivne/feature/registratio…
forever-Agriculture Dec 26, 2017
4f8960c
heroku media fix
Dec 27, 2017
3f61c34
migrations fix
Dec 27, 2017
42ee014
pep8
Dec 27, 2017
0d3ceb2
deletion fix
Dec 27, 2017
f4001af
import fix
Dec 27, 2017
e299f06
added migration
Dec 27, 2017
0f452cd
Merge pull request #104 from Social-projects-Rivne/fix/heroku-media
Dec 27, 2017
6cdb3bb
Merge pull request #105 from Social-projects-Rivne/fix/migration
Dec 27, 2017
a6a6c43
details fix
Dec 27, 2017
3121f17
Merge pull request #106 from Social-projects-Rivne/fix/close-issue-de…
Dec 27, 2017
65122ee
table script
Dec 27, 2017
99b85e5
init commit
Dec 27, 2017
6b1facc
pep8 fix
Dec 27, 2017
52cb23e
change test comments
andrewRv Dec 27, 2017
ad6b30e
Merge pull request #107 from Social-projects-Rivne/feature/table-script
Dec 27, 2017
cc385d8
show errors in user-edit form
andrewRv Dec 27, 2017
0ae6f76
Merge pull request #109 from Social-projects-Rivne/feature/improvements
andrewRv Dec 27, 2017
0f15968
add a shameful template
Dec 27, 2017
e374c29
style buttons
Oksana098 Dec 27, 2017
342d8ab
resolve develop conflicts
Dec 27, 2017
d75d0cb
conflicts resolving 2 attempt
Dec 27, 2017
5694bde
flask image deletion fix
Dec 27, 2017
c685564
the 3rd attempt
Dec 27, 2017
1832c87
modify permissions
Dec 27, 2017
0621cd5
small fix
Dec 27, 2017
ed5b983
add detailed_issue back to resolve conflict with user profile
Dec 27, 2017
a24dec0
fix a registration button
Dec 27, 2017
62d93f0
Merge pull request #110 from Social-projects-Rivne/fix/flask-delete
Dec 27, 2017
2742483
fix/change_comments: update public and private messages
Oksana098 Dec 27, 2017
e0e2c43
fix internal
Oksana098 Dec 28, 2017
9df380a
Merge pull request #111 from Social-projects-Rivne/fix/add_a_shameful…
forever-Agriculture Dec 28, 2017
99dd004
update requirements
alevitsky Dec 28, 2017
8a275fd
add bootstrap class for button
Oksana098 Dec 28, 2017
6f3ef40
improve links and buttons url
alevitsky Dec 28, 2017
b11e684
changing registration
Dec 28, 2017
0b99b36
add modal to delete/restore issues, small improve modify user
alevitsky Dec 28, 2017
28358cf
deleted column avatar, aligned text
KostSvitlana Dec 28, 2017
90e4d3a
change template
andrewRv Dec 28, 2017
edc4b68
improve modal window
alevitsky Dec 28, 2017
8254f83
small fix
alevitsky Dec 28, 2017
bff75f2
small fix
alevitsky Dec 28, 2017
60baa33
change thumbnail size
KostSvitlana Dec 28, 2017
d7dd902
Merge pull request #114 from Social-projects-Rivne/some-fix
KostSvitlana Dec 28, 2017
513965f
profile improvements
andrewRv Dec 28, 2017
770f663
deletion fix
Dec 28, 2017
8ea4d04
profile improvements
andrewRv Dec 28, 2017
68eac23
profile improvements
andrewRv Dec 28, 2017
35fc6f7
add message style
KostSvitlana Dec 28, 2017
0d3a18c
some fix
KostSvitlana Dec 28, 2017
06b1ec1
Merge pull request #115 from Social-projects-Rivne/size-thumbnail
KostSvitlana Dec 28, 2017
ad84cd3
Merge pull request #117 from Social-projects-Rivne/feature/improvemen…
andrewRv Dec 28, 2017
823c2a5
Merge pull request #119 from Social-projects-Rivne/fix-alerts
KostSvitlana Dec 28, 2017
6ca4565
Merge pull request #118 from Social-projects-Rivne/fix/flask-delete
Dec 28, 2017
d0a899f
attachments
alevitsky Dec 28, 2017
4263470
change link on issues list
andrewRv Dec 28, 2017
27d6459
change link on issues list
andrewRv Dec 28, 2017
8f76753
Merge pull request #120 from Social-projects-Rivne/feature/issue_deat…
forever-Agriculture Dec 28, 2017
ec4f9a3
add new registration params
Dec 28, 2017
90479e4
Merge remote-tracking branch 'origin/develop' into fix/registration_p…
Dec 28, 2017
1b8075e
merge with develop
Oksana098 Dec 28, 2017
b6afb9e
merge with develop
Oksana098 Dec 28, 2017
92b1f4a
Merge branch 'develop' of https://github.com/Social-projects-Rivne/rv…
Oksana098 Dec 28, 2017
2944846
fix template
andrewRv Dec 28, 2017
f1240db
Merge pull request #122 from Social-projects-Rivne/template_fix
andrewRv Dec 28, 2017
3460ba3
small fix
andrewRv Dec 28, 2017
09bfd46
Merge pull request #123 from Social-projects-Rivne/small_fix
andrewRv Dec 28, 2017
8bc3a1b
fix map comments
Dec 28, 2017
4be91b0
Merge pull request #124 from Social-projects-Rivne/fix/map-comments
Dec 28, 2017
e999698
fix buttons
KostSvitlana Dec 28, 2017
af99c45
resolve registration forever
Dec 28, 2017
bd7bddf
Merge remote-tracking branch 'origin/develop' into fix/registration_p…
Dec 28, 2017
d64c443
add mod comments
alevitsky Dec 28, 2017
6ea99a2
small improve
alevitsky Dec 28, 2017
e468acd
fix comments
Dec 28, 2017
d5da6c6
small fix
alevitsky Dec 28, 2017
e3311b3
fix pep8
Dec 28, 2017
3452a7e
fix new line
Dec 28, 2017
2540601
Merge pull request #127 from Social-projects-Rivne/fix_mod_panel
alevitsky Dec 29, 2017
9bc8073
resolve conflict in forms
Dec 29, 2017
87a6f36
Merge pull request #128 from Social-projects-Rivne/fix/registration_p…
forever-Agriculture Dec 29, 2017
c5b96ef
Merge pull request #125 from Social-projects-Rivne/comments-btn
forever-Agriculture Dec 29, 2017
601f84a
small fix
andrewRv Dec 29, 2017
4fbb231
Merge pull request #129 from Social-projects-Rivne/hotfix
andrewRv Dec 29, 2017
52b78e9
bring Oksana back to the game
Dec 29, 2017
13ce6fd
Merge pull request #130 from Social-projects-Rivne/fix/bring_oksana_back
forever-Agriculture Dec 29, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ wheels/
*.egg-info/
.installed.cfg
*.egg
*.DS_Store
*.idea/

# PyInstaller
# Usually these files are written by a python script from a template
Expand Down Expand Up @@ -84,6 +86,7 @@ celerybeat-schedule

# virtualenv
.venv
.venv/
venv/
ENV/

Expand All @@ -100,7 +103,7 @@ ENV/
# mypy
.mypy_cache/

users/config.py
# virtual env
flask

#configuration file
Expand All @@ -110,4 +113,9 @@ backend/config.py
/.idea

#Migrations files
/backend/migrations
/backend/migrations

/backend/config.py
/client/basic/local_settings.py
/client/apps/city_issues/media/
/client/static
Loading