Commit Graph

373 Commits

Author SHA1 Message Date
Rushabh Mehta
772095548e [fix] update paid status 2017-07-11 10:45:20 +05:30
Rushabh Mehta
e33c937d49 [fix] frappe image 2017-07-11 10:34:44 +05:30
Rushabh Mehta
b3d1881dd5 usd rates for conference 2017-07-10 08:41:38 +05:30
Rushabh Mehta
8c5de2301d email alert 2017-07-07 16:37:34 +05:30
Rushabh Mehta
adb4404d18 email alert and conference setting payment gateways 2017-07-07 11:55:12 +05:30
Rushabh Mehta
e9f8854f5e added conference page 2017-07-07 10:41:52 +05:30
Rushabh Mehta
52bbb12075 new foundation chapter 2017-07-06 12:09:03 +05:30
mbauskar
53efad3301 [minor] create service provider on membership payment 2017-06-14 13:35:52 +05:30
Rushabh Mehta
9649359bcd Merge pull request #27 from ashwinisave35/chapter_development
Chapter development
2017-05-23 12:40:50 +05:30
Ashwini Save
2219a4d840 Chapter view removing “none” from view. 2017-05-22 17:24:21 +05:30
Ashwini Save
7670e92af5 Change for Chapter Member details 2017-05-22 16:53:46 +05:30
Ashwini Save
cac5b3e016 Updated docType for Chapter Member. 2017-05-22 16:33:51 +05:30
Ashwini Save
8492b12824 Merge branch 'master' of https://github.com/erpnext/foundation into chapter_development
* 'master' of https://github.com/erpnext/foundation:
2017-05-22 16:26:47 +05:30
Ashwini Save
c52a249740 Foundation > Chapter > View Chapter details page changes for displaying user details. 2017-05-22 16:19:54 +05:30
Rushabh Mehta
46d1980e0e Merge pull request #25 from ashwinisave35/chapter_development
Updated page view for Chapters list and Individual Chapter view.
2017-05-22 15:17:03 +05:30
Ashwini Save
7a9e2e42ee “Leave Chapter” button added for Foundation -> Chapter section. 2017-05-19 11:42:08 +05:30
Ashwini Save
f2678cdf48 Feature for adding user data like website and Introduction for Chapter Members. 2017-05-16 14:17:36 +05:30
Ashwini Save
8c815c4897 Adding User details to Chapter Member docType. 2017-05-15 14:57:16 +05:30
Ashwini Save
cf4d74b10b Created View for Send Chapter Message to Chapter Members via email for ERPNext foudation. 2017-05-12 13:40:50 +05:30
Ashwini Save
8992da01be Updated text colour lighter grey for “Service Provider” view of Gold and Silver Member’s placeholder block. 2017-05-11 12:59:15 +05:30
ashwinisave35
708e5afbc0 Updated page view for Chapters list and Chapter single view. 2017-05-10 16:59:11 +05:30
Rushabh Mehta
4045f91cc6 [wip] added chapters 2017-05-08 18:14:00 +05:30
Saurabh
5ea10ff2fd Merge pull request #22 from rohitwaghchaure/master
[fix] NoneType object has no attribute startswith
2017-05-02 10:52:45 +05:30
Rohit Waghchaure
5d048a4e35 [fix] NoneType object has no attribute startswith, if website has not defined in the service provider's profile 2017-05-01 19:35:24 +05:30
Rushabh Mehta
f784ae346e [fix] site cleanups 2017-05-01 15:55:29 +05:30
Rushabh Mehta
a710da32da Merge pull request #9 from sagarvora/patch-2
[minor] spelling and grammar fix
2017-04-28 14:11:22 +05:30
Rushabh Mehta
aea53bfee3 Merge pull request #10 from sagarvora/patch-3
[minor] grammar fix
2017-04-28 14:11:10 +05:30
Faris Ansari
8d3dbcf896 Merge pull request #21 from netchampfaris/image-aspect-ratio-fix
[fix] Media object aspect ratio
2017-04-28 14:01:45 +05:30
Faris Ansari
da36c570e5 [fix] Media object aspect ratio 2017-04-13 16:29:45 +05:30
Saurabh
099d2144da Merge pull request #20 from saurabh6790/membership_payments
Membership payments
2017-04-11 18:38:17 +05:30
Saurabh
b0ba24d72c [fix] link service providers and members on membership subscription 2017-04-11 18:04:28 +05:30
Saurabh
4d6f067cb7 [fix] set member only once 2017-04-11 16:13:09 +05:30
Saurabh
c632cb0901 Merge pull request #19 from saurabh6790/membership_payments
[fix] provision to accept payments via razorpay
2017-04-10 20:58:06 +05:30
Saurabh
ac89e14b4e [fix] provision to accept payments via razorpay 2017-04-10 20:56:07 +05:30
Rushabh Mehta
367350ff21 [fix] contact view 2017-04-08 11:01:59 +05:30
Rushabh Mehta
c0fab7bb34 [fix] contact view 2017-04-08 11:01:20 +05:30
Rushabh Mehta
4588420af0 [fix] contact view 2017-04-08 10:56:24 +05:30
Rushabh Mehta
4427d7925b [fix] contact view 2017-04-08 10:54:00 +05:30
Rushabh Mehta
9a55423ffc listing fix 2017-04-07 10:07:37 +05:30
Saurabh
06508b036a Merge pull request #17 from saurabh6790/membership_payments
[fix] explicitly mentioned data security
2017-04-06 19:06:02 +05:30
Saurabh
cae7cb0001 [fix] explicitly mentioned data security 2017-04-06 19:05:04 +05:30
Saurabh
b396c569df Merge pull request #16 from saurabh6790/membership_payments
[fix] update privacy policy
2017-04-06 18:48:12 +05:30
Saurabh
f23bdb2b66 [fix] update privacy policy 2017-04-06 18:47:45 +05:30
Saurabh
c3e38d7f2e Update privacy.md 2017-04-06 18:21:36 +05:30
Saurabh
d9a7bafc9f Merge pull request #15 from saurabh6790/membership_payments
[fix] added privacy policy
2017-04-06 18:17:05 +05:30
Saurabh
60521d3f39 [fix] added privacy policy 2017-04-06 18:15:19 +05:30
Saurabh
65cd1cd988 Merge pull request #14 from saurabh6790/membership_payments
[minor][fix] caching and broken link fix for job-portal
2017-04-06 17:16:56 +05:30
Saurabh
c829af9d3b [minor][fix] caching and broken link fix for job-portal 2017-04-06 17:16:18 +05:30
Saurabh
f87b9386f8 Merge pull request #13 from saurabh6790/membership_payments
[fix] if payment is successful then mark membership status as paid an…
2017-04-03 12:48:36 +05:30
Saurabh
93dccea0cb [fix] if payment is successful then mark membership status as paid and show only paid memberships 2017-04-03 12:45:12 +05:30