Develop - #131

Open

Michaluch wants to merge 574 commits into

This pull request is big! We're only showing the most recent 250 commits

Commits on Dec 7, 2017

map css fix
Ivan
committed
631fef5
Merge pull request #59 from Social-projects-Rivne/feature/css-fix
NewIvanIvanov
authored
e74e2a1
merge fixes
Ivan
committed
a9955ce
Merge pull request #60 from Social-projects-Rivne/feature/merge-fix
NewIvanIvanov
authored
02b8027
small changes in templates
KostSvitlana
committed
e2e5c2e
Merge pull request #61 from Social-projects-Rivne/feature/some_changes
KostSvitlana
authored
e0af216

Commits on Dec 8, 2017

delete description, add user and open_date fields

”Alex
authored and
”Alex
committed
6c87a7d
fix merge conflicts

”Alex
authored and
”Alex
committed
4d00818

Commits on Dec 9, 2017

Merge pull request #62 from Social-projects-Rivne/fix/users_list
forever-Agriculture
authored
74f2b10

Commits on Dec 10, 2017

Fix errors, when user edit profile
andrewRv
committed
2d8ea32
map UI upgrades
Ivan
committed
bfba939

Commits on Dec 11, 2017

Merge pull request #64 from Social-projects-Rivne/feature/map-UI-upgrade
NewIvanIvanov
authored
5ed47a5
add pagination on issue page
KostSvitlana
committed
2999656
change basic template

”Alex
authored and
”Alex
committed
0698d0c
add css file fot the page

”Alex
authored and
”Alex
committed
8d10a26
Validator fixes
andrewRv
committed
807daeb
markers with status
Ivan
committed
0264e33
fixed search
KostSvitlana
committed
92c7ff3
fix pep8
KostSvitlana
committed
7951ac2
fix pep8
KostSvitlana
committed
a4eb63a
Merge pull request #65 from Social-projects-Rivne/feature/pagination
KostSvitlana
authored
5c5223d

Commits on Dec 12, 2017

fix/change_comments: fix ugly usability
Oksana098
committed
972ee9f
fix/change_comments: fix sorting in issues
Oksana098
committed
c5dc592
Merge pull request #66 from Social-projects-Rivne/user_profile_fixes
andrewRv
authored
7d48633
Merge pull request #67 from Social-projects-Rivne/feature/status-markers
NewIvanIvanov
authored
cee70dc
Merge branch 'develop' of https://github.com/Social-projects-Rivne/rv-027py into develop
Oksana098
committed
a56b349
Merge pull request #68 from Social-projects-Rivne/fix-search
KostSvitlana
authored
ce78343
add django-imagekid
KostSvitlana
committed
3a2cbec
small template fixes
andrewRv
committed
3a304ef
Merge pull request #70 from Social-projects-Rivne/profile_fixes
andrewRv
authored
38ca6a4
map comments
Ivan
committed
d52ede0

Commits on Dec 13, 2017

map UI fixes
Ivan
committed
897d5bb
new design for issue_detatiled

”Alex
authored and
”Alex
committed
98b5cf3
map role access
Ivan
committed
e59dcbf

Commits on Dec 14, 2017

Merge pull request #71 from Social-projects-Rivne/feature/map-comments
NewIvanIvanov
authored
b2dfec2
create thumbnails
KostSvitlana
committed
cd91469
add pagination on user page
KostSvitlana
committed
57bc066
create image map fix
Ivan
committed
3322364
add deleting attachments
andrewRv
committed
2c59c88
Merge branch 'develop' into profile_fixes
andrewRv
authored
5b73ca8
fix pylint
andrewRv
committed
f7498d2
modifyed comments
Ivan
committed
e7e2c9f

Commits on Dec 15, 2017

