Commit graph

393 commits

Author SHA1 Message Date
Ashwin Kumar
8288609fe0
Merge pull request #361 from ashwin31/ashwin
cleanup
2020-02-23 20:15:48 +05:30
Ashwin
99b6d23a4a cleanup 2020-02-23 19:53:26 +05:30
Ashwin Kumar
ae38cdce76
Merge pull request #360 from ashwin31/ashwin
cleanup
2020-02-23 18:40:03 +05:30
Ashwin
fafc8b9b2a cleanup 2020-02-23 18:39:26 +05:30
Ashwin Kumar
209a4869ec
Merge pull request #359 from ashwin31/ashwin
added docs
2020-02-23 17:15:48 +05:30
Ashwin
513d379448 added docs 2020-02-23 17:14:43 +05:30
Ashwin
31a5340aa3 added docs 2020-02-22 17:51:06 +05:30
Ashwin Kumar
1ffb78a1e9
Update requirements.txt 2020-02-06 11:00:11 +05:30
Ashwin Kumar
d95ceb99ba
Merge pull request #326 from montao/patch-1
Fix typo in spelling
2019-12-06 12:01:02 +05:30
Niklas Rosencrantz
1e7068beb1
Fix typo in spelling
I just changed the spelling of a word, which looked like it was a typo
2019-12-05 17:56:25 +01:00
Ashwin Kumar
ed65931454
Merge pull request #316 from MicroPyramid/readme
Added multi page document for sales & marketing modules
2019-10-01 09:24:49 +05:30
vineesha
1d3246c2e3 Updated version number in conf file 2019-09-27 18:49:03 +05:30
vineesha
07ca0e2302 Added multi page document for sales & marketing modules 2019-09-27 18:36:29 +05:30
nikhila05
71a5f8d463
fixed teams, assigned users issue in lead edit, fixed elasticsearch issues (#315)
* 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

* added unsubscribe template  in campaigns, displayed contacts count in contacts list view pages

* improved performance in leads list page, added cache for queries

* fixed teams select issue, added option for email host in settings file

* fixed teams, assigned users issue in lead edit, fixed elasticsearch issue
2019-09-27 18:22:51 +05:30
nikhila05
6a294fef9d
Added option for email host in settings file, fixed teams select issue (#314)
* 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

* added unsubscribe template  in campaigns, displayed contacts count in contacts list view pages

* improved performance in leads list page, added cache for queries

* fixed teams select issue, added option for email host in settings file
2019-09-27 18:07:16 +05:30
nikhila05
ee038cf898
improved performance in leads list page, added cache for queries (#311)
* 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

* added unsubscribe template  in campaigns, displayed contacts count in contacts list view pages

* improved performance in leads list page, added cache for queries
2019-09-25 19:17:48 +05:30
chaitanya
c73a82e133 version update 2019-09-24 22:22:15 +05:30
nikhila05
d3e32b3a7b
added unsubscribe template in campaigns, displayed contacts count in contacts list view pages (#308)
* 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

* added unsubscribe template  in campaigns, displayed contacts count in contacts list view pages
2019-09-24 17:58:31 +05:30
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