Commit graph

225 commits

Author SHA1 Message Date
Ashwin Kumar
f4e2344dfe
Merge pull request #303 from iColdPlayer/master
Fixing Sass Issue in Development Mode
2019-09-24 11:25:24 +05:30
icoldplayer
81618a23cd fixing sass issue in development mode 2019-09-24 01:39:45 +07:00
icoldplayer
9e0cfcfff7 fixing sass issue in development mode 2019-09-24 01:36:15 +07:00
chaitanya
3856e1307b version update 2019-09-23 23:52:25 +05:30
nikhila05
8a0994e79a
blocked domain and email filter in sales, elasticsearch related changes (#301)
* updated testcases, update code for account view page, modified code for attachments and comments for assigned user

* updated testcases in events, invoices, tasks modules

* added duplicate contacts tabs, fixed time format in marketing campaign list page, added test cases in marketing, added contacts list filter in contacts page

* updated requirements

* added email search using elasticsearch, changes for unsubscribing contacts, added blocked emails, domains in settings pages

* added elasticsearch in travis file

* blocked domain and email filter in sales, elasticsearch related changes
2019-09-20 12:00:58 +05:30
nikhila05
3696b76ef9
added email search using elasticsearch, changes for unsubscribing contacts, added blocked emails, domains in settings pages (#299)
* updated testcases, update code for account view page, modified code for attachments and comments for assigned user

* updated testcases in events, invoices, tasks modules

* added duplicate contacts tabs, fixed time format in marketing campaign list page, added test cases in marketing, added contacts list filter in contacts page

* updated requirements

* added email search using elasticsearch, changes for unsubscribing contacts, added blocked emails, domains in settings pages

* added elasticsearch in travis file
2019-09-18 16:59:22 +05:30
nikhila05
36f2552950
Update README.rst 2019-09-12 12:14:24 +05:30
nikhila05
a7365e3520
Update requirements.txt 2019-09-12 11:39:18 +05:30
nikhila05
8eebc15f37
added documentation badge 2019-09-12 11:34:56 +05:30
nikhila05
4bfe698968
updated requirements (#286)
* updated testcases, update code for account view page, modified code for attachments and comments for assigned user

* updated testcases in events, invoices, tasks modules

* added duplicate contacts tabs, fixed time format in marketing campaign list page, added test cases in marketing, added contacts list filter in contacts page

* updated requirements
2019-09-10 14:16:12 +05:30
Ashwin Kumar
2915e6da0e
Update README.rst 2019-09-10 12:43:08 +05:30
Jacob Sayles
75681a8e0f Introduced local settings file for private settings (#282)
* Introduced local settings file to house settings that should not be in source control.

* added sorl-thumbnail requirement
2019-09-10 11:49:20 +05:30
Fabrizio
4195978f53 fix: prevents basic users from seeing other users' tags (#276)
* fix: prevents basic users from seeing other users' tags

* if a basic user edit a leads he loses the assignment (the assigned_to field) and the lead disappears

* fix: wrong profile pic
2019-09-10 11:45:41 +05:30
nikhila05
4c68206529
updated redis service in travis yml 2019-09-10 11:21:08 +05:30
nikhila05
6b7dc3fe18
added duplicate contacts tabs, fixed time format in marketing campaign list page, added test cases in marketing, added contacts list filter in contacts page (#284)
* updated testcases, update code for account view page, modified code for attachments and comments for assigned user

* updated testcases in events, invoices, tasks modules

* added duplicate contacts tabs, fixed time format in marketing campaign list page, added test cases in marketing, added contacts list filter in contacts page
2019-09-10 11:17:05 +05:30
nikhila05
df4fa9758e
updated testcases in events, invoices, tasks modules (#272)
* updated testcases, update code for account view page, modified code for attachments and comments for assigned user

* updated testcases in events, invoices, tasks modules
2019-08-23 10:48:41 +05:30
nikhila05
3bc30d3c95
updated testcases, update code for account view page, modified code for attachments and comments for assigned user (#270) 2019-08-14 14:16:43 +05:30
Ashwin Kumar
46f1a1bbb0
Merge pull request #269 from MicroPyramid/dev
enhanced apps
2019-08-14 12:43:35 +05:30
Ashwin
cc339a96d1 enhanced apps 2019-08-14 12:42:46 +05:30
chaitanya
81e5d91d17 version update 2019-08-03 09:29:44 +05:30
Fabrizio
57a67d62b6 Added missing ugettext_lazy (#264) 2019-08-02 14:13:53 +05:30
nikhila05
c23425a2f0
modified code for invoices, changed styles in dasboards, changed code in accounts edit for normal user, fixed github issues (#263) 2019-08-01 16:10:39 +05:30
Ashwin Kumar
3eeb8b55b5
Merge pull request #256 from MicroPyramid/dev
marketing module and invoicing enhancements
2019-07-11 20:07:45 +05:30
Ashwin
abcd47f600 marketing module and invoicing enhancements 2019-07-11 20:07:12 +05:30
Ashwin Kumar
b41b0fe7a1
Merge pull request #253 from MicroPyramid/dev
added modals to list pages
2019-07-05 13:26:21 +05:30
Ashwin
34276e658a added modals to list pages 2019-07-05 13:25:41 +05:30
Ashwin Kumar
d0d28f71a4
Merge pull request #246 from MicroPyramid/dev
towards 0.4 and some fixes
2019-07-05 11:00:09 +05:30
Ashwin
15bbb94818 towards 0.4 and some fixes 2019-07-05 10:57:48 +05:30
Ashwin Kumar
153c8d7deb
Merge pull request #242 from MicroPyramid/dev
added teams and other fixes
2019-07-04 12:27:51 +05:30
Ashwin
1441ee76af added teams and other fixes 2019-06-26 19:04:17 +05:30
nikhila05
bbe7eb7a4d
added filters based on created users, modified code for unsubscribe, displayed related contact lists for all contacts (#240) 2019-06-24 19:27:08 +05:30
chaitanya
fe9b1de337 version update 2019-06-19 00:13:26 +05:30
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