comments UI fix
Ivan
committed
3ef09bd
Update issues.py
NewIvanIvanov
authored
16d342f
add modulethumbnails.py
KostSvitlana
committed
f7ebb50
some fix
KostSvitlana
committed
fd1e268
Merge pull request #73 from Social-projects-Rivne/feature/user-pagination
KostSvitlana
authored
614c6c7
Update .travis.yml
NewIvanIvanov
authored
0a2c2e1
fix empty directory
andrewRv
authored
d1c10ab
Update .travis.yml
NewIvanIvanov
authored
2f25882
Update .travis.yml
NewIvanIvanov
authored
6420498
Merge pull request #72 from Social-projects-Rivne/feature/map-access
NewIvanIvanov
authored
595313c
Merge branch 'develop' into profile_fixes
andrewRv
authored
dd3ec1d
pylint fix
andrewRv
authored
dcd1d99
Merge pull request #74 from Social-projects-Rivne/profile_fixes
andrewRv
authored
d34fddd
pylint ignore
KostSvitlana
committed
aeb65b4
Merge branch 'feature/thumbnail' of https://github.com/Social-projects-Rivne/rv-027py into feature/thumbnail
KostSvitlana
committed
4241b91
Merge pull request #75 from Social-projects-Rivne/feature/thumbnail
KostSvitlana
authored
b6a0832

Commits on Dec 17, 2017

map users actions
Ivan
committed
7e9bdfe

Commits on Dec 18, 2017

comments UI upgrade
Ivan
committed
94a2b92
Merge pull request #76 from Social-projects-Rivne/feature/map-actions
NewIvanIvanov
authored
5b86b15
show photos on issue page
KostSvitlana
committed
af34ef7
add media_folder in config
KostSvitlana
committed
3df598a
add blank line
KostSvitlana
committed
6783400

Commits on Dec 19, 2017

readme fix
Ivan
committed
6622281
Merge pull request #77 from Social-projects-Rivne/feature/show-attachments
KostSvitlana
authored
e96444f
Merge pull request #78 from Social-projects-Rivne/feature/readme-fix
NewIvanIvanov
authored
4104ffd
add script for download attachments
andrewRv
committed
2864e09

Commits on Dec 20, 2017

Fix venv
alevitsky
committed
082386d
Fix add user
alevitsky
committed
6704655
Readonly location
alevitsky
committed
8dd292b
Add new status and category
alevitsky
committed
d680e15
Changed form in template
alevitsky
committed
1e885bb
Refactor modal confirm
alevitsky
committed
32c71e2
Improve and fix flash messages
alevitsky
committed
7919ecb
Improve requirements
alevitsky
committed
34f879d
Add email notification to add user
alevitsky
committed
8ac4a51
Add email settings to Readme
alevitsky
committed
76a55f4
Fix email settings in Readme
alevitsky
committed
9dc0d8e
Mod Panel Access in Template
alevitsky
committed
18606af
comments deletion
Ivan
committed
234acb8
fill test attachments, add issues images
andrewRv
committed
c2ec92b
pep8 fix
andrewRv
authored
43cf5bd
fix pylint
andrewRv
committed
2850c01

Commits on Dec 21, 2017

Merge pull request #80 from Social-projects-Rivne/feature/comments-delete
NewIvanIvanov
authored
7c837eb
Merge pull request #81 from Social-projects-Rivne/feature/download_attachments
andrewRv
authored
2935945
rewrite detailed-issue view

”Alex
authored and
”Alex
committed
68ac377

Commits on Dec 22, 2017

add template mod_list.html
alevitsky
committed
6876f19
add template for permission
alevitsky
committed
c62a102
add template edit issue
alevitsky
committed
6fdba5c
add template confirm delete
alevitsky
committed
2b07ed1
add template confirm restore
alevitsky
committed
23da5b5
add urls for moderator panel
alevitsky
committed
14e7468
add settings for search
alevitsky
committed
3b6c389
add permission to bse template
alevitsky
committed
16249d8
add deletion and restore to models
alevitsky
committed
365df05
add forms edit issue for moderator
alevitsky
committed
7762d97
add views for mod list, edit, delete and restore
alevitsky
committed
1462e4f
small fix
alevitsky
committed
8d00826
small fix
alevitsky
committed
08246ea
fix thumbnails
KostSvitlana
committed
7641644

