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
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
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
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
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
Saurabh
7ca5cf58ab
Merge branch 'master' into develop
2018-02-15 23:20:58 +05:30
Saurabh
7b9c87444b
Merge branch 'hotfix'
2018-02-15 23:20:57 +05:30
Saurabh
fae73e9cda
bumped to version 10.0.25
2018-02-15 23:50:57 +06:00
Saurabh
37d81a1fe7
Merge pull request #5020 from saurabh6790/fix_get_max_email_uid
...
[fix] remove ifnull from get_max_email_uid fields
2018-02-15 23:19:00 +05:30
Saurabh
e540fd26da
[fix] remove ifnull from get_max_email_uid fields
2018-02-15 22:38:06 +05:30
Shreya Shah
5d9d64423d
Print progress bar on new line ( #5018 )
2018-02-15 17:53:56 +05:30
Achilles Rasquinha
a819d3260c
Merge pull request #5017 from achillesrasquinha/py3-rawinput
...
replaced raw_input to input
2018-02-15 16:15:22 +05:30
Achilles Rasquinha
14924620dc
replaced raw_input to input
2018-02-15 15:38:06 +05:30
Kenneth Sequeira
8fb49fcac0
Responsive iframe ( #5005 )
...
* testing resposive iframe
* changes to website.css + website.less
2018-02-15 15:29:54 +05:30
rohitwaghchaure
67e589a792
[Fix] Not able to pull items from opportunity in RFQ ( #5006 )
2018-02-15 15:29:11 +05:30
Neil Trini Lasrado
c4a6242be3
Added Full Name and Username to standard filters in User doctype, also added full name to global search ( #5008 )
2018-02-15 15:26:45 +05:30
Harsh Patel
eae66bdb22
Remove tags with spaces ( #5015 )
2018-02-15 15:24:31 +05:30
Saurabh
cd5e99c0ea
Merge branch 'master' into develop
2018-02-15 15:18:13 +05:30
Saurabh
d244dd8ef6
Merge branch 'hotfix'
2018-02-15 15:18:12 +05:30
Saurabh
24972722be
bumped to version 10.0.24
2018-02-15 15:48:12 +06:00
Saurabh
a5aa257265
Merge pull request #5012 from Zlash65/fix-dl
...
[Fix] Dynamic Link not working in report
2018-02-15 14:04:51 +05:30
Achilles Rasquinha
1cf677a32d
Merge pull request #5013 from revant/form_dict_fix
...
handle IndexError for form_dict
2018-02-15 13:49:17 +05:30
Revant Nandgaonkar
9f0c0aecf6
handle IndexError for form_dict
2018-02-15 13:24:19 +05:30
Zlash65
31e3454372
fix dl for reports
2018-02-15 12:42:30 +05:30
Nabin Hait
af7401865f
translated messages
2018-02-15 11:33:26 +05:30
Prateeksha Singh
3e181bae51
Merge pull request #5011 from pratu16x7/treeview-fixes
...
[minor] more treeview decoupling
2018-02-15 11:07:04 +05:30
Prateeksha Singh
041496474d
more treeview decoupling
2018-02-15 11:06:10 +05:30
Achilles Rasquinha
86aa97bdc2
show progress of database restore
2018-02-14 20:14:36 +05:30
Saurabh
676fdc0098
Merge branch 'master' into develop
2018-02-14 11:43:00 +05:30
Saurabh
ada9936d60
Merge branch 'hotfix'
2018-02-14 11:42:59 +05:30
Saurabh
396366c1e2
bumped to version 10.0.23
2018-02-14 12:12:59 +06:00
Achilles Rasquinha
283290e734
Merge pull request #5003 from achillesrasquinha/fixes-py3
...
encode utf-8 for help database
2018-02-13 18:48:48 +05:30
Achilles Rasquinha
c023695e71
encode utf-8 for help database
2018-02-13 18:28:48 +05:30
Achilles Rasquinha
331a47749f
Merge pull request #4999 from achillesrasquinha/py3-fixes
...
Avoid Dynamic key build during RunTime [Python 3]
2018-02-13 18:20:27 +05:30
Faris Ansari
3e15c148bd
[hotfix] Deadlock fix rename doc ( #5001 )
...
* [deadlock fix] rename_version before delete_doc
* Move delete_doc to end of rename_doc
2018-02-13 16:01:58 +05:30
Saurabh
40d818af90
[hotfix] sanitize fields to avoid mysql injection ( #4994 )
...
* [fix] sanitize fields to avoid mysql injection
* sanitize sql statements to avoid subqueries
* Added test cases
* Raise exception if mysql injection found in fields and related test-cases
* [fix] riase exception if blacklistes function or keyworkds found in fields
2018-02-13 14:45:51 +05:30
ci2014
a40c8dd3bb
Allow users to define default language for print format ( #4777 )
...
* Update print_format.json
* Update print.js
* Update print.js
* Update form.js
* Set default lang when print_format lang not found
2018-02-13 13:33:52 +05:30
Achilles Rasquinha
0cc8feb17c
fixed file encoding at render js
2018-02-13 13:23:24 +05:30
Achilles Rasquinha
926ccbe3dc
functools to compare keys
2018-02-13 13:03:59 +05:30
Achilles Rasquinha
99e2b9415a
Avoid Dyanmic key build during RunTime
2018-02-13 12:44:57 +05:30
Achilles Rasquinha
8112bbe2a9
Merge pull request #4998 from achillesrasquinha/py3-fixes
...
Python 3 Fixes [Merge ASAP]
2018-02-13 12:40:12 +05:30
Achilles Rasquinha
4433250cda
Python 3 fixes
2018-02-13 12:27:02 +05:30
Shridhar Patil
abaa7d4e18
If user has active session, redirect to desk ( #4661 )
...
* Redirect to desk if user has active session
* Removed un used imports
* if website user redirect to /me
* Update login.py
2018-02-13 11:19:43 +05:30
Britlog
ec52cb4744
Price rounding Half Up ( #4904 )
2018-02-13 11:03:03 +05:30
Revant Nandgaonkar
856cbfa675
Attach file via ReST API (POST) ( #4965 )
...
* Attach file via ReST API (POST)
* [Fix] import save_file
* request body as param, validate request method
* explicit naming - decode_base64
2018-02-12 17:06:58 +05:30
