Commit graph

17400 commits

Author SHA1 Message Date
Faris Ansari
f23700d33a
Merge pull request #6586 from Thunderbottom/email-attachment-fix
communication: fix attachments in email queue and generated reports
2018-12-07 16:38:05 +05:30
pengfeiqin
b9d6e2d1ea fix: deferred insert json.loads() typeError (#6577) 2018-12-06 20:14:51 +05:30
Chinmay Pai
25f5d65632
communication: handle attachment case for both filename and fileid
some incoming files could have either filename or fileid for whatever reason. this handles both those cases (at least for now).

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
2018-12-06 19:32:10 +05:30
Chinmay Pai
ba0045ef1f
communication: fix attachments in email queue and generated reports
so, apparently i messed up some things that were responsible for handling file attachments in email queue and attached on-the-fly generated reports. these issues should be fixed now.

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
2018-12-06 18:12:34 +05:30
Frappe Bot
b2779c617a Merge branch 'staging' into develop 2018-12-06 09:31:40 +00:00
Frappe Bot
bc3934ac68 Merge branch 'staging-fixes' into staging 2018-12-06 09:30:26 +00:00
Frappe Bot
af89f23882 bumped to version 11.0.3-beta.33 2018-12-06 09:30:26 +00:00
Frappe Bot
b39bbe9baf Merge branch 'master' into staging-fixes 2018-12-06 09:09:06 +00:00
Frappe Bot
be52744453 Merge branch 'hotfix' 2018-12-06 08:54:30 +00:00
Frappe Bot
bd3b14ac18 bumped to version 10.1.67 2018-12-06 08:54:30 +00:00
Suraj Shetty
01eb5c0bff [Social] Post loading skeleton (#6579)
* Show post skeleton before actual post loads

* Fix menu positioning
2018-12-04 10:05:41 +05:30
Faris Ansari
9d13d3cd07 fix[filters]: Load filters from report doc & more(#6556)
* fix(Custom Report): Load filters from report doc

For Custom Report, load filters only from the report doc. For the report
builder, filters should load similar to listview.

* fix(Kanban): Explicit menu action to save filters

* fix: indent

* fix: Always route to the List view from dashboard
2018-12-03 15:52:53 +05:30
Deepesh Garg
17e3e6f557 Add after_render hook in query_report.js (#6565)
* Check first row in datatable

* row check bug fix
2018-12-03 13:01:59 +05:30
Saif
7610d6fb05 WebsiteGenerator call super class clear_cache (#6542) 2018-12-03 09:35:03 +05:30
Faris Ansari
83d6659e12 Add UI tests using Cypress (#6562)
* test(UI): Add UI tests using cypress

* test: Add test configuration for travis

* fix: Lock redis version

* fix: Refactor fill_field command

* fix: Rename setup_wizard test to run first

* test: Add setup for dashboard service

* test: Add build matrix for ui test

* test: Add name to each build matrix

* test: Only include ui test for an extra build stage

* fix: Exclude UI test with python 3.6

* test: Test order

* test: Enable developer_mode

* test(login): Check session user and not hash

* test: Refactor assert

* test: Refactor setup wizard test

* test: Remove setup wizard test

* test: Add blank seed database

* test(form): Scroll to top before save

* test: Fix form test

* test: timeout

* test: more wait

* test: Remove specific selector

* test: Remove wait, delay typing

* test: Blur input after typing

* test: Wait for form to get dirty

* test: Add credentials for frappe org

* test: Remove node install step

* style: Fix linting issues

* fix: List view filters

- ToDo: Dont override frappe.route_options if it is already set

* test: Dont reload page before test
2018-12-03 09:07:31 +05:30
Faris Ansari
4d1a557fa3 fix: Only apply saved filters on page load (#6574) 2018-12-02 12:01:27 +05:30
Faris Ansari
8ec0bdc402 fix(HTMLEditor): Inherit HTML Editor from Markdown Editor (#6573) 2018-12-01 10:33:22 +05:30
Faris Ansari
7e5decc9f7 fix(QueryReport): Dynamic Total Row in Query Report (#6566)
The total row sent by the server does not update when rows are filtered.
Datatable now has a bulit-in dynamic total row
2018-11-30 18:51:32 +05:30
Aditya Hase
cc1698c927 fix(website-chat): Show chat window if chat alert is clicked (#6558)
* fix(website-chat): Show chat window if chat alert is clicked

* fix: Add cursor pointer to make it look clickable
2018-11-29 22:16:47 +05:30
Aditya Hase
e3ae0722c4 fix(security): Make Jinja tighter (#6564) 2018-11-29 17:24:46 +05:30
Ameya Shenoy
0ecad79fd1 bumped to version 11.0.3-beta.32 2018-11-29 09:48:47 +00:00
Ameya Shenoy
5857b9266b bumped to version 10.1.66 2018-11-29 09:45:15 +00:00
Suraj Shetty
5d477ff6e9 Update gantt library (#6541)
* Update gantt library
- Current version is ver 0.3.0

* Add frappe-gantt.css
2018-11-29 12:49:26 +05:30
Zarrar
aff557914e fix: delete event if its reference doc is deleted (#6453)
* delete events associated with any reference doctype

* fix query, remove whitelist
2018-11-29 12:19:26 +05:30
Himanshu Mishra
dcf701087c fix: extract data as string before passing to json.loads (#6552) 2018-11-29 12:02:12 +05:30
Ameya Shenoy
79bd1ed9d6 fix: identify production mode for PDF generation (#6559)
In regards to PDF generation, if developer_mode was set to true, the PDF
generated used to lack css styling. This was because the URL to the CSS
assets used to contain the webserver port number, but given the system
was running in production, the URL was invalid, thereby not being able
to load CSS assets. This fix does not rely on the value of
developer_mode to identify if the system is running in production,
rather, it uses the value of restart_superviosor or systemd_on_update,
to check for the same.
2018-11-29 10:31:53 +05:30
Anurag Mishra
94a4acf364 feat: Allow Contact to unsubscribe from specific lists (#6458)
* intial commit

* changes

* added validation

* bux fixes

* confirmed_unsubscribe code raw mysql query removed

* moved everything to single file for optimisation

* UI fixes

* fixed csrf token not found

* removed the older function(method)

* code refracted or added some comment

* changes

* ui enhancement

* codacy fixes

* Ui fixes

* Applied Requested changes

* code optimisation

* fixed unit test

* more validation

* Ui fixes

* removed print statement which was used for tracing

* change

*  done changes requested

* done chnages requested

* Make code more self-explanatory

* Fix some code formatting
- Add more descriptive name/id for buttons
- Rearrange a comment
- Remove some unwanted line breaks
- change status values

fixes #15961 issue
2018-11-29 10:28:37 +05:30
Suraj Shetty
89c4571062
fix: check if key exists (python3 compatible) 2018-11-29 09:32:16 +05:30
Saurabh
087e401c78 Customize payment success message (#6460)
* Provision to set custom payment success message

* typo fix

* Fix formatting
2018-11-29 09:07:38 +05:30
Shreya Shah
6f550c5c1e fix: Hide print for single doctypes (#6553) 2018-11-29 09:07:21 +05:30
Suraj Shetty
6aef726beb
fix: check if key exists (with python3 support) (#6557)
https://stackoverflow.com/a/1323426/5955589
2018-11-29 01:18:04 +05:30
Ameya Shenoy
c5d276b813
Merge branch 'staging' into develop 2018-11-28 08:24:00 +00:00
Ameya Shenoy
cfc3c60acc bumped to version 11.0.3-beta.31 2018-11-28 08:14:06 +00:00
Ameya Shenoy
f513739d1a
Merge branch 'master' into staging-fixes 2018-11-28 07:53:35 +00:00
Ameya Shenoy
bb585e59d2 bumped to version 10.1.65 2018-11-28 07:42:16 +00:00
Saurabh
4738a9711a fix: tighten protection against sql injection (#6546) 2018-11-28 10:22:30 +05:30
rohitwaghchaure
1cb64cf06e fix: Web form grid view for Text Editor showing toolbar (#6547) 2018-11-28 10:14:11 +05:30
rohitwaghchaure
7195cfd03c fix: KeyError: '_comment_count'(#6549) 2018-11-28 09:01:18 +05:30
Faris Ansari
8cf5987b0a fix: Update datatable (#6551) 2018-11-28 08:59:18 +05:30
Ameya Shenoy
044492e97e
Merge pull request #6545 from saurabh6790/additional_keys_in_limits
additional key support
2018-11-27 13:49:38 +05:30
Saurabh
d7794ed04b additional key support 2018-11-27 12:53:19 +05:30
Faris Ansari
0e1107b982 fix(email): Dont append last email in the next reply (#6471)
In large threads, this leads to snowballing of replies, sometime even
reaching more than 5 million characters.
Email threads are already maintained in ERPNext, and modern clients
are capable of maintaining threads.
The only purpose it serves is maintain threads for text based email
client, and I think we should ignore that use case, for improved user
experience for Frappe/ERPNext users.
2018-11-26 21:55:09 +05:30
Deepesh Garg
e49ee43b73 Travis Fixes (#6543) 2018-11-26 19:34:46 +05:30
Prateeksha Singh
87cfe05b5c
Merge pull request #6480 from codingCoffee/css
css: v10 built css
2018-11-26 19:30:42 +05:30
Prateeksha Singh
35c8a1db4b
Merge branch 'hotfix' into css 2018-11-26 19:27:57 +05:30
Faris Ansari
de1f2309a7 fix: Patch to migrate report settings (#6477)
Some keys in the JSON changed from v10 to v11
2018-11-26 17:51:23 +05:30
Faris Ansari
177a9539b3
Merge pull request #6485 from surajshetty3416/searchable_functions
feat: make any function searchable via global search
2018-11-26 12:22:55 +01:00
rohitwaghchaure
c0e7ceba13 [Fix] Auto email report, zero value row skipped (#6524) 2018-11-26 12:17:07 +01:00
Ameya Shenoy
3669203acf fix(get_version): from hooks.py instaed of git (#6534) 2018-11-26 12:16:12 +01:00
Nabin Hait
e50e6deed3
fix(fetch from): Always set value based on fetch_from if new doc (#6536) 2018-11-26 16:14:58 +05:30