Commits on Dec 23, 2017

add tag tab filter
Oksana098
committed
d85005d
fix width button
Oksana098
committed
fdd9e6e
Merge branch 'develop' into fix-tabulation
Oksana098
committed
a6f9d19

Commits on Dec 24, 2017

fix typos base_html typos

”Alex
authored and
”Alex
committed
b8463b7
change routes
KostSvitlana
committed
885ab6d
add bootstrap in search forms
KostSvitlana
committed
110e826

Commits on Dec 25, 2017

Improve pagination
alevitsky
committed
fde4a27
fix delete button
alevitsky
committed
1eaca21
chat with moderator
andrewRv
committed
3b4c0ff
Merge pull request #87 from Social-projects-Rivne/add-bootstrap
KostSvitlana
authored
54fa4a3
Merge pull request #86 from Social-projects-Rivne/change-routes
KostSvitlana
authored
e6be407
Merge pull request #85 from Social-projects-Rivne/fix-thumbnails-v2
KostSvitlana
authored
fdfc010
Merge pull request #88 from Social-projects-Rivne/feature/chat_with_moderator
andrewRv
authored
a7d6589
add sort
alevitsky
committed
65c06a1
some improve and fix
alevitsky
committed
2ba6ec6
some fix
alevitsky
committed
a489534
some fix
alevitsky
committed
303811b
Merge branch 'develop' into mod_panel
alevitsky
authored
cc76934
some fix
alevitsky
committed
5214f59
some fix
alevitsky
committed
b2c3390
add deleting thumb with image
andrewRv
committed
c0bab94
fix pylint
andrewRv
committed
7009e5d
Merge pull request #90 from Social-projects-Rivne/feature/deleting_image_with_thumb
andrewRv
authored
a5c3787
Merge pull request #89 from Social-projects-Rivne/mod_panel
alevitsky
authored
5f78733
map thumbs fix
Ivan
committed
7c11dd8
Merge branch 'develop' into fix/map-thumbs
Ivan
committed
93541f0
add deletion attachments
KostSvitlana
committed
dc7f9ad
Merge pull request #91 from Social-projects-Rivne/fix/map-thumbs
NewIvanIvanov
authored
2237f3c
Merge branch 'develop' into feature/delete_attachment
KostSvitlana
authored
1374312
add blank lines
KostSvitlana
committed
2626c59
Merge branch 'feature/delete_attachment' of https://github.com/Social-projects-Rivne/rv-027py into feature/delete_attachment
KostSvitlana
committed
ccb6cee
Merge pull request #92 from Social-projects-Rivne/feature/delete_attachment
KostSvitlana
authored
ddf6b17

Commits on Dec 26, 2017

small fix
alevitsky
committed
e3b03a7
Merge pull request #94 from Social-projects-Rivne/mod_panel
alevitsky
authored
7e87a2e
heroku
Ivan
committed
3e1715e
heroku
Ivan
committed
1938ee2
pep8 fix
Ivan
committed
c9e9446
folders fix
Ivan
committed
a0c1043
folders fix
Ivan
committed
57f295a
folders fix
Ivan
committed
515209a
comfig fix
Ivan
committed
4feaacb
gitignore fix
Ivan
committed
0809087
add nickname field

”Alex
authored and
”Alex
committed
68f3120
add modal dialog
KostSvitlana
committed
ce88ec5
add users, some fix
KostSvitlana
committed
dcfa64f
Merge pull request #96 from Social-projects-Rivne/fix-deletions
KostSvitlana
authored
6fbc434
imgs fix
Ivan
committed
1db3925
resolve conflicts

”Alex
authored and
”Alex
committed
a0f1498
temporary add detailed_view back

