Commit graph

205 commits

Author SHA1 Message Date
Saurabh
df6a41045e
Merge pull request #7378 from cjpit/ldap3upgrade
feat: Ldap rewrite/upgrade
2019-05-15 13:02:06 +05:30
cameron
42045552ac convert spaces to tabs 2019-05-03 23:28:23 +08:00
Nabin Hait
3522593e5e patch: remove user perm for page and report doctype (#7382)
* fix: status options for integration request

* patch: remove user perm for page and report doctype
2019-05-01 14:44:33 +05:30
cameron
c4ea153d4f remove ldap3 import, cleanup syntax 2019-04-30 09:53:44 +08:00
cameron
eb9d2e6182 add tests for cert files. 2019-04-29 23:21:50 +08:00
cameron
0ef3130ebd Initial update to ldap3 2019-04-29 22:59:52 +08:00
Charles-Henri Decultot
4c483f0015 fix: Google calendar connexion + data migration tool 2019-03-26 09:51:10 +00:00
Ishan Loya
fa6707f4a1 Update timestamp (#6985)
Update timestamp to add endpoint_url field on migrate
2019-02-25 12:35:13 +05:30
rohitwaghchaure
4a1ee3e66f fix: modified date (#6854) 2019-01-30 11:07:13 +05:30
Aditya Hase
837bfc0995 fix(unicode): Import unicode_literals in every file (#6805)
* fix(unicode): Import unicode_literals in every file

* fix(unicode): Test if safe_json_loads return unicode instead of bytes
2019-01-25 11:56:27 +05:30
Saurabh
f5607f5b1b fix: update modified date for Dropbox Settings Doctype 2019-01-03 16:45:39 +05:30
Saurabh
dcdc66b459 [fix] remove unwanted imports 2018-12-18 23:15:39 +05:30
Saurabh
30d8841694 [fix] setup subscription datetime in utc format 2018-12-18 23:12:47 +05:30
Saurabh
087e401c78 Customize payment success message (#6460)
* Provision to set custom payment success message

* typo fix

* Fix formatting
2018-11-29 09:07:38 +05:30
Saurabh
0757c92713 [fix] razorpay subscription cancellation 2018-10-25 14:11:32 +05:30
Saurabh
dbe1e41775 [fix] pass form dict to validate function 2018-10-25 14:11:32 +05:30
Saurabh
fbc101db2d [fix] change modified date 2018-10-25 14:11:32 +05:30
Saurabh
0d260be0aa [fix] pass request type as Subscription Notification 2018-10-25 14:11:32 +05:30
Saurabh
3ce7ba4e5d [fix] add validations on payment notification callback 2018-10-25 14:11:32 +05:30
Saurabh
32c5f7a011 provision to handel paypal and razoapay subscription charge notifications 2018-10-25 14:11:32 +05:30
Charles-Henri Decultot
74057fdf55 [GCalendar Integration] All days events and incremental sync (#6197)
* All days events and incremental sync

* Remove trailing whitespace
2018-10-05 11:25:24 +05:30
Hemant Pema
ef284961e6
First attempt to fix ldap (#6181)
Hi, this is  a fix to "StartTLS is not supported"-Bug in LDAP integrations #6178

Please review and merge.
2018-10-04 16:58:14 +05:30
Saurabh
92e6ed0425 check for subscription id 2018-10-01 11:35:14 +05:30
Saurabh
c6e7fff3c4 [fix] call setup subscription and addons explicitly 2018-10-01 11:35:13 +05:30
Saurabh
f7c5a3ce26 fix for immediate subscriptions 2018-10-01 11:35:13 +05:30
Saurabh
5302af0dd1 remove debugging print statements 2018-10-01 11:35:13 +05:30
Saurabh
788943e663 finalize recurring payments for paypal 2018-10-01 11:35:13 +05:30
Saurabh
5344786737 finalize subscription razorpay 2018-10-01 11:35:13 +05:30
Saurabh
05b4f21016 setup addons on razorpay 2018-10-01 11:35:13 +05:30
Saurabh
b1bdd2f4ae Provision to cancel existing subscription 2018-10-01 11:35:13 +05:30
Saurabh
c802dd9701 setup upfront amount 2018-10-01 11:35:13 +05:30
Saurabh
b9ba7c691d [fix] razorpay subscription 2018-10-01 11:35:13 +05:30
Saurabh
d20fd4af65 Support for paypal subscription 2018-10-01 11:35:13 +05:30
Saurabh
2749f0ebbf Support for razorpay subscription and addons 2018-10-01 11:35:13 +05:30
Rohan Bansal
28d592e182 Move import inside function 2018-09-10 11:03:19 +05:30
Rohan Bansal
5c9e9d3311 Check if Google Maps is enabled when trying to get the client 2018-09-03 18:28:15 +05:30
Doridel Cahanap
acf8fd1adc Fix Backup Issue (#6039) 2018-09-03 10:57:03 +05:30
Zarrar
41d1446c04 functions already added in delivery_triip.py (#6027) 2018-08-29 16:05:47 +05:30
Saurabh
e88cbee727 add missing methods from google_maps to google_maps_settings (#6020) 2018-08-28 15:23:05 +05:30
Ameya Shenoy
fcb28d36ee Reverting file permissions (#6012) 2018-08-27 16:20:37 +05:30
Valmik
9f61c47bc1 Rename google maps doctype, add helper methods (#6001)
* rename google maps doctype, add helper methods

* fixed patch to use correct check
2018-08-27 11:13:44 +05:30
Saurabh
bece82d6ab Resolved merge conflicts 2018-08-07 12:47:01 +05:30
Ameya Shenoy
1d89dcea75
[minor][feature] make email for successful S3 backup optional 2018-08-06 22:49:37 +00:00
Ameya Shenoy
51d5577bb1
[minor][feature] make dropbox backup successful message optional 2018-08-06 22:38:40 +00:00
Charles-Henri Decultot
8fc2af64ad Allow custom confirmation page (#5835) 2018-07-19 12:50:35 +05:30
Rushabh Mehta
be61b74c2a [minor] remove check from update password, default dropbox broker 2018-07-17 18:14:57 +05:30
aherbhagya
201b193c62 An added checkbox in Dropbox setting for file upload (#5753)
* Added Custom check box for file upload

* removed half test file

* deleted test files

* deleted test files

* added patch to enable file backup in dropbox settings

* added patch to enable file backup in dropbox settings

* Update set_dropbox_file_backup.py

* Update set_dropbox_file_backup.py
2018-07-16 17:47:38 +05:30
felixvarghese
c55127f7a2 Connect to LDAP Server using StartTLS (#5784)
* Connect to LDAP Server using StartTLS

Connect to LDAP server using StartTLS for security. An option to require trusted certificates is also included.

* fix try

* remove trailing whitespace
2018-07-06 11:58:27 +05:30
KanchanChauhan
e12573db2e [Fix] Edit to Dropbox issue for private files fixed (#5730) 2018-06-27 09:36:40 +05:30
KanchanChauhan
917269129c [Fix] Dropbox issue for private files fixed (#5728) 2018-06-27 09:11:29 +05:30