Commit graph

15396 commits

Author SHA1 Message Date
Achilles Rasquinha
5f522510d5 Functional Website Chat 2018-03-26 01:36:03 +05:30
Achilles Rasquinha
27bcc320ef raw commit 2018-03-23 20:28:28 +05:30
Achilles Rasquinha
2c90f4d5b9 raw commit 2018-03-23 17:19:25 +05:30
Achilles Rasquinha
474e219e97 Raw commit 2018-03-22 17:34:07 +05:30
Achilles Rasquinha
15eaffdea1 added doctypes 2018-03-22 14:45:46 +05:30
Achilles Rasquinha
cece071dff added website chat 2018-03-22 14:43:28 +05:30
Suraj Shetty
436d7a0d4e Data export tool (#5213)
* Data export tool
New doctype to export data
Child table export option
Ability to add filter

* Filter view refactor
Separated filter css

* Moved exporter script from data import doctype to data export doctype

* some input validation

* removed unwanted file and some style fixes

* removed console log

* hide sidebar

* renamed export method

* added data export link in setup module page

* minor fix

* refactor exporter.py

* data export ui tweaks

* codacy and bug fix

* silly code fixes

* [minor] indentation fix
2018-03-22 11:30:48 +05:30
Faris Ansari
29baefefe3
IE11 fix - login (#5247)
* Add Polyfill of Object.assign for IE11

fixes frappe/erpnext#12703

* fix codacy
2018-03-22 11:11:20 +05:30
Achilles Rasquinha
7666a58c81
Merge pull request #5246 from shreyashah115/alert-sound
Uncomment alert sound in hooks.py
2018-03-22 09:10:22 +05:30
Shreya
b25716e681 uncomment alert sound 2018-03-21 23:21:53 +05:30
Faris Ansari
3df26a8059
Update frappe-datatable to 0.0.3 (#5243) 2018-03-21 17:42:10 +05:30
Faris Ansari
b383e2235f
DataTable in GridReport (#5234)
* DataTable in GridReport

* Remove query_report_old

* Remove SlickGrid library 💃
2018-03-21 12:36:55 +05:30
Faris Ansari
4cafe66a3a
Kanban Board Fixes (#5236)
- fix frappe/erpnext#13153
- Add card title field in list fields
- Quick entry if atleast 1 mandatory field is Table
2018-03-21 12:36:41 +05:30
Faris Ansari
2322010aa6
Remove !important rules so that custom css in Print Format can override (#5235) 2018-03-21 12:35:00 +05:30
Rushabh Mehta
b6936d4980 [minor] defensive fixes 2018-03-21 12:27:12 +05:30
Rushabh Mehta
317d756872 [ui] email not large 2018-03-20 22:56:57 +05:30
Achilles Rasquinha
5ca949cc2b
Merge pull request #5239 from achillesrasquinha/py3-test
Fixed transaction_log test case
2018-03-20 20:46:00 +05:30
Achilles Rasquinha
8670b9977a Fixed transaction_log test case 2018-03-20 20:08:00 +05:30
Achilles Rasquinha
be18c68bff
Merge pull request #5238 from achillesrasquinha/py3-test
test_recurring for Python 3 Fix.
2018-03-20 19:55:31 +05:30
Achilles Rasquinha
3affb397c2 Fixed Python 3 test 2018-03-20 19:54:28 +05:30
Zarrar
cca0b0afd4 order_by can be configured if need be (#5233) 2018-03-20 14:08:37 +05:30
Faris Ansari
9f5a129333
Rollup Fixes (#5232)
- Use PostCSS instead of Less plugin
- Fixes CSS append problem
- Show which css file changed instead of rollup.manifest.css
- Minify CSS in production
- Cannot import less/css files in js files, put them in build.json
- Let's avoid major changes in Frappe Framework now :)
2018-03-20 13:51:53 +05:30
Achilles Rasquinha
e18b6ef190
Update .travis.yml 2018-03-20 10:54:35 +05:30
Achilles Rasquinha
12769fef76
Merge pull request #5226 from mntechnique/oauth_ropcg
OAuth 2.0 : Resource Owner Password Credentials Grant
2018-03-20 09:58:23 +05:30
Achilles Rasquinha
347aece92f
Merge pull request #5228 from achillesrasquinha/py3-fixes
fixed bytesio object generation for python 2 and 3 for excel
2018-03-20 01:10:11 +05:30
Achilles Rasquinha
611a74445e fixed bytesio object generation for python 2 and 3 for excel, wtf email 2018-03-20 01:07:17 +05:30
Achilles Rasquinha
dde3b39c94
Merge pull request #5227 from achillesrasquinha/py3-fixes
Convert Map Lambda to spread function
2018-03-20 00:46:41 +05:30
Achilles Rasquinha
b5964b58a4 Fixed Python 3 2018-03-20 00:45:07 +05:30
Revant Nandgaonkar
f4a254d0f7 py3-ready encode returns bytes 2018-03-19 23:11:46 +05:30
Revant Nandgaonkar
34e9c2c5ac OAuth 2.0
Resource Owner Password Credentials Grant
2018-03-19 22:27:22 +05:30
Achilles Rasquinha
48205d2cd4
Merge pull request #5225 from achillesrasquinha/dill
removed dill, revert to cPickle
2018-03-19 22:05:44 +05:30
Achilles Rasquinha
0bf3411391 removed dill, revert to cPickle 2018-03-19 19:23:14 +05:30
Achilles Rasquinha
42321dbefd
Merge pull request #5224 from achillesrasquinha/fix-throttle
fixed throttling
2018-03-19 19:13:59 +05:30
Achilles Rasquinha
22a318a9ff fixed throttling 2018-03-19 19:10:57 +05:30
Rushabh Mehta
d2f82d7bdc [fix] base_control.js for website 2018-03-19 18:44:42 +05:30
Charles-Henri Decultot
17855fad80 Transaction Log Report (#5207)
* Transaction Log Report

* Error correction
2018-03-19 18:25:57 +05:30
Rushabh Mehta
a3910cde9b
[debug] dont silently fail if requirements are missing (#5201) 2018-03-19 18:25:32 +05:30
Faris Ansari
5a1a4386d7
Fix CSV export for dict like rows (#5222) 2018-03-19 17:06:59 +05:30
Faris Ansari
8992cb28a3
[fix] cell height in datatable (#5221) 2018-03-19 14:59:31 +05:30
Achilles Rasquinha
2298ee72fd
Merge pull request #5219 from Zlash65/email-fix
[Fix] Email css fix
2018-03-19 13:52:03 +05:30
Zlash65
49a073a102 revert css changes for email 2018-03-19 13:14:33 +05:30
Faris Ansari
32b2eb4789
Handle null values in CSV export (#5218) 2018-03-19 12:59:56 +05:30
Faris Ansari
625083d664
[QueryReport] Column titles in CSV Export (#5216) 2018-03-19 12:46:57 +05:30
Achilles Rasquinha
5e8ff63942
Merge pull request #5217 from achillesrasquinha/frappe-chat
chat import fixes
2018-03-19 12:45:16 +05:30
Rushabh Mehta
3e1342721e [fix] globals 2018-03-19 12:39:33 +05:30
Achilles Rasquinha
d399e13965 chat import fixes 2018-03-19 12:33:22 +05:30
Achilles Rasquinha
4f4bf25d92
Merge pull request #5215 from achillesrasquinha/check-moment
check moment exists the right way
2018-03-19 12:07:57 +05:30
Achilles Rasquinha
448b338e84 check moment exists the right way 2018-03-19 12:05:04 +05:30
Achilles Rasquinha
b010b0a45b
Merge pull request #5212 from achillesrasquinha/fix-csv
fixed csv utils
2018-03-18 14:16:09 +05:30
Achilles Rasquinha
f06b15bccb Fixed csv utils 2018-03-18 14:14:48 +05:30