”Alex
authored and
”Alex
committed
6251a51
fix merge
Ivan
committed
9103418
fix media conflict
Ivan
committed
f659311
pep8 fix
Ivan
committed
1a76232
fix issue status null, add show issue in table on profile, draggable marker in add issue
andrewRv
committed
051e261
Merge pull request #95 from Social-projects-Rivne/feature/heroku
NewIvanIvanov
authored
1f48251
fix search
KostSvitlana
committed
d00ba52
add whitespace
KostSvitlana
committed
5ca75bc
Merge pull request #99 from Social-projects-Rivne/feature/fixes
andrewRv
authored
abf649d
Merge pull request #97 from Social-projects-Rivne/add-users
KostSvitlana
authored
843fe46
comment fix
Ivan
committed
ba2545a
Merge pull request #101 from Social-projects-Rivne/fix/comment-width
NewIvanIvanov
authored
ad13c35
Merge pull request #100 from Social-projects-Rivne/fix-search
KostSvitlana
authored
706f075
change thumbnails url
KostSvitlana
committed
2aa52d6
Merge pull request #102 from Social-projects-Rivne/small-fix
KostSvitlana
authored
c9610bb
Merge pull request #98 from Social-projects-Rivne/feature/registration_update
forever-Agriculture
authored
940fdcd

Commits on Dec 27, 2017

heroku media fix
Ivan
committed
4f8960c
migrations fix
Ivan
committed
3f61c34
pep8
Ivan
committed
42ee014
deletion fix
Ivan
committed
0d3ceb2
import fix
Ivan
committed
f4001af
added migration
Ivan
committed
e299f06
Merge pull request #104 from Social-projects-Rivne/fix/heroku-media
NewIvanIvanov
authored
0f452cd
Merge pull request #105 from Social-projects-Rivne/fix/migration
NewIvanIvanov
authored
6cdb3bb
details fix
Ivan
committed
a6a6c43
Merge pull request #106 from Social-projects-Rivne/fix/close-issue-details
NewIvanIvanov
authored
3121f17
table script
Ivan
committed
65122ee
init commit

”Alex
authored and
”Alex
committed
99b85e5
pep8 fix
Ivan
committed
6b1facc
change test comments
andrewRv
committed
52cb23e
Merge pull request #107 from Social-projects-Rivne/feature/table-script
NewIvanIvanov
authored
ad6b30e
show errors in user-edit form
andrewRv
committed
cc385d8
Merge pull request #109 from Social-projects-Rivne/feature/improvements
andrewRv
authored
0ae6f76
add a shameful template

”Alex
authored and
”Alex
committed
0f15968
style buttons
Oksana098
committed
e374c29
resolve develop conflicts

”Alex
authored and
”Alex
committed
342d8ab
conflicts resolving 2 attempt

”Alex
authored and
”Alex
committed
d75d0cb
flask image deletion fix
Ivan
committed
5694bde
the 3rd attempt

”Alex
authored and
”Alex
committed
c685564
modify permissions

”Alex
authored and
”Alex
committed
1832c87
small fix
Ivan
committed
0621cd5
add detailed_issue back to resolve conflict with user profile

”Alex
authored and
”Alex
committed
ed5b983
fix a registration button

”Alex
authored and
”Alex
committed
a24dec0
Merge pull request #110 from Social-projects-Rivne/fix/flask-delete
NewIvanIvanov
authored
62d93f0
fix/change_comments: update public and private messages
Oksana098
committed
2742483

Commits on Dec 28, 2017

fix internal
Oksana098
committed
e0e2c43
Merge pull request #111 from Social-projects-Rivne/fix/add_a_shameful_template
forever-Agriculture
authored
9df380a
update requirements
alevitsky
committed
99dd004
add bootstrap class for button
Oksana098
committed
8a275fd
improve links and buttons url
alevitsky
committed
6f3ef40
changing registration

