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

16718 commits

This branch
This branch
All branches
Author SHA1 Message Date
Rushabh Mehta
5aaee31c49 fix(test): test_scheduler.py 2018-10-02 10:51:52 +05:30
Faris Ansari
cb67d66487 fix: Timeline item details link (#6177) 2018-10-02 10:45:55 +05:30
Ameya Shenoy
1ba3f4a737 fix(release_popup): show only the non-beta release (#6169) 
Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
 2018-10-02 10:43:09 +05:30
Ameya Shenoy
bb3cd6e7f3 fix(security): patch to tighten security (#6167) 
- wrote a patch to enforce a password policy, a default password score
of 2 as calculated by zxcvbn, disallow more than 3 login attempts in a
span of 60 seconds
- added '3' to the allowed password score
- enabled password policy by default
- set 3 as the default value for login attempts in a span of 60 seconds

Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
 2018-10-02 10:42:30 +05:30
Shreya Shah
b7d8f23a8b Modify Email Signature fieldtype (#6161) 
- Change fieldtype from Text to Text Editor
- Add patch to handle cases having a new line
 2018-10-02 10:41:03 +05:30
Rushabh Mehta
0e65150b87 fix(timeline) 2018-10-02 10:40:27 +05:30
Charles-Henri Decultot
98abda32b4 [Enhancement] Event timeline (#6133) 
* Events in timeline wip

* Events in timeline

* Permission issue + split buttons between Frappe and ERPNext

* Add string type check

* Codacy corrections

* Permission issue

* Test and feedback corrections

* Codacy corrections

* Tests and codacy corrections

* Codacy correction

* Py3 correction

* Travis correction

* Py3 corrections"

* Travis and codacy corrections

* Removed space

* Add check for the removal of new lines

* Codacy rollup watch missing semicolon
 2018-10-02 10:12:55 +05:30
rohitwaghchaure
e24b6598a9 [Fix] Show totals not disaplying in the report print (#6154) 2018-10-02 10:08:33 +05:30
Saurabh
4795572a46
Merge pull request #6165 from saurabh6790/subscription_support 
Subscription support
 2018-10-01 14:59:36 +05:30
rohitwaghchaure
09d7efb1b4
Merge pull request #6168 from rohitwaghchaure/uploaded_to_dropbox_in_not_added_in_file 
[Fix] Unknown column 'uploaded_to_dropbox' in 'where clause'
 2018-10-01 13:04:36 +05:30
Rohit Waghchaure
472640a3f2 [Fix] Unknown column 'uploaded_to_dropbox' in 'where clause' 2018-10-01 13:03:28 +05:30
Saurabh
e1acaba9b7 validate param value 2018-10-01 11:35:14 +05:30
Saurabh
3a25bc3e7c [fix] minor fix in reset password functionality 2018-10-01 11:35:14 +05:30
Saurabh
92e6ed0425 check for subscription id 2018-10-01 11:35:14 +05:30
Saurabh
54e575b824 [fix] minor-fixes 2018-10-01 11:35:13 +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
10534276e5 Quill editor (#6159) 
* feat(Text Editor): Quill Editor

* fix: Add imageDrop module

- prevent default events

* refactor(Comment): Comment is now frappe control

- Use quill's bubble theme for comment control

* feat: Support @mentions in comment area

- Uses quill-mention package

* fix: Use setContents to fix autofocus bug

* fix: Spaces to Tabs

* fix: Missing semicolon

* fix: Fix style

* fix: Remove all of summernote

- Remove comment.js (use fieldtype: 'Comment')
- Add quill styles to webform.css

* fix: Replace color/background with indent/outdent
 2018-09-30 21:08:40 +05:30
Shreya Shah
8acdc06180 Do not load report if reqd filter missing (#6155) 2018-09-28 19:09:56 +05:30
Shreya Shah
1426c8539b Fix a method's path and type conversion (#6162) 2018-09-28 19:08:09 +05:30
Ameya Shenoy
f953e310f4
Merge branch 'staging-fixes' into staging 2018-09-26 07:18:59 +00:00
Ameya Shenoy
306d164b2f bumped to version 11.0.3 2018-09-26 07:18:59 +00:00
Ameya Shenoy
3b4f364919
Merge branch 'master' into staging-fixes 2018-09-26 07:12:30 +00:00
Ameya Shenoy
f1fa88192a
Merge branch 'hotfix' 2018-09-26 07:12:27 +00:00
Ameya Shenoy
06d2e36aba bumped to version 10.1.49 2018-09-26 07:12:27 +00:00
Prateeksha Singh
fad8ee775a
[hotfix][email-alert] clean email_by_document code 2018-09-26 00:44:58 +05:30
Prateeksha Singh
f2cd040c3b
Merge pull request #6090 from ci2014/patch-26 
Fix recipients by document field
 2018-09-26 00:38:28 +05:30
Prateeksha Singh
683ff52e03
Merge pull request #6139 from rohitwaghchaure/data_import_file_must_be_private 
[Security] Attachment file in the data import must be private
 2018-09-26 00:21:20 +05:30
Rohit Waghchaure
8ec66fa6b2 [Security] Attachment file in the data import must be private 2018-09-25 19:18:50 +05:30
Ameya Shenoy
025b627579
Merge pull request #6137 from frappe/revert-6132-decode 
Revert "fix(setup_global_help): allow utf-8 in filename"
 2018-09-25 16:50:30 +05:30
Ameya Shenoy
4e4429f169 Revert "fix(setup_global_help): allow utf-8 in filename (#6132)" 
This reverts commit a19525e695.
 2018-09-25 16:49:11 +05:30
Charles-Henri Decultot
044efac4c5 Transaction log corrections (#6131) 2018-09-25 15:40:46 +05:30
Ameya Shenoy
a19525e695 fix(setup_global_help): allow utf-8 in filename (#6132) 
- fixed issue with setting up global help. Setting up global help used
to fail when the filenames were in any language other than english, due
to improper encoding. Used frappe.safe_decode to solve the issue

Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
 2018-09-25 15:40:18 +05:30
rohitwaghchaure
a8423dd782 [Fix] Email not sending if reciepients is blank because of reciepients is unsubscribed (#6136) 2018-09-25 15:37:26 +05:30
Aditya Hase
ab81036c20 fix(python3): subproess.check_output should always be decoded (#6135) 2018-09-25 13:14:20 +05:30
Sachin Mane
5e5623d7f9 fix - default timeouts never picked up (#6098) 2018-09-24 13:08:08 +05:30
gshmu
bea46dc45c list clear, unselect list-select-all (#6088) 2018-09-24 12:59:37 +05:30
Faris Ansari
f169f6231d fix(ux): Reorder Print Server fields (#6115) 
- fix timeline overflow text
 2018-09-24 12:46:41 +05:30
Achilles Rasquinha
97c02cae82 Installation Failure Fix for Python 3 - safe_decode bytes to string (#6130) 
* Installation Failure Fix for Python 3 - safe_decode bytes to string

* Installation Failure Fix for Python 3 - safe_decode bytes to string

* Fixed merge conflict

* Use --short instead of first 7 characters
 2018-09-24 12:34:31 +05:30
rohitwaghchaure
de9778047d [Fix] Not able to delete the document which has workflow (#6119) 2018-09-24 12:34:21 +05:30
Prateeksha Singh
de1d2720c6 Charts in Query Reports (#6118) 
* [charts][query-report] setup preview enabled chart maker

- Options for y values: numeric fields
- Options for x values: remaining non numeric fields

* [query-report][chart] Add 'Vs' title, truncate total row
 2018-09-24 12:33:53 +05:30