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

253 commits

Author SHA1 Message Date
Nabin Hait
b375ee9eef fix: merge conflict 2019-06-18 18:45:21 +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
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
Raffael Meyer
b7d4a3145a make ID fields read only 2019-04-14 00:17:34 +02:00
Raffael Meyer
6f0ba6cf54 function out of scope, but with unique name 2019-04-13 23:59:24 +02:00
Raffael Meyer
5d14cdc44a put functions in scope 2019-04-12 19:56:26 +02:00
Raffael Meyer
4f7b33d863 feat(integrations): add region to S3 Backup Settings 2019-04-10 04:06:33 +02:00
Raffael Meyer
89e3ca7e14 Merge branch 'develop' of https://github.com/frappe/frappe into gsuite_autocomplete 2019-04-07 12:21:27 +02:00
jibin jose
5cec97a0a2 Fix social login in Python3 
In Pyhton3, requests response content is in bytes type. So decoder
have to handle both `str` and `bytes` to make it compatible with
both python 2 and 3
 2019-04-05 16:41:25 +05:30
Saurabh
7c6370a2d1 fix: cancel existing subscription while creating new subscription 2019-04-04 16:20:25 +05:30
Raffael Meyer
49b6b81a0f fix(integrations): complete file-api migration (#7132) 2019-03-28 11:48:57 +05:30
Faris Ansari
7ca290b2d5 fix: Remove time measurement 2019-03-27 15:17:39 +05:30
Faris Ansari
c9e432e62a fix: Ignore files that don't exist in Dropbox backup 2019-03-27 15:13:03 +05:30
Charles-Henri Decultot
4c483f0015 fix: Google calendar connexion + data migration tool 2019-03-26 09:51:10 +00:00
Raffael Meyer
ae4c24d66e feat(integrations): add autocomplete to gsuite templates 2019-03-26 05:03:29 +01:00
Raffael Meyer
efee035449 fix(integrations): complete file-api migration 2019-03-26 01:54:39 +01:00
Sagar Vora
d11dd760f8 Merge branch 'master' into develop 2019-02-26 17:06:13 +05:30
Ishan Loya
fa6707f4a1 Update timestamp (#6985) 
Update timestamp to add endpoint_url field on migrate
 2019-02-25 12:35:13 +05:30
Saurabh
76bd4e4f19 Merge branch 'master' into develop 2019-01-30 12:36:43 +05:30
rohitwaghchaure
4a1ee3e66f fix: modified date (#6854) 2019-01-30 11:07:13 +05:30
Sagar Vora
ef82f39f99 Merge branch 'staging' into develop 2019-01-29 18:24:11 +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
Frappe Bot
1197271700 Fixed merge conflict 2019-01-05 09:06:05 +00:00
Saurabh
f5607f5b1b fix: update modified date for Dropbox Settings Doctype 2019-01-03 16:45:39 +05:30
Faris Ansari
3b86f16b73 New Control: Table MultiSelect (#6675) 
* feat(control): Add Table MultiSelect control

* fix: Use btn-group instead of span

* fix: Remove functionality

* fix: Add 'Table MultiSelect' to Field doctypes

* fix: Replace usage of string 'Table' with array `table_fields`

* fix: Use internal array to store values instead of building from HTML elements

* fix(style): Add semicolon

* fix: Read only mode and click to navigate to form

* style: indent

* fix: fallback to empty array

* fix: Add formatters in js and py

* style: missing semicolon

* fix: Add docfield validation
 2018-12-28 15:36:59 +05:30
Frappe Bot
d2c652ef3a Merge branch 'staging' into develop 2018-12-19 06:30:46 +00:00
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
Frappe Bot
b2779c617a Merge branch 'staging' into develop 2018-12-06 09:31:40 +00:00
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