Ameya Shenoy
3b4f364919
Merge branch 'master' into staging-fixes
2018-09-26 07:12:30 +00:00
Ameya Shenoy
06d2e36aba
bumped to version 10.1.49
2018-09-26 07:12:27 +00:00
Saurabh
aaebe0bce1
Merge branch 'master' into staging-fixes
2018-09-20 13:16:25 +05:30
Saurabh
acfdc5a0f3
bumped to version 10.1.48
2018-09-20 13:46:23 +06:00
Saurabh
3e7b387a7a
[resolved] merge-conflicts
2018-09-12 14:52:46 +05:30
Saurabh
e058e81ba4
bumped to version 10.1.47
2018-09-12 15:20:15 +06:00
Ranjith Kurungadam
5b54d8acb0
fix edit profile ( #6059 )
2018-09-07 13:20:45 +05:30
Nabin Hait
886a41d0ce
Fixed merge conflict
2018-08-29 13:08:04 +05:30
Nabin Hait
8100327b51
bumped to version 10.1.46
2018-08-29 13:16:09 +06:00
Aditya Hase
f3b959b1fe
frappe: refactor async to realtime ( #6015 )
...
* frappe: refactor async to realtime
* frappe: refactor async to is_async
2018-08-28 15:31:20 +05:30
Himanshu Mishra
10361383c1
[fix]: use is_async in background jobs instead of async ( #5986 )
2018-08-20 10:36:26 +05:30
Nabin Hait
2f49806cec
fix(init): get_cached_value ( #5956 )
2018-08-10 19:01:35 +05:30
Rushabh Mehta
b1857a5132
optimize(meta): meta is now cached in redis ( #5948 )
...
* optimize(meta): meta is now cached in redis
* fix(meta): test fixes
* fix(meta): codacy
* fix(meta): allow nulls to be serialized
* fix(form_meta): fix form meta caches
* fix(form_meta): fix form meta caches
* fix(form_meta): don't cache for developer_mode'
2018-08-09 11:24:42 +05:30
Rushabh Mehta
e7c8b0c138
optimize(various): optimize with frappe.get_cached_value
2018-08-08 16:33:40 +05:30
Nabin Hait
b8f91f36fc
fix(document): frappe.get_cached_doc
2018-08-08 13:16:04 +05:30
Nabin Hait
cdc8e2895e
feat(document): frappe.get_cached_doc
2018-08-08 13:06:06 +05:30
Nabin Hait
7f2a14bdf1
feat(document): frappe.get_cached_doc
2018-08-08 13:04:23 +05:30
Saurabh
bece82d6ab
Resolved merge conflicts
2018-08-07 12:47:01 +05:30
Saurabh
e3382f8aec
bumped to version 10.1.45
2018-08-07 13:12:53 +06:00
Faris Ansari
60f9e2c973
Add utility frappe.utils.md_to_html
...
- Replace all occurences of manual imports with this utility
- Also enable extras
- fenced-code-blocks
- tables with class 'table table-bordered'
- header-ids
2018-08-05 18:19:25 +05:30
Ameya Shenoy
dc41c2a23a
Merge branch 'master' into develop
2018-08-01 06:22:48 +00:00
Ameya Shenoy
ecd881628f
bumped to version 10.1.44
2018-08-01 06:22:44 +00:00
Nabin Hait
854b068ee9
Fixed merge conflict
2018-07-31 13:15:15 +05:30
Nabin Hait
cdfba6fd4c
bumped to version 10.1.43
2018-07-31 13:10:42 +06:00
Saurabh
d46fd09b44
[WIP][Enhancement] Provision to pull reports from slave systems ( #5844 )
...
* [Enhancement] Provision to pull reports from slave systems
* [fix] check if master_db exists
* Pull list view from slave system
2018-07-24 17:42:21 +05:30
Nabin Hait
2b14116d83
Fixed webform perms and set defaults based on url params ( #5856 )
2018-07-24 11:06:04 +05:30
Saurabh
aa83c64b5a
[fix] resolved merge conflicts
2018-07-19 13:34:10 +05:30
Saurabh
d53a5c04b0
bumped to version 10.1.42
2018-07-19 14:03:07 +06:00
Nabin Hait
5b6786f372
Merge branch 'master' into develop
2018-07-19 11:14:21 +05:30
Nabin Hait
5ddbe495c1
bumped to version 10.1.41
2018-07-19 11:44:20 +06:00
Saurabh
176f3b6a15
Resolved merge conflicts
2018-07-18 16:20:06 +05:30
Saurabh
6033e1e929
bumped to version 10.1.40
2018-07-18 16:36:37 +06:00
Saurabh
2a4b8f1ec3
[fix] merge-conflicts
2018-07-09 15:56:43 +05:30
Saurabh
34505037cc
bumped to version 10.1.39
2018-07-09 16:25:22 +06:00
Saurabh
a135c6c431
resolved merge conflicts
2018-07-06 13:37:51 +05:30
Saurabh
aec04731db
bumped to version 10.1.38
2018-07-06 13:56:04 +06:00
Suraj Shetty
ecde50a699
Add logic to check if the document was modified ( #5746 )
...
- Check if the document was modified after the workflow
action mail was sent.
If yes, then show an alert with the latest document preview.
2018-07-02 19:10:48 +05:30
Ameya Shenoy
b40c04a571
Merge branch 'master' into develop
2018-06-22 05:08:21 +00:00
Ameya Shenoy
a8172434de
bumped to version 10.1.37
2018-06-22 05:08:14 +00:00
Saurabh
edf361b132
resolved merge conflicts
2018-06-05 15:14:42 +05:30
Saurabh
8d0b33c5ca
bumped to version 10.1.36
2018-06-05 15:42:57 +06:00
Saurabh
1865d543b1
Merge branch 'master' into develop
2018-05-31 17:21:13 +05:30
Saurabh
c903d05c1e
bumped to version 10.1.35
2018-05-31 17:51:12 +06:00
Saurabh
56bf3bf40b
[fix] resolved merge conflicts
2018-05-28 11:43:38 +05:30
Saurabh
3079f1c5fe
bumped to version 10.1.34
2018-05-28 11:54:31 +06:00
Ameya Shenoy
949ec96fbc
Merge branch 'master' into develop
2018-05-24 08:43:19 +00:00
Ameya Shenoy
9a32f55f40
bumped to version 10.1.33
2018-05-24 08:39:55 +00:00
Ameya Shenoy
06851e7376
Merge branch 'master' into develop
2018-05-22 08:45:40 +00:00
Ameya Shenoy
0a45e6af9c
bumped to version 10.1.32
2018-05-22 08:43:16 +00:00
Saurabh
f1b35c82f4
[fix] resolved merge conflicts
2018-05-15 12:56:21 +05:30