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

217 commits

Author SHA1 Message Date
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
Sagar Vora
a8d6c0b2a7 feat(dropbox integration): add ability to delete older DB backups (#6332) 2018-10-30 10:47:35 +05:30
Ameya Shenoy
808835e7a1
Merge branch 'staging' into develop 2018-10-25 11:19:11 +00:00
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
Ameya Shenoy
960d568427
Merge branch 'staging' into develop 2018-10-05 09:08:07 +00:00
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
Ameya Shenoy
387f556dd5
Merge branch 'staging' into develop 2018-10-04 11:41:29 +00:00
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
Daniel Morlock
62abb3f8a0 Fixes #6178: Properly use ldap settings (#6179) 2018-10-02 10:46:29 +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
Faris Ansari
171c650ddf
Merge pull request #6055 from Thunderbottom/file-api 
Streamlined File API based on ORM
 2018-09-25 17:38:04 +05:30
Roland
2a2e3ca0af fairlogin social ID provider (#6096) 
* fairlogin

adding fairlogin provider

* fairlogin

add fairlogin provider

* fairlogin

* fairlogin

* fairlogin userid

fairlogin userid corrected to preferred_username

* removed trailing white space

* removed trailing white space

removing white space mourned by automated code review
 2018-09-25 15:35:46 +05:30
Chinmay Pai
6e84bbe80d
Merge branch 'develop' into file-api 2018-09-21 13:42:32 +05:30
Chinmay Pai
75c7992557
file-api: add new test, fix minor bugs and code indentation 
Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
 2018-09-21 13:40:25 +05:30
Chinmay Pai
5bd66f134d
file-api: add improvements to save() api 
file can now be saved by calling save() on the file object instance

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
 2018-09-13 09:46:48 +05:30
Rohan Bansal
28d592e182 Move import inside function 2018-09-10 11:03:19 +05:30
Chinmay Pai
6eca292e1a
[3/3] file-api: code migration 
migrate api from file_manager.py to file.py

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
 2018-09-06 01:18:21 +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
Chinmay Pai
ff03d8d0fe
file-api: major refactor 
migrate from file_manager.py to file.py

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
 2018-08-30 18:02:59 +05:30
Zarrar
41d1446c04 functions already added in delivery_triip.py (#6027) 2018-08-29 16:05:47 +05:30