Commit graph

393 commits

Author SHA1 Message Date
nikhila05
4f08cf7573
added tags field for campaign, changed styles for marketing module, added loading spinner and validation for file fields in campaign list create page, changes in marketing module (#238)
* added models contacts, contactlists, campaigns for marketing module & completed crud operations for email templates model in marketing, added contact list crud operations, sample csv file added for reference, updated actions icons in all list pages, fixed issue of getting closed leads in accounts create/edit pages

* completed crud operations to use email templates model, displaying contact list contacts and faile/invalid contacts, completed changes for new campaign, removed firstname and lastname as required and added title as required in leads create page, completed changes for Campaign email send with attachment

* added test cases in marketing, common modules, updated documentation and changed jquery plugin in campaign

* added mentions in comments section for all modules, added email templates when assigining a case or account, changed validation error messages in documents create and edit pages, added thumbnails for attachments in all detail pages

* added tags field for campaign, changed styles for marketing module, added loading spinner and validation for file fields in campaign list create page, changes in marketing module
2019-06-18 17:48:03 +05:30
nikhila05
12de7e6c62
New changes (#226)
added test cases in marketing, common modules, updated documentation and changed jquery plugin in campaign
2019-04-09 18:46:29 +05:30
Ashwin Kumar
9d5961fafd
Merge pull request #220 from davestgermain/dcs/add-manifest
Added manifest file to make sure templates and static files are installed with the apps
2019-04-09 13:26:26 +05:30
Dave St.Germain
51051b0b04 Added manifest file to make sure templates and static files are installed with the apps 2019-04-01 15:48:28 -04:00
jagadeeshv16
da0513a7c5
Merge pull request #219 from jtr860830/master
Fix docker-compose start up order
2019-03-28 19:15:27 +05:30
Jezrien Hsieh
a826e5d418 Fix docker-compose start up order
Add db.env --> store shared database environment variables
Add wait-for-postgres.sh --> let crm container run django server after
database being ready to connect
2019-03-28 18:39:33 +08:00
jagadeeshv16
e4f59edfc1
Merge pull request #216 from jtr860830/master
Update Dockerfile and docker-compose.yml
2019-03-28 04:19:42 +05:30
nikhila05
e2772eca8a
New changes (#218)
* added models contacts, contactlists, campaigns for marketing module & completed crud operations for email templates model in marketing, added contact list crud operations, sample csv file added for reference, updated actions icons in all list pages, fixed issue of getting closed leads in accounts create/edit pages

* completed crud operations to use email templates model, displaying contact list contacts and faile/invalid contacts, completed changes for new campaign, removed firstname and lastname as required and added title as required in leads create page, completed changes for Campaign email send with attachment
2019-03-22 15:15:24 +05:30
Jezrien Hsieh
5dcf327673 Update Dockerfile and docker-compose.yml
Install missing dependencies
2019-03-15 03:18:48 +08:00
nikhila05
88ae667245
added models contacts, contactlists, campaigns for marketing module & completed crud operations for email templates model in marketing, added contact list crud operations, sample csv file added for reference, updated actions icons in all list pages, fixed issue of getting closed leads in accounts create/edit pages (#215) 2019-03-13 11:46:07 +05:30
jess
196a225578 Activating Open Collective (#213)
Hi, I'm making updates for Open Collective. Either you or a supporter signed this repo up for Open Collective. This pull request adds backers and sponsors from your Open Collective https://opencollective.com/django-crm❤️

It adds two badges at the top to show the latest number of backers and sponsors. It also adds placeholders so that the avatar/logo of new backers/sponsors can automatically be shown without having to update your README.md. [more info](https://github.com/opencollective/opencollective/wiki/Github-banner). See how it looks on this [repo](https://github.com/apex/apex#backers).

You can also add a postinstall script to let people know after npm|yarn install that you are welcoming donations (optional). [More info](https://github.com/OpenCollective/opencollective-cli)
You can also add a "Donate" button to your website and automatically show your backers and sponsors there with our widgets. Have a look here: https://opencollective.com/widgets

P.S: As with any pull request, feel free to comment or suggest changes. The only thing "required" are the placeholders on the README because we believe it's important to acknowledge the people in your community that are contributing (financially or with code!).

Thank you for your great contribution to the open source community. You are awesome! 🙌
And welcome to the open collective community! 😊

Come chat with us in the #opensource channel on https://slack.opencollective.com - great place to ask questions and share best practices with other open source sustainers!
2019-03-05 11:52:04 +05:30
Ashwin Kumar
405b7d3196
Merge pull request #212 from MicroPyramid/dev
prepping to merge apps
2019-02-27 13:32:14 +05:30
Ashwin
7b81cb364a prepping to merge apps 2019-02-27 13:31:32 +05:30
nikhila05
c952b7102b
fixed issue of Normal user shouldn't able to see accounts, contacts, leads, opportunities, cases assigned to other users, displaying all the records based on loggedin user profile, displaying no records message when there are no items, no displaying closed accounts & leads in create/edit pages (#210)
* added django storages, loading local or aws storages based on env variable, removed reset password option for loggedin user, fixed issue of account edit in account list, removed address text in leads create page, properly aligining attachments, fixed issue of unable to see assigned contacts in edit account page

* added source column in leads list page, fixed issue converting leads to accounts in leads view page, displaying billing address details in accounts view page, added more colors for tags

* fixed issue of Normal user shouldn't get edit & delete options under actions in document list page, displaying contacts in account detail page, APISettings modal updated with website field and also CRUD opearations views respective to website field

* fixed issue of Normal user shouldn't able to see accounts, contacts, leads, opportunities, cases assigned to other users, displaying all the records based on loggedin user profile, displaying no records message when there are no items, no displaying closed accounts & leads in create/edit pages
2019-02-25 13:06:09 +05:30
nikhila05
65db196826
fixed issue of Normal user shouldn't get edit & delete options under actions in document list page, displaying contacts in account detail page, APISettings modal updated with website field and also CRUD opearations views respective to website field (#209)
* added django storages, loading local or aws storages based on env variable, removed reset password option for loggedin user, fixed issue of account edit in account list, removed address text in leads create page, properly aligining attachments, fixed issue of unable to see assigned contacts in edit account page

* added source column in leads list page, fixed issue converting leads to accounts in leads view page, displaying billing address details in accounts view page, added more colors for tags

* fixed issue of Normal user shouldn't get edit & delete options under actions in document list page, displaying contacts in account detail page, APISettings modal updated with website field and also CRUD opearations views respective to website field
2019-02-20 13:20:42 +05:30
nikhila05
24788d8d9f
Alpha issues (#208)
* added django storages, loading local or aws storages based on env variable, removed reset password option for loggedin user, fixed issue of account edit in account list, removed address text in leads create page, properly aligining attachments, fixed issue of unable to see assigned contacts in edit account page

* added source column in leads list page, fixed issue converting leads to accounts in leads view page, displaying billing address details in accounts view page, added more colors for tags
2019-02-18 19:10:47 +05:30
nikhila05
c6cecb41a0
added django storages, loading local or aws storages based on env variable, removed reset password option for loggedin user, fixed issue of account edit in account list, removed address text in leads create page, properly aligining attachments, fixed issue of unable to see assigned contacts in edit account page (#207) 2019-02-18 14:15:58 +05:30
Ashwin Kumar
5076b09c70
Merge pull request #205 from MicroPyramid/dev
contacts added to leads and accounts
2019-02-14 12:59:43 +05:30
Ashwin
6503ee1fe3 contacts added to leads and accounts 2019-02-14 12:34:29 +05:30
Ashwin Kumar
3f1143b381
Merge pull request #204 from MicroPyramid/dev
indentation and quality
2019-02-12 15:37:06 +05:30
Ashwin
d5a8f5559c Merge branch 'master' of github.com:MicroPyramid/Django-CRM into dev 2019-02-12 15:36:21 +05:30
Ashwin
a4791540a9 indentatio and quality 2019-02-12 15:36:02 +05:30
Ashwin Kumar
4d5fefb7cb
Merge pull request #200 from MicroPyramid/dev
started test case enhancements
2019-02-12 04:37:27 +05:30
Ashwin
18c810e956 started test case enhancements 2019-02-12 04:36:35 +05:30
Ashwin Kumar
0b0551e7dd
Merge pull request #193 from MicroPyramid/dev
started test case enhancements
2019-02-11 12:08:30 +05:30
Ashwin
47b84b267b started test case enhancements 2019-02-11 11:59:25 +05:30
Ashwin Kumar
19645dcc15
Merge pull request #192 from MicroPyramid/dev
removed github folder
2019-02-10 16:14:47 +05:30
Ashwin
5f1d7026f1 Merge branch 'master' of github.com:MicroPyramid/Django-CRM into dev 2019-02-10 16:14:09 +05:30
Ashwin
32f77cfcdc enhanced UI 2019-02-10 16:12:35 +05:30
Ashwin
fc19101a49 enhanced UI 2019-02-08 16:46:42 +05:30
Ashwin Kumar
eae2fe4ce3
Merge pull request #189 from MicroPyramid/dev
enhanced UI
2019-02-07 22:09:26 +05:30
Ashwin
29fae7cd51 enhanced UI 2019-02-07 22:01:00 +05:30
Ashwin Kumar
646dfefdda
Merge pull request #184 from MicroPyramid/dev
enhanced UI
2019-02-06 22:31:09 +05:30
Ashwin
071572b550 Merge branch 'master' of github.com:MicroPyramid/Django-CRM into dev 2019-02-06 22:05:33 +05:30
Ashwin
6111f957ff enhanced UI 2019-02-06 22:04:29 +05:30
Ashwin Kumar
9933d375a5
Merge pull request #181 from MicroPyramid/dev
Enhanced UI
2019-02-06 11:45:54 +05:30
Ashwin
26b73175df enhanced UI 2019-02-05 21:30:30 +05:30
Ashwin Kumar
982ba50165
Merge pull request #179 from MicroPyramid/dev
added documents status, active, inactive
2019-02-04 15:32:44 +05:30
Ashwin
210ce86b60 Merge branch 'master' of github.com:MicroPyramid/Django-CRM into dev 2019-02-04 15:31:51 +05:30
Ashwin
2d6a8a8717 added documents status, active,inactive 2019-02-04 15:30:09 +05:30
Ashwin Kumar
c1fa8309d3
Merge pull request #178 from MicroPyramid/dev
Status feild added in accounts module
2019-02-04 15:14:55 +05:30
Ashwin
3765dfc111 Status feild added in accounts module 2019-02-04 15:13:27 +05:30
Ashwin Kumar
0b9db6d5cc
Merge pull request #177 from MicroPyramid/dev
added user view page
2019-02-04 14:58:38 +05:30
Ashwin
d22ea8df7d added user view page 2019-02-04 14:57:39 +05:30
Ashwin Kumar
4b7831ac6c
Merge pull request #176 from MicroPyramid/dev
permission for admin to add attachments
2019-02-04 14:56:48 +05:30
Ashwin
4856531eb7 Implemented tags section in accounts and leads 2019-02-04 14:52:05 +05:30
Ashwin
44696a1bf1 permission for admin to add attachments 2019-02-04 14:35:41 +05:30
Ashwin Kumar
6cf4dd3388
Merge pull request #173 from MicroPyramid/dev
more coverage
2019-02-02 15:55:03 +05:30
Ashwin
8b99445e47 more coverage 2019-02-02 15:33:33 +05:30
Ashwin Kumar
a07952451f
added filter with status in user list pages
added filter with status in user list pages
2019-02-02 15:31:38 +05:30