Commit graph

15160 commits

Author SHA1 Message Date
Achilles Rasquinha
8de4ebe7fc
Merge pull request #5072 from achillesrasquinha/py3
[PY3] Added input compat with six
2018-02-23 18:18:09 +05:30
Zarrar
c78c564eac optimize update_linked_doctype util and get_fetch (#5071) 2018-02-23 17:40:00 +05:30
Achilles Rasquinha
bf153f456f [FIX] encode unicode bytes at response header 2018-02-23 17:11:41 +05:30
Achilles Rasquinha
e405d1cabd [PY3] Added input compat with six 2018-02-23 17:04:15 +05:30
Nabin Hait
764c5e2167 Fixed merge conflict 2018-02-23 16:58:01 +05:30
Nabin Hait
d46ac5edd9 Merge branch 'hotfix' 2018-02-23 16:56:42 +05:30
Nabin Hait
4e5d6df2dc bumped to version 10.1.1 2018-02-23 17:26:42 +06:00
Nabin Hait
f07a9cf17f
Delete duplicate custom fields (#5070)
* Delete duplicate custom fields

* Delete duplicate custom fields
2018-02-23 16:16:49 +05:30
Frappe PR Bot
e855efe8a7 [Translation] Updated Translations (#5068) 2018-02-23 15:00:29 +05:30
Faris Ansari
064e387825 [Feature] List Filters (#5063)
* Adds a stored filters tool on the sidebar

Features:

- Users can save any filter applied to a list view only they can see.
- Administrator and System Manager can create global filters all users can see.

* Cleanup

- Rename Stored Filter to List Filter

* Remove server methods

* minor

* fix indentation

* Permissions

* Hide from desk
2018-02-23 12:41:16 +05:30
Faris Ansari
40f0bbd13b Set view_name explicitly (#5066)
- since classes are converted to Functions after transpiling, view_name cannot be set dynamically
2018-02-23 12:40:12 +05:30
Rushabh Mehta
f987f27943 [optimize] get_link_fields 2018-02-23 11:55:52 +05:30
crossxcell99
9a51d76665 Accomodate header variations (#5064) 2018-02-23 11:17:51 +05:30
Rushabh Mehta
f20da41bf6 [fix] rename custom fields before sync if name conflicts (#5062)
* [fix] rename custom fields before sync if name conflicts

* [minor] re-add text_type

* Update doctype.py
2018-02-23 11:10:21 +05:30
Achilles Rasquinha
7e6153c4d2 conditional check for single docs (#5060) 2018-02-22 18:05:38 +05:30
Achilles Rasquinha
1e438a0fad revert to npm if yarn doesnt exist (#5058) 2018-02-22 17:04:57 +05:30
Zarrar
6ad0d7c4f3 fix roles editor issue (#5059) 2018-02-22 17:04:23 +05:30
Nabin Hait
dfa494875c Fixed merge conflict 2018-02-22 14:38:36 +05:30
Nabin Hait
c06dfafd99 Merge branch 'hotfix' 2018-02-22 14:37:33 +05:30
Nabin Hait
5849e9f268 bumped to version 10.1.0 2018-02-22 15:07:33 +06:00
Nabin Hait
4d96472969
Updated develop version 2018-02-22 14:36:58 +05:30
Shreya Shah
c8d13c07ba refresh only if timeline (#5050) 2018-02-22 11:01:54 +05:30
Mainul Islam
92623f8684 Fined Issue #5043 (#5044)
Now Date type field can set ad web page title
2018-02-22 11:01:27 +05:30
Zarrar
21bc53e351 added function to update link-link based dependent values (#5048) 2018-02-22 10:56:44 +05:30
Achilles Rasquinha
c43cc092b6
Merge pull request #5052 from rmehta/py3-fixes
python 3 fixes
2018-02-22 03:05:04 +05:30
Achilles Rasquinha
aa6f92f6f1
Merge pull request #5053 from netchampfaris/import-datatable
import DataTable in reportview
2018-02-22 03:04:48 +05:30
Faris Ansari
55b012f1b4
Check for yarn before bench build (#5047) 2018-02-21 19:36:02 +05:30
Faris Ansari
6f48ba7ecb touch .build 2018-02-21 18:36:32 +05:30
Faris Ansari
355813c44f import DataTable in reportview 2018-02-21 18:16:38 +05:30
Rushabh Mehta
ac93a5d4bd python 3 fixes 2018-02-21 17:55:51 +05:30
Zarrar
a1b46cdfac make expand_all button configurable (#5042) 2018-02-21 14:46:33 +05:30
Charles-Henri Decultot
bf2936268b Transaction Log for France (#4974)
* Transaction Log creation

* Addition of tests

* Codacy corrections
2018-02-21 11:06:48 +05:30
tundebabzy
672b0dffc7 fix translatable docfields (#5041) 2018-02-21 11:04:38 +05:30
Raghavendra Kamath
08a6727fb8 Add date format configurability to date format function (#5037) 2018-02-20 17:25:33 +05:30
Achilles Rasquinha
aa5f9516da
Merge pull request #5036 from Zlash65/fix-add-desktop-icon
[Fix] Adding Desktop Icons error
2018-02-20 14:10:53 +05:30
Faris Ansari
92e8856588
New Build System: Rollup (#5010)
* JS build working

* Css build working!

* Uglify JS in production

* fix codacy

* Add frappe.commands.popen

* FIx ESLint errors

* Add socket.io to package.json

* ignore subprocess warnings

* Add babel-runtime

* sleep 20 after bench start

* remove set -e

* [FIX] non-shell subprocess call

* [FIX] use shell = False

* split commands
2018-02-20 13:47:48 +05:30
Zlash65
6364abefbe mismatch module_name & label fix 2018-02-20 13:41:22 +05:30
Achilles Rasquinha
ec3aedf358
Merge pull request #5009 from achillesrasquinha/restore-progress
Show Progress of Database Restore
2018-02-20 11:33:11 +05:30
Achilles Rasquinha
b5393fd1ee [FIX] empty if pipe not found 2018-02-20 11:19:33 +05:30
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
rohitwaghchaure
2171a3acc2 Allow dynamic link in route options (#5027) 2018-02-19 11:21:59 +05:30
Dominik Ottenbreit
cc19e06ed7 Fix docstring information to be clear (#5025)
* Fix docstring information to be clear

Updated the docstrings due to errors I encountered:
* `is_private` must be 1, normally would expect true or false
* `filedata` must be urlencoded base64 to work

* Update client.py
2018-02-19 11:20:29 +05:30
rohitwaghchaure
3857c27962 Added promise for savesubmit method (#5028) 2018-02-19 11:18:33 +05:30
tundebabzy
c33b3b25d4 skip file if file name isn't as expected (#5029) 2018-02-19 11:17:22 +05:30
Faris Ansari
ef3a3fce9f
Chart Builder (#5019)
* Chart Builder

- X Axis selectable
- Multiple Y Axes
- Change Chart Type

* minor

* codacy
2018-02-19 11:08:17 +05:30
Charles-Henri Decultot
41598d22f0 Braintree integration (#4971)
* Braintree Integration WIP

* Braintree integration

* Link in config + settings after save

* Code cleanup

* Code cleanup

* JS beautify issue

* Codacy corrections

* Spaces to tabs
2018-02-16 15:16:23 +05:30
Zarrar
974d49dd09 fix keys not defined error (#5023) 2018-02-16 15:15:18 +05:30
Faris Ansari
e581be9fa8 Add translation support for DocFields (#5002)
* Initial changes for Translation

* Merged translate app into frappe core

* Minor typo fix

* Fixes while syncing translations

* Set defaults

* Fixes on setup

* Improve Code Quality

* Could Code Quality be Improved?

* Small code tweaks

* Minor typo fix

* Addition of Translatable Property

* Small fixes for Codacy Comments

* Simplify code

* Show translations in grid

* Remove enabled from Language

* Revert render_template logic

* typo

* Cleanup unused methods

* move patch to erpnext

* fix codacy

* Update patches.txt

* Update patches.txt
2018-02-16 15:12:12 +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