”Alex
authored and
”Alex
committed
b11e684
add modal to delete/restore issues, small improve modify user
alevitsky
committed
0b99b36
deleted column avatar, aligned text
KostSvitlana
committed
28358cf
change template
andrewRv
committed
90e4d3a
improve modal window
alevitsky
committed
edc4b68
small fix
alevitsky
committed
8254f83
small fix
alevitsky
committed
bff75f2
change thumbnail size
KostSvitlana
committed
60baa33
Merge pull request #114 from Social-projects-Rivne/some-fix
KostSvitlana
authored
d7dd902
profile improvements
andrewRv
committed
513965f
deletion fix
Ivan
committed
770f663
profile improvements
andrewRv
committed
8ea4d04
profile improvements
andrewRv
committed
68eac23
add message style
KostSvitlana
committed
35fc6f7
some fix
KostSvitlana
committed
0d3a18c
Merge pull request #115 from Social-projects-Rivne/size-thumbnail
KostSvitlana
authored
06b1ec1
Merge pull request #117 from Social-projects-Rivne/feature/improvements_profile
andrewRv
authored
ad84cd3
Merge pull request #119 from Social-projects-Rivne/fix-alerts
KostSvitlana
authored
823c2a5
Merge pull request #118 from Social-projects-Rivne/fix/flask-delete
NewIvanIvanov
authored
6ca4565
attachments
alevitsky
committed
d0a899f
change link on issues list
andrewRv
committed
4263470
change link on issues list
andrewRv
committed
27d6459
Merge pull request #120 from Social-projects-Rivne/feature/issue_deatails_template
forever-Agriculture
authored
8f76753
add new registration params

”Alex
authored and
”Alex
committed
ec4f9a3
Merge remote-tracking branch 'origin/develop' into fix/registration_params

”Alex
authored and
”Alex
committed
90479e4
merge with develop
Oksana098
committed
1b8075e
merge with develop
Oksana098
committed
b6afb9e
Merge branch 'develop' of https://github.com/Social-projects-Rivne/rv-027py into develop
Oksana098
committed
92b1f4a
fix template
andrewRv
committed
2944846
Merge pull request #122 from Social-projects-Rivne/template_fix
andrewRv
authored
f1240db
small fix
andrewRv
committed
3460ba3
Merge pull request #123 from Social-projects-Rivne/small_fix
andrewRv
authored
09bfd46
fix map comments
Ivan
committed
8bc3a1b
Merge pull request #124 from Social-projects-Rivne/fix/map-comments
NewIvanIvanov
authored
4be91b0
fix buttons
KostSvitlana
committed
e999698
resolve registration forever

”Alex
authored and
”Alex
committed
af99c45
Merge remote-tracking branch 'origin/develop' into fix/registration_params

”Alex
authored and
”Alex
committed
bd7bddf
add mod comments
alevitsky
committed
d64c443
small improve
alevitsky
committed
6ea99a2
fix comments

”Alex
authored and
”Alex
committed
e468acd
small fix
alevitsky
committed
d5da6c6
fix pep8

”Alex
authored and
”Alex
committed
e3311b3
fix new line

”Alex
authored and
”Alex
committed
3452a7e

Commits on Dec 29, 2017

Merge pull request #127 from Social-projects-Rivne/fix_mod_panel
alevitsky
authored
2540601
resolve conflict in forms

”Alex
authored and
”Alex
committed
9bc8073
Merge pull request #128 from Social-projects-Rivne/fix/registration_params
forever-Agriculture
authored
87a6f36
Merge pull request #125 from Social-projects-Rivne/comments-btn
forever-Agriculture
authored
c5b96ef
small fix
andrewRv
committed
601f84a
Merge pull request #129 from Social-projects-Rivne/hotfix
andrewRv
authored
4fbb231
bring Oksana back to the game

”Alex
authored and
”Alex
committed
52b78e9
Merge pull request #130 from Social-projects-Rivne/fix/bring_oksana_back
forever-Agriculture
authored
13ce6fd