vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
20869 commits 1 branch 0 tags 587 MiB
Commit graph

280 commits

Author SHA1 Message Date
Rohan Bansal
edba86ceba fix: cyclical imports 2019-08-16 13:31:20 +05:30
Rohan Bansal
2109c7a984 feat: add conditional triggers for Webhook 2019-08-16 13:25:48 +05:30
sahil28297
63fc2a610e
fix(s3_backups): iterate over objects if objects are preseent 2019-08-02 16:21:14 +05:30
Rohan Bansal
3c221acd30 fix: add document meta fields in webhook selection 2019-07-29 18:03:14 +05:30
Himanshu Warekar
ad20d66896 refactor: Events Repeats On 2019-07-26 21:10:06 +05:30
Saurabh
6ac1024f11
Merge pull request #7922 from saurabh6790/develop 
fix: handle JobTimeoutException for s3
 2019-07-19 18:16:38 +05:30
Saurabh
2d11b811d6
Merge pull request #7901 from cjpit/ldap3v12upgrade 
feat: ldap group member upgrade v12
 2019-07-19 11:51:50 +05:30
Saurabh
1592c16102 fix: handle JobTimeoutException for s3 2019-07-17 15:47:21 +05:30
cameron
98bdb12755 add group ldap settings 2019-07-15 19:02:57 +08:00
Himanshu Warekar
ad377384e8 fix: remove validation from settings 2019-07-12 06:56:17 +05:30
Himanshu Warekar
3074af50f0 feat: move gmaps to erpnext 2019-07-10 11:21:17 +05:30
Himanshu
54551ed27c
Update frappe/integrations/doctype/google_settings/google_settings.py 
Co-Authored-By: Rohan <Alchez@users.noreply.github.com>
 2019-07-09 12:55:17 +00:00
Himanshu Warekar
2b97ecdd0e Merge branch 'develop' of https://github.com/frappe/frappe into gmaps 2019-07-08 20:25:49 +05:30
Himanshu Warekar
bda9d23d99 feat: rename entity to driver 2019-07-08 20:24:27 +05:30
Prssanna Desai
276bb8abcb fix(Dropbox): Make "Take Backup Now" button visible only if dropbox is enabled 2019-07-05 15:24:40 +05:30
Himanshu Warekar
5993c42d04 fix: validate if client is and secret both set 2019-07-05 09:24:54 +05:30
Himanshu Warekar
acce84ea0c fix:check if emails exist 2019-07-04 01:25:28 +05:30
Himanshu
15f8e19574 fix(Google Contacts): explicit db.commit (#7791) 2019-07-01 13:45:40 +05:30
Himanshu Warekar
2c56796e2d fix: import _ 2019-06-29 22:47:59 +05:30
Himanshu Warekar
4aac53a01f fix: rename enabled to enable 2019-06-29 21:58:46 +05:30
Himanshu Warekar
15633907be feat: refactor GMaps 2019-06-29 14:23:33 +05:30
Himanshu Warekar
b6e8af06fe feat: move to unified Google Settings 2019-06-28 23:56:40 +05:30
Faris Ansari
4a66d5284e
Merge pull request #7408 from scmmishra/web-form-refactor 
Web Form Refactor
 2019-06-25 18:52:09 +05:30
Saurabh
6a0b0a6762 fix: if start date exist only then pass it while creating subscription 2019-06-25 14:52:05 +05:30
Himanshu
dceb0d1b85 feat(Integration): Google Contacts Integration (#7625) 2019-06-20 11:26:07 +05:30
Nabin Hait
b375ee9eef fix: merge conflict 2019-06-18 18:45:21 +05:30
Shivam Mishra
bf24011cc4 Merge branch 'develop' of https://github.com/frappe/frappe into web-form-refactor 2019-06-13 10:46:08 +05:30
Shivam Mishra
6628f1d017 fix: dropbox exception formatting (#7597) 2019-06-03 12:13:55 +05:30
Saurabh
a44003d492 fix(paypal): Ignore if profile is already cancelled (#7622) 
* fix: ignore if profile already in cancelled state

* Update frappe/integrations/doctype/paypal_settings/paypal_settings.py

grammar fixes

Co-Authored-By: Suraj Shetty <surajshetty3416@gmail.com>
 2019-06-03 12:11:17 +05:30
Saurabh
80b5a8f177
Merge pull request #7621 from saurabh6790/ignore_if_profile_already_cancelled 
fix(paypal): Ignore if profile is already cancelled
 2019-06-03 10:59:52 +05:30
Saurabh
d65e607b7a
Merge pull request #7527 from saurabh6790/razopary_payent_capture_fix_hotfix 
fix: check payment status before capturing the payment
 2019-06-03 10:50:35 +05:30
Saurabh
b4d01ff8ee fix: ignore if profile already in cancelled state 2019-05-31 18:38:14 +05:30
Shivam Mishra
28c2231790 fix: redirect to bug in razorpay 2019-05-28 15:41:09 +05:30
Rushabh Mehta
1a7b7255df
Merge pull request #7448 from rasos/patch-1 
Apply Customer role instead of Blogger
 2019-05-23 15:10:43 +05:30
Saurabh
8612056aab fix: check payment status before capturing the payment 2019-05-21 16:27:18 +05:30
Saurabh
b7bd247ff4 fix: before capturing payment first check payment status 2019-05-21 16:23:23 +05:30
Nabin Hait
d7527fab79 fix: Allow eligible fields to be updated from notifications (#7518) 2019-05-21 14:49:58 +05:30
Nabin Hait
f4778027d6 fix: Allow eligible fields to be updated from notifications (#7517) 2019-05-21 14:49:55 +05:30
cameron
7c8cd45bbf ldap3 changes 2019-05-15 16:35:00 +08:00
Saurabh
df6a41045e
Merge pull request #7378 from cjpit/ldap3upgrade 
feat: Ldap rewrite/upgrade
 2019-05-15 13:02:06 +05:30
Roland
6792b59353
Apply Customer role instead of Blogger 2019-05-10 13:55:14 +02:00
cameron
42045552ac convert spaces to tabs 2019-05-03 23:28:23 +08:00
Nabin Hait
d7cd3cab21
patch: remove user perm for page and report doctype (#7383) 
* fix: status options for integration request

* patch: remove user perm for page and report doctype
 2019-05-01 15:53:16 +05:30
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
Suraj Shetty
901a9b9a1c
Merge pull request #7210 from josejibin/fix/oauth2-login-python3 
fix: Social login in Python3
 2019-04-29 13:38:18 +05:30
Rushabh Mehta
c69204f0b4
Merge pull request #7133 from alyf-de/gsuite_autocomplete 
feat(integrations): add autocomplete to gsuite templates
 2019-04-24 14:35:09 +05:30
Raffael Meyer
d3dac2f86e rm unnecessary functions 2019-04-14 00:20:59 +02:00