Saurabh
d80fd366e7
Merge pull request #6183 from saurabh6790/subscription_support
...
provision to handle PayPal and Razoapay subscription charge notifications
2018-10-25 15:14:10 +05:30
Saurabh
0757c92713
[fix] razorpay subscription cancellation
2018-10-25 14:11:32 +05:30
Saurabh
7201f33eee
Add more keys to site config to support subscription
2018-10-25 14:11:32 +05:30
Saurabh
4f4706ae12
[fix] do not cache payment success page
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
Faris Ansari
3b0892017e
Merge pull request #6323 from netchampfaris/quill-assign-to-fix
...
Quill Assign To fix
2018-10-25 11:15:34 +05:30
Faris Ansari
9e9e1f1902
fix(Assign To): Make dialog a property of AssignTo
2018-10-24 17:08:45 +05:30
Faris Ansari
fd2725bb2c
fix(Quill): Remove image drop module
...
Quill 2.0 already has it
2018-10-24 17:08:36 +05:30
Ameya Shenoy
d4ed8f1028
Merge branch 'staging-fixes' into staging
2018-10-23 12:54:56 +00:00
Ameya Shenoy
9545d0fc62
bumped to version 11.0.3-beta.14
2018-10-23 12:54:56 +00:00
Ameya Shenoy
0279e957c6
Merge branch 'master' into staging-fixes
2018-10-23 12:51:30 +00:00
Ameya Shenoy
40787b326a
Merge branch 'hotfix'
2018-10-23 12:42:19 +00:00
Ameya Shenoy
5662d29476
bumped to version 10.1.56
2018-10-23 12:42:19 +00:00
Ameya Shenoy
127d469ee1
Merge pull request #6306 from codingCoffee/setup_wiz
...
fix: setup wizard
2018-10-23 18:09:02 +05:30
Ameya Shenoy
95c8b30d7d
Merge pull request #6281 from kennethsequeira/hotfix
...
Update in-app Docs Generation
2018-10-23 18:05:18 +05:30
Ameya Shenoy
854b09137c
fix: setup wizard
2018-10-23 12:10:13 +00:00
Ameya Shenoy
a8f2798b82
Merge branch 'staging-fixes' into staging
2018-10-23 08:03:18 +00:00
Ameya Shenoy
1949c680ba
bumped to version 11.0.3-beta.13
2018-10-23 08:03:18 +00:00
rohitwaghchaure
7085424a9d
Merge pull request #6298 from rohitwaghchaure/make_verbose_false
...
Set verbose to false
2018-10-23 12:00:57 +05:30
Rohit Waghchaure
63b2c14ec8
Set verbose to false
2018-10-23 11:59:18 +05:30
Faris Ansari
a80fa7d939
Merge pull request #6295 from netchampfaris/quill-mention-local
...
fix(Quill): Use a local copy of quill-mention
2018-10-23 10:49:36 +05:30
Faris Ansari
fb075437da
Ignore eslint rules in quill mention
2018-10-23 10:25:52 +05:30
Faris Ansari
d1c5c263b5
fix(Quill): Use a local copy of quill-mention
...
quill-mention's distribution copy is built with webpack
so it doesn't work with rollup
2018-10-22 16:12:17 +05:30
Ameya Shenoy
05317b3855
Merge branch 'master' into staging-fixes
2018-10-22 10:31:38 +00:00
Ameya Shenoy
94625ef3a0
Merge branch 'hotfix'
2018-10-22 10:31:33 +00:00
Ameya Shenoy
d8b1ae8d4f
bumped to version 10.1.55
2018-10-22 10:31:33 +00:00
Rushabh Mehta
eba27d1a5c
fix(test): test_scheduler fails randomly
2018-10-22 10:23:03 +05:30
Rushabh Mehta
54767b4806
fix(query_report): change timeout to 10 seconds for filters
2018-10-22 10:23:03 +05:30
Saif
25827755b5
PDF allow parsing header-spacing ( #6286 )
...
Simply allow parsing header-spacing from custom css.
2018-10-22 10:13:26 +05:30
Jay Parikh
0051915645
New keyboard shortcut combination. ( #6290 )
...
* New keyboard shortcut combination.
add shift+ the key, add alt+ the key, add alt+ctrl+ the key or single key e.g f1,f2,etc..
* Fixed Indentation Issues.
* Issue fix (no-self-assign)
2018-10-22 09:03:29 +05:30
Ameya Shenoy
9cd5e1af0f
Merge branch 'staging-fixes' into staging
2018-10-19 12:50:06 +00:00
Ameya Shenoy
86b328bae5
bumped to version 11.0.3-beta.12
2018-10-19 12:50:05 +00:00
Ameya Shenoy
b42a87746a
Merge branch 'master' into staging-fixes
2018-10-19 12:42:37 +00:00
Ameya Shenoy
8034e8395c
Merge branch 'hotfix'
2018-10-19 12:38:36 +00:00
Ameya Shenoy
d4a062fdbd
bumped to version 10.1.54
2018-10-19 12:38:36 +00:00
Ameya Shenoy
bd23de9865
Merge pull request #6280 from codingCoffee/ver
...
fix(update message): multiple fixes
2018-10-19 18:07:34 +05:30
rohitwaghchaure
a9c11c3519
Merge pull request #6273 from rohitwaghchaure/multiple_messages_are_coming
...
[Fix] multiple user permissions messages are coming even if permissions are set
2018-10-19 14:57:45 +05:30
Kenneth Sequeira
026bd0d2bc
fixed image link
2018-10-19 14:42:56 +05:30
Kenneth Sequeira
1e0880493c
remove rogue tab space
2018-10-19 14:33:30 +05:30
Kenneth Sequeira
f31e7ac8a3
added source link for frappe docs
2018-10-19 14:30:34 +05:30
Shreya Shah
8e0410bdb0
Update help.py
2018-10-19 14:21:36 +05:30
Shreya Shah
0473ea9c6b
Update help.py
2018-10-19 14:09:49 +05:30
Shreya Shah
1f8c8568ed
Update help.py
2018-10-19 11:44:51 +05:30
Kenneth Sequeira
28b5589c72
Docs setup code same as v11
...
Currently, in v10, the docs still point to ERPNext develop branch, before it being moved to erpnext.org app.
Co-authored-by: Shreya Shah <shreyashah115@gmail.com>
>
2018-10-19 03:22:17 +05:30
Ameya Shenoy
be8f37dc5b
fix(update message): multiple fixes
...
- added GitPython as a dependency
- use git describe to find the branch version
- prevent version popup for prereleases
- check for update weekly instead of daily
- fixed bug in check for update which used to compare minor version even
if there was a mismatch in comparing major versions
Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
2018-10-18 13:56:32 +00:00
Ameya Shenoy
b848c9dfc7
Merge pull request #6279 from codingCoffee/urllib
...
fix(travis): urllib3 version 1.23
2018-10-18 18:30:03 +05:30
