Commit graph

114 commits

Author SHA1 Message Date
nikhila05
e64296c414
fixed search issue in user list page (#126)
* fixed search issue in user list page

* updated changes related to passwordreset
2018-10-16 09:45:56 +05:30
nikhila05
12226ebad3
updated displaying of assigned users in bullet format (#125)
updated displaying of assigned users
2018-10-15 18:17:03 +05:30
nikhila05
4cdd94c50b
added login page link in forgot password page (#124) 2018-10-15 18:07:35 +05:30
nikhila05
ef448ec901
displaying validation message in forgot password page, creating contacts, opportunitis, cases in account view page (#120)
* changed bread crumb in all update pages, displaying address properly in all view pages

* added dev settings

* displaying validation message in forgot password page, creating contacts, opportunitis, cases in account view page
2018-10-13 10:15:33 +05:30
juliusbentz
927e0882bb delete manage_local.py (#118) 2018-10-12 15:05:29 +05:30
nikhila05
00e72b6af9
Breadcrumb issues (#119)
* changed bread crumb in all update pages, displaying address properly in all view pages

* added dev settings
2018-10-12 15:04:44 +05:30
Ashwin Kumar
a96c6f1c21
Merge pull request #113 from juliusbentz/fix_contact_details_should_be_unique_#73
change fields phone and email on model customer to be unique
2018-10-11 14:54:18 +05:30
Ashwin Kumar
a0a801ad6d
Merge pull request #114 from juliusbentz/master
change import direction of dev_settings and ignore them
2018-10-11 14:53:14 +05:30
juliusbentz
c34cdc72e6 change fields phone and email on model customer to be unique 2018-10-09 23:13:25 +02:00
juliusbentz
a48df418b9 add venv to .gitignore 2018-10-09 22:49:39 +02:00
juliusbentz
0acdf08ff0 import dev_settings in settings.py; not the other way
development settings should be imported to settings.py 
development settings differ from one developer to anoteher so they shouldn't be tracked
2018-10-09 22:49:05 +02:00
nikhila05
1c18111c5a
updated django version 2018-10-09 18:49:08 +05:30
nikhila05
c0576a3d7d
added profile pic for user model, updated code to upload profile pic in user edit, few changes in list pages (#112)
* updated python version in travis yml file

* added 404 & 500 pages, updated text in account, cases, leads, contact, opportunity add edit pages

* updated debug to false, added local manage.py file

* updated the code to redirect to create page only after clicking on save & new in accounts page, updated text in forgot password

* Added the relevant place holders in all the forms, displaying error message in forgot password form

* updated django version for security reasons

* fixed issue of showing column names if there is no data in list pages, fixed design in comment update section, changed the url of cancel button in user update page

* added profile pic for user model, updated code to upload profile pric in user edit, few changes in list pages
2018-10-09 18:44:55 +05:30
nikhila05
56c9a74461
fixed issue of showing column names if there is no data in list pages, fixed design in comment update section, changed the url of cancel button in user update page (#111)
* updated python version in travis yml file

* added 404 & 500 pages, updated text in account, cases, leads, contact, opportunity add edit pages

* updated debug to false, added local manage.py file

* updated the code to redirect to create page only after clicking on save & new in accounts page, updated text in forgot password

* Added the relevant place holders in all the forms, displaying error message in forgot password form

* updated django version for security reasons

* fixed issue of showing column names if there is no data in list pages, fixed design in comment update section, changed the url of cancel button in user update page
2018-10-08 16:57:13 +05:30
nikhila05
a656b39ed1
Test fixes (#99)
* updated python version in travis yml file

* added 404 & 500 pages, updated text in account, cases, leads, contact, opportunity add edit pages

* updated debug to false, added local manage.py file

* updated the code to redirect to create page only after clicking on save & new in accounts page, updated text in forgot password

* Added the relevant place holders in all the forms, displaying error message in forgot password form

* updated django version for security reasons
2018-10-04 09:39:04 +05:30
nikhila05
2d11839276
Test fixes (#97)
* updated python version in travis yml file

* added 404 & 500 pages, updated text in account, cases, leads, contact, opportunity add edit pages

* updated debug to false, added local manage.py file

* updated the code to redirect to create page only after clicking on save & new in accounts page, updated text in forgot password

* Added the relevant place holders in all the forms, displaying error message in forgot password form
2018-10-04 09:31:31 +05:30
nikhila05
2c8c7f6f3a
updated the code to redirect to create page only after clicking on save & new in accounts page, updated text in forgot password (#93)
* updated python version in travis yml file

* added 404 & 500 pages, updated text in account, cases, leads, contact, opportunity add edit pages

* updated debug to false, added local manage.py file

* updated the code to redirect to create page only after clicking on save & new in accounts page, updated text in forgot password
2018-10-01 12:59:16 +05:30
nikhila05
4c39d5ed66
#75 added 404 & 500 pages, updated text in account, cases, leads, contact, opportunity add edit pages (#92)
added 404 & 500 pages, updated text in account, cases, leads, contact, opportunity add edit pages
2018-09-29 17:16:41 +05:30
nikhila05
5a67440f87
updated python version in travis yml file (#91) 2018-09-29 16:15:39 +05:30
Ashwin Kumar
fa156da439 code enhancements (#90) 2018-09-29 15:55:38 +05:30
Ashwin Kumar
efc50b22b1
Merge pull request #67 from ashwin31/ashwin_fixes
js fixes
2018-08-23 12:25:40 +05:30
Ashwin
d3f712a8ed js fixes 2018-08-23 12:23:29 +05:30
Ashwin Kumar
f0ee7ffff4
Merge pull request #66 from ashwin31/ashwin_fixes
js fixes
2018-08-23 12:11:40 +05:30
Ashwin
7459187435 js fixes 2018-08-23 12:10:58 +05:30
Ashwin Kumar
48ea6f172a
Merge pull request #65 from ashwin31/ashwin_fixes
js fixes
2018-08-22 20:44:37 +05:30
Ashwin
a87f747a83 js fixes 2018-08-22 20:43:34 +05:30
nikhila05
a4aee4f06c
Readme (#64)
* updated travis yml file

* removed xml files

* passsword reset issue fixed, updated html design with django-crm theme, added named urls in templates

* updated readme.rst file

* updated badges in readme.rst file

* added docker related badges in readme
2018-08-16 20:22:56 +05:30
Chaitanya
708e7c4201
Update Dockerfile 2018-08-09 14:27:29 +05:30
Chaitanya
c7dcae6bf7
Docker settings (#63)
* added docker compose files

* updated the version of docker image

* added author info

* updated the entry file
2018-08-09 10:48:11 +05:30
Chaitanya
3d9f00c19c
Docker settings (#62)
* added docker compose files

* updated the version of docker image

* added author info
2018-08-08 19:44:45 +05:30
nikhila05
53e5bd0fa5
Readme (#61)
* updated travis yml file

* removed xml files

* passsword reset issue fixed, updated html design with django-crm theme, added named urls in templates

* updated readme.rst file

* updated badges in readme.rst file
2018-08-05 20:38:13 +05:30
nikhila05
508e048d68
Reset password (#60)
* updated travis yml file

* removed xml files

* passsword reset issue fixed, updated html design with django-crm theme, added named urls in templates

* updated readme.rst file
2018-08-05 08:22:04 +05:30
nikhila05
ecc3e88e5b
Updated Readme file 2018-08-03 14:34:33 +05:30
Ashwin Kumar
982a001796
Merge pull request #59 from ashwin31/ashwin_fixes
converted to CBV
2018-08-02 12:35:00 +05:30
Ashwin
85c05df46b converted to CBV 2018-08-02 12:34:36 +05:30
Ashwin
1fa628c363 converted to CBV 2018-08-02 12:28:35 +05:30
nikhila05
d6315f7a98
updated travis yml file (#57)
* updated travis yml file

* removed xml files
2018-07-20 16:54:35 +05:30
Ashwin Kumar
00dcbc6e74
Merge pull request #56 from MicroPyramid/codacy
Codacy
2018-07-20 16:23:04 +05:30
nikhila05
7ab8bedff5 updated changes 2018-07-20 16:04:17 +05:30
nikhila05
a5b23a533d updated requirements 2018-07-20 13:46:52 +05:30
nikhila05
e4885530b6 updated changes 2018-07-20 13:26:13 +05:30
nikhila05
7aeb1ad0e7 updated codacy changes 2018-07-20 13:23:59 +05:30
nikhila05
469fcf6fbf Merge branch 'master' of https://github.com/MicroPyramid/Django-CRM into email_backends 2018-07-19 10:49:56 +05:30
Ashwin Kumar
d5f7715faa
Merge pull request #55 from codacy-badger/codacy-badge
Add a Codacy badge to README.rst
2018-07-18 15:15:17 +05:30
The Codacy Badger
e78cc567ef Add Codacy badge 2018-07-18 09:44:44 +00:00
nikhila05
f09eac8ea2
added pluggable email backends for aws ses, sendgrid, mandrill, mailgun, can send mail to active/inactive email ids with respective email senders (#54) 2018-07-17 16:03:20 +05:30
nikhila05
b209ff5501 added pluggable email backends for aws ses, sendgrid, mandrill, mailgun, can send mail to active/inactive email ids with respective email senders 2018-07-17 15:48:37 +05:30
Ashwin Kumar
689f259eb4
Merge pull request #53 from ashwin31/ashwin_fixes
fixed password reset
2018-05-30 14:12:13 +05:30
Ashwin
9bb57e5f17 fixed password reset 2018-05-30 14:11:16 +05:30
Ashwin Kumar
cf8c1b2acc
Merge pull request #52 from ashwin31/ashwin_fixes
bug fixes
2018-05-25 11:49:10 +05:30