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

15983 commits

This branch
This branch
All branches
Author SHA1 Message Date
asbasawaraj
705bb43ee8 Pick subject from URL and assign it to subject field (#5679) 2018-06-14 10:53:34 +05:30
Rushabh Mehta
a5f8878b3a [fixes] for website 2018-06-14 09:23:25 +05:30
Prateeksha Singh
b4e97cfc9c [docs] remove docs folder 💥, update docs app to frappe.io (#5682) 
* [docs] build docs from app specified in hooks

* [docs] remove docs folder 💥
 2018-06-14 09:10:26 +05:30
Nabin Hait
003df19442 update cached link_fields as per new 2018-06-13 17:51:38 +05:30
Manas Solanki
70e2f12dcc
[fix] handle the child table rename (#5681) 2018-06-13 16:34:34 +05:30
Manas Solanki
717763852b
Update rename_workflow_action_to_workflow_action_master.py 2018-06-13 15:31:29 +05:30
Manas Solanki
46b2afe434
[fix] modify the patch (#5680) 2018-06-13 15:28:11 +05:30
Suraj Shetty
9e402ec3b5 Clear cache on workflow update (#5677) 2018-06-12 21:50:36 +05:30
Rushabh Mehta
e180b41366 [fix] [test] for notification 2018-06-11 17:19:59 +05:30
Charles-Henri Decultot
959784b744 Subscriptions + Elements for Stripe payments (#5602) 
* Stripe Payments Improvements

* Automatically create a new stripe customer

* Charge arguments correction

* Move Stripe to ERPNext

* Revert "Move Stripe to ERPNext"

This reverts commit f71f9952997ea0fcdccafc2410abafb6185a6a1f.

* Stripe Settings correction

* Payment plan moved to ERPNext

* Remove Reference to payment plan in Frappe

* Remove references to payment plan in Frappe

* Modify Stripe Checkout Pages to allow usage without ERPNext
 2018-06-11 15:13:29 +05:30
Charles-Henri Decultot
c2b49ce572 Slack integration (#5640) 
* Slack notifications

* Codacy corrections

* Slack notifications

* Codacy corrections

* Rename Email Alert to Notification

* Migration Patch

* Refactor of notification.py

* Dev cleanup

* Test correction
 2018-06-11 15:11:00 +05:30
Suraj Shetty
6b77c10cc9 [Workflow] Added a check to enable/disable workflow action emails and test fix (#5668) 
* Fix build and make py3 compatible

* Remove unused test since state edit check was removed

* Add toggle to enable or disable workflow action emails
 2018-06-11 15:09:42 +05:30
Suraj Shetty
944626ed5e [Minor][Fix] Workflow action (#5665) 
* Fix incorrect this reference

* Fix verify request for python 3

* Fix workflow validation
 2018-06-08 16:33:39 +05:30
Zarrar
2691b52375 Minor fix (#5663) 
* minor nestedset fix

* set current node as selected node in tree
 2018-06-08 14:44:53 +05:30
Saurabh
2ca7f593ca
Merge pull request #5664 from saurabh6790/dropbox_error_log_fix 
[Fix] dropbox client setup
 2018-06-07 15:35:15 +05:30
Saurabh
b5a62f1086 [Fix] dropbox client setup 2018-06-07 15:27:13 +05:30
Faris Ansari
a70d56fd04 Website related fixes (#5660) 
* bench build --app app_name

* Use highlight.js as npm package

* Add fenced-code-blocks to markdown compiler

* Support for next-prev links
 2018-06-07 11:14:25 +05:30
Rushabh Mehta
cfc7661159 [python-3] decode for verified_command.py 2018-06-06 14:35:48 +05:30
Saurabh
b08026ed4f
Merge pull request #5659 from saurabh6790/set_default_to_naming_series 
[minor][fix] fix args for set_name_by_naming_series
 2018-06-06 12:06:11 +05:30
Rushabh Mehta
dd189d4c99 [fix] set default naming_series in naming.py if not set 2018-06-06 12:00:27 +05:30
Saurabh
3d18f6116a [minor][fix] fix args for set_name_by_naming_series 2018-06-06 11:59:31 +05:30
Shreya Shah
c89da99db5 Fix sentence structure (#5656) 2018-06-06 11:24:56 +05:30
Rushabh Mehta
c32bcca4e8 [fix] set default naming_series in naming.py if not set 2018-06-06 11:24:20 +05:30
Rushabh Mehta
f9bcb11d35 [minor] website-fix 2018-06-06 11:07:54 +05:30
Saurabh
edf361b132 resolved merge conflicts 2018-06-05 15:14:42 +05:30
Saurabh
dd2c33e34a Merge branch 'hotfix' 2018-06-05 15:12:57 +05:30
Saurabh
8d0b33c5ca bumped to version 10.1.36 2018-06-05 15:42:57 +06:00
Faris Ansari
ad64ef5c4e
[fix] Incorrect email account as sender (#5657) 
If there are multiple Email Accounts with the same append_to,
then the first one is fetched which is incorrect if there is an
Email Account for the current user.

Now it is first filtered by email_id, if not found falls back to old
behaviour.
 2018-06-05 14:44:49 +05:30
Zarrar
ff83f97f44 fix filter query for get_children tree query (#5655) 2018-06-05 10:28:52 +05:30
Siddhi Sawant
70a6c231cc Auto Repeat Schedule HTML in Auto Repeat doctype (#5574) 
* Auto Repeat Schedule HTML in Auto Repeat doctype

* [Minor changes] end_date and cur_frm

* [Auto repeat schedule] codacy fixes

* codacy fixes & latest revision in js

* Fixes codacy

* [Minor changes]

* Updated onload method & start_date condition

* changed .html source to doctype folder

* removed template reference from build.json

* fixes codacy
 2018-06-05 10:28:09 +05:30
Prateeksha Singh
1239a38e0e [navbar] reduce items in-between space (#5654) 2018-06-04 14:11:14 +05:30
Nabin Hait
786db7de12 minor fix 2018-06-04 12:26:53 +05:30
Nabin Hait
6e00608556 import sync_user_settings in rename_field 2018-06-04 12:24:58 +05:30
Sushant Nadkar
2808000365 [UX Improvement] Removed uri encoding from search results on front end (#5626) 
* removed uri encoding from search results on front end

* decode search string using html2text
 2018-06-04 12:01:09 +05:30
Manas Solanki
a91da5f706 Update user settings (#5634) 
* update the user settings on the rename of any records.

* also update the renamed fields in the user settings

* fix codacy
 2018-06-04 11:53:03 +05:30
Suraj Shetty
90325ceccf [Improvement] Allow user to apply Workflow Action without login (#5637) 
* Enqueue send email job

* Allow user to apply action without login

* Reorganize method

* Show username instead of email

* Refactor send email job

* Fix python 3 test

* Fix python 3 tests

- send user data list instead of dict-view
https://stackoverflow.com/a/16228268
 2018-06-04 11:43:24 +05:30
Shreya Shah
2c05009df3 Modify Report Addresses and Contacts (#5642) 
* Modify Report Addresses and Contacts

Removed party type references and moved that to a new report in ERPNext.

* Change label to Reference Type

* Rename labels
 2018-06-01 18:04:59 +05:30
Suraj Shetty
84c811eca7 [fixes] Related to UX (#5647) 
* Remove extra print msg

* Pass user value while checking role permission

* Hide submit & cancel option in list view if workflow is enabled

* Fix Codacy
 2018-06-01 17:23:37 +05:30
Zarrar
bcde5a7d1a [Fix] Fix contact query for better performance (#5648) 
* call for contact on change of field

* limit data, cache data for faster query
 2018-06-01 17:22:27 +05:30
Alchez
88c31d27e3 Fix tuple index bug in string formatting (#5632) 2018-06-01 12:13:27 +05:30
Suraj Shetty
6e874fbac4 Fix custom script help (#5635) 2018-06-01 12:09:31 +05:30
mnatalia
a60c3ffb18 Update tag_editor.js (#5638) 
Added possibility to translate.
 2018-06-01 12:09:01 +05:30
Faris Ansari
22d90df864 NPM Audit fix (#5645) 
- remove unused nightwatch
- update less to 3.0.4
 2018-06-01 12:03:24 +05:30
Faris Ansari
d1ad73a6ed Remove fuse (#5644) 2018-06-01 11:54:40 +05:30
Saurabh
1865d543b1 Merge branch 'master' into develop 2018-05-31 17:21:13 +05:30
Saurabh
9cbc1ee7b6 Merge branch 'hotfix' 2018-05-31 17:21:12 +05:30
Saurabh
c903d05c1e bumped to version 10.1.35 2018-05-31 17:51:12 +06:00
Saurabh
5836470c43
Merge pull request #5636 from codingCoffee/management 
Updated Issues and PR Templates
 2018-05-31 17:19:58 +05:30
Ameya Shenoy
7aef384db2
Updated Issues and PR Templates 2018-05-30 19:20:13 +00:00
Saurabh
482ae80db0
Merge pull request #5633 from saurabh6790/sanitize_blacklisted_functions 
[fix] Sanitize blacklisted functions
 2018-05-30 15:29:53 +05:30