Commit graph

72 commits

Author SHA1 Message Date
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
Ashwin
10ce90b297 Merge branch 'master' of github.com:MicroPyramid/Django-CRM into ashwin_fixes 2018-05-25 11:47:24 +05:30
Ashwin
1860659fac bug fixes 2018-05-25 11:46:54 +05:30
Ashwin Kumar
0e23b4fcbb
Update README.rst 2018-04-21 11:56:16 +05:30
Ashwin Kumar
86474e4ee9
Merge pull request #50 from ashwin31/ashwin_fixes
new ui
2018-04-20 18:30:21 +05:30
Ashwin
61c13ff63b Merge branch 'master' of github.com:MicroPyramid/Django-CRM into ashwin_fixes 2018-04-20 18:23:09 +05:30
Ashwin
3985b6a2aa new design 2018-04-20 18:22:37 +05:30
Ashwin Kumar
b19abcc296
Merge pull request #47 from ashwin31/ashwin_fixes
restructuring
2018-04-13 18:31:47 +05:30
Ashwin
e95c34528c restructuring 2018-04-13 18:30:42 +05:30
Ashwin Kumar
2f1e92e272
Merge pull request #46 from ashwin31/ashwin_fixes
code cleaning
2018-04-12 17:16:37 +05:30
Ashwin
df0830b93c code cleaning 2018-04-12 17:15:10 +05:30
Ashwin Kumar
e8cfc91f92
Merge pull request #43 from ashwin31/ashwin_fixes
Ashwin fixes
2018-04-12 13:18:35 +05:30
Ashwin
d10b64a2b5 fixed conflicts 2018-04-12 13:18:02 +05:30
Ashwin
5a3509c7b7 fixed tests 2018-04-12 13:12:31 +05:30
Ashwin Kumar
75ac3a39a5 0.2 (#37) 2018-04-12 09:47:09 +05:30
Ashwin Kumar
4301e91114
Update README.rst 2018-04-11 23:13:56 +05:30
Ashwin
32b6cd72f2 0.2 2018-04-11 22:21:51 +05:30
nikhila05
384aaec907
updated demo url 2018-04-10 11:03:39 +05:30
Ashwin Kumar
bdc0582a21
Merge pull request #35 from ashwin31/ashwin_fixes
Ashwin fixes
2018-04-09 14:33:25 +05:30
Ashwin
601c549eb2 removed compiled css 2018-04-09 14:32:21 +05:30
Ashwin
2c8094c03c removed compiled css 2018-04-09 14:31:34 +05:30
Ashwin Kumar
bcaff7d767
Delete ref.scssc 2018-04-09 12:41:06 +05:30
Ashwin Kumar
3c8dbd08a4
Delete main.scssc 2018-04-09 12:40:58 +05:30
Ashwin Kumar
63100ceaac
Delete ref.scssc 2018-04-09 12:40:41 +05:30
Ashwin Kumar
691df10fa1
Delete main.scssc 2018-04-09 12:40:32 +05:30
Ashwin Kumar
93b972c363
Update index.rst 2018-04-09 11:23:32 +05:30
Ashwin Kumar
9af784969b
Merge pull request #34 from ashwin31/ashwin_fixes
update installation instructions
2018-04-09 11:10:08 +05:30
Ashwin
32e002bcdc update installation instructions 2018-04-09 11:09:22 +05:30
Ashwin Kumar
678dd08279
Merge pull request #33 from kitten77/master
added a depency to installation in readme
2018-04-08 08:25:15 +05:30
piss off
1580a2fd75 added a depency to installation in readme 2018-04-07 10:14:45 +02:00
Ravi kumar
7989d2b086
Merge pull request #30 from MicroPyramid/ci_fix
sass path
2018-04-06 12:13:02 +05:30
ravi
787590e776 sass path 2018-04-06 12:10:09 +05:30
ravi
53f8dbcb7f add sass install to before install 2018-04-06 12:00:39 +05:30
Ashwin Kumar
8e6c9f5326
Merge pull request #29 from ashwin31/ashwin_fixes
fixed teams
2018-04-05 21:14:20 +05:30
Ashwin
28aa234cf8 fixed teams 2018-04-05 21:13:32 +05:30
Ashwin Kumar
adcbaa1673
Merge pull request #28 from ashwin31/ashwin_fixes
fixed user details
2018-04-05 18:15:14 +05:30
Ashwin
0fc7edffe7 fixed user details 2018-04-05 18:14:22 +05:30
nikhila05
3c3bc9b25d
Update .travis.yml 2018-04-05 11:52:47 +05:30
nikhila05
f43716e98e
Updated .travis.yml file 2018-04-05 11:41:00 +05:30
nikhila05
2f8b1feef5
Updated .travis.yml file 2018-04-05 11:29:44 +05:30
Ashwin Kumar
a0d059a216
Merge pull request #27 from ashwin31/ashwin_fixes
travis fix
2018-04-05 09:42:27 +05:30
Ashwin
74fe8b21a1 travis fix 2018-04-05 09:39:11 +05:30
Ashwin Kumar
50147b1375
Merge pull request #26 from ashwin31/ashwin_fixes
User management and other fixes
2018-04-05 09:37:13 +05:30