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

16747 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ameya Shenoy
d3a7399d9e
Merge branch 'staging-fixes' into staging 2018-10-04 14:05:51 +00:00
Ameya Shenoy
501f8ae8be bumped to version 11.0.3-beta.2 2018-10-04 14:05:51 +00:00
Ameya Shenoy
3c2be3a23f
Merge pull request #6198 from codingCoffee/secfix 
fix(): ignore empty fields in security settings
 2018-10-04 19:14:52 +05:30
Ameya Shenoy
7ddf4095c3
fix(): ignore empty fields in security settings 
- migration used to break on newly created sites which did not have any
fields filled
 2018-10-04 18:04:42 +05:30
Ameya Shenoy
eb0825d707
Merge branch 'staging-fixes' into staging 2018-10-04 11:34:13 +00:00
Ameya Shenoy
faa56e5f8c bumped to version 11.0.3-beta.1 2018-10-04 11:34:13 +00:00
Ameya Shenoy
9851e0cdbb
Merge pull request #6196 from codingCoffee/wrong_commit 
First attempt to fix ldap (#6181)
 2018-10-04 17:01:32 +05:30
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
Ameya Shenoy
f342c1ce4a
Merge branch 'master' into staging-fixes 2018-10-03 15:08:25 +00:00
Ameya Shenoy
9d74acfe37
Merge branch 'hotfix' 2018-10-03 15:07:59 +00:00
Ameya Shenoy
ae65dd576f bumped to version 10.1.50 2018-10-03 15:07:59 +00:00
Ameya Shenoy
8576cd71e4
Merge pull request #6189 from codingCoffee/fake 
chore: fake commit for release
 2018-10-03 20:36:53 +05:30
Ameya Shenoy
a181ba61ae
chore: fake commit for release 
Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
 2018-10-03 20:34:07 +05:30
Ameya Shenoy
90d7fbffcf
Merge pull request #6188 from codingCoffee/fake 
chore: fake commit for release
 2018-10-03 20:31:08 +05:30
Ameya Shenoy
2c978f6efa
chore: fake commit for release 
Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
 2018-10-03 20:28:59 +05:30
Ameya Shenoy
66073c360a
Merge branch 'master' into staging-fixes 2018-10-03 14:51:32 +00:00
Ameya Shenoy
e90a8af3f0
Merge branch 'hotfix' 2018-10-03 14:51:29 +00:00
Ameya Shenoy
00d9c2e290 bumped to version 10.1.49-beta.1 2018-10-03 14:51:29 +00:00
Shreya Shah
f4c9d5d2b2
Merge pull request #6187 from shreyashah115/allow-images 
Allow img src having data protocol
 2018-10-03 16:13:32 +05:30
Shreya
487fd3e321 Allow img src having data protocol 2018-10-03 10:52:24 +05:30
Rushabh Mehta
9a9bf13bf1 fix(app) 2018-10-02 15:18:35 +05:30
Rushabh Mehta
8aa2660a94 fix(app), style 2018-10-02 15:15:36 +05:30
Rushabh Mehta
b52e0a7ce8 fix(patch): change sequence of change_email_signature_fieldtype patch 2018-10-02 12:11:31 +05:30
Shreya Shah
2dd66e6986 Fix Routing while adding address (#6171) 
* Fix Routing while adding address

* Make similar fixes for Contact

* Commonify function

* Add method to an existing file
 2018-10-02 11:11:06 +05:30
Hemant Pema
4e9f00d142 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-02 11:10:16 +05:30
Rushabh Mehta
cf2b3f34ae fix(app, style) 2018-10-02 11:06:37 +05:30
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
1c8db8fee3 [Fix] Permlevel 1 with read permission fields are not disaplying in the form (#6160) 2018-10-02 10:08:59 +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