Commit graph

846 commits

Author SHA1 Message Date
Achilles Rasquinha
97963119a5 email parse content to unicode 2018-03-08 16:35:02 +05:30
Achilles Rasquinha
01c5c32798 dict comparision 2018-03-08 16:06:57 +05:30
Achilles Rasquinha
fc94489220 added safe encode 2018-03-08 15:10:01 +05:30
Achilles Rasquinha
c251236e43 [FIX] module has no safe_decode 2018-03-08 14:53:36 +05:30
Achilles Rasquinha
73b3ea8e74 Merged with develop 2018-03-08 14:44:22 +05:30
Achilles Rasquinha
3f14778b7c [FIX] email message to string, not bytes 2018-03-08 14:42:30 +05:30
Nabin Hait
7b0a7e029d Fixed merge conflict 2018-03-05 14:46:18 +05:30
Nabin Hait
f290b38290 bumped to version 10.1.2 2018-03-05 15:12:48 +06:00
Suraj Shetty
1202ff1fdb List view bulk edit option (#5107)
* added actions button for bulk operations

also included bulk edit option

* page html refactor and added show/hide action option

* copy field object to avoid mutation

* commonify update method and other refactor

* fixed bug with progress bar level and minor fix with 'value' field display

* fixed frappe/erpnext#13063

* commonify field control method and removed unwanted code

* separate method for submit and cancel

* [minor] msgprint change

* refresh list on complete

* requested changes and refactor

* codacy fix

* code formatting, changed var name

* conflict fix

* description option for progress dialog

* extracted bulk operations to a separate file

* Refactor

commonified redundant method
get_json -> parse_json

* rename change_df -> replace_field
2018-03-05 11:02:50 +05:30
Nabin Hait
764c5e2167 Fixed merge conflict 2018-02-23 16:58:01 +05:30
Nabin Hait
4e5d6df2dc bumped to version 10.1.1 2018-02-23 17:26:42 +06:00
Nabin Hait
dfa494875c Fixed merge conflict 2018-02-22 14:38:36 +05:30
Nabin Hait
5849e9f268 bumped to version 10.1.0 2018-02-22 15:07:33 +06:00
Saurabh
6a23461b42 [fix] Send email with no letterhead if print letterhead is unchecked on print preview (#4816)
* [fix] send email with no letterhead if print letterhead is unchecked on print priview

* [fix] if not on print preview page, pull with_letterhead from print settings

* remove redundant if condition

* minor
2018-02-19 11:25:14 +05:30
Achilles Rasquinha
5f8c9978b7
Merge pull request #5022 from achillesrasquinha/5021
[ENH #5021] Allow guest during server ping
2018-02-16 12:43:38 +05:30
Achilles Rasquinha
1d82f56660 [ENH #5021] Allow guest during server ping 2018-02-16 12:32:19 +05:30
Saurabh
7ca5cf58ab Merge branch 'master' into develop 2018-02-15 23:20:58 +05:30
Saurabh
fae73e9cda bumped to version 10.0.25 2018-02-15 23:50:57 +06:00
Saurabh
cd5e99c0ea Merge branch 'master' into develop 2018-02-15 15:18:13 +05:30
Saurabh
24972722be bumped to version 10.0.24 2018-02-15 15:48:12 +06:00
Saurabh
676fdc0098 Merge branch 'master' into develop 2018-02-14 11:43:00 +05:30
Saurabh
396366c1e2 bumped to version 10.0.23 2018-02-14 12:12:59 +06:00
Saurabh
e5c3cc43ac Merge branch 'master' into develop 2018-02-08 15:28:44 +05:30
Saurabh
3c59f8f422 bumped to version 10.0.22 2018-02-08 15:58:44 +06:00
Nabin Hait
d66e3c50c2 Merge branch 'master' into develop 2018-02-07 16:03:29 +05:30
Nabin Hait
b2a7b3f614 bumped to version 10.0.21 2018-02-07 16:33:28 +06:00
Nabin Hait
e3de8c10ef Fixed merge conflict 2018-02-03 09:04:25 +05:30
Nabin Hait
5321db785c bumped to version 10.0.20 2018-02-03 09:32:54 +06:00
Nabin Hait
3a34055700 Fixed merge conflict 2018-01-31 17:29:24 +05:30
Nabin Hait
a9109a4fe8 bumped to version 10.0.19 2018-01-31 17:53:43 +06:00
Nabin Hait
0a8664c3b7 Merge branch 'master' into develop 2018-01-30 19:02:36 +05:30
Nabin Hait
1bac7fa2a7 bumped to version 10.0.18 2018-01-30 19:32:34 +06:00
Nabin Hait
428d1d7a6e Fixed merge conflict 2018-01-30 18:18:46 +05:30
Nabin Hait
5fba05d3f3 bumped to version 10.0.17 2018-01-30 18:47:20 +06:00
Saurabh
8498bf8ea2 resolved merged conflicts 2018-01-29 16:15:56 +05:30
Saurabh
2308f01988 bumped to version 10.0.16 2018-01-29 16:41:19 +06:00
Achilles Rasquinha
8bae34eb2f frappe.get_version 2018-01-26 18:16:01 +05:30
Saurabh
cb6342a565 bumped to version 10.0.15 2018-01-24 20:05:01 +06:00
Saurabh
3b6e345bbb bumped to version 10.0.14 2018-01-24 11:47:23 +06:00
Saurabh
a18e0661df bumped to version 10.0.13 2018-01-22 16:01:03 +06:00
Rohit Waghchaure
5b156197eb bumped to version 10.0.12 2018-01-19 13:36:49 +06:00
Nabin Hait
194cb45ecc bumped to version 10.0.11 2018-01-17 19:18:52 +06:00
Saurabh
ca554764a5 bumped to version 10.0.10 2018-01-15 18:56:51 +06:00
Saurabh
b43b4a559a bumped to version 10.0.9 2018-01-12 17:20:18 +06:00
Saurabh
410e6cadd7 [fix] pass language selected on email dialogue while enqueuing the function (#4808) 2018-01-12 16:43:26 +05:30
Saurabh
77f6902078 bumped to version 10.0.8 2018-01-09 12:45:49 +06:00
Nabin Hait
566e25f1b3 bumped to version 10.0.7 2018-01-05 13:46:03 +06:00
Saurabh
0fffaeebf5 bumped to version 10.0.6 2018-01-02 12:41:29 +06:00
Nabin Hait
ae18969f1e bumped to version 10.0.5 2017-12-28 20:11:26 +06:00
Nabin Hait
7920309056 bumped to version 10.0.4 2017-12-28 13:42:22 +06:00