vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
17127 commits 1 branch 0 tags 587 MiB
Commit graph

17127 commits

This branch
This branch
All branches
Author SHA1 Message Date
Faris Ansari
3cb3bc4bb6
Merge pull request #6589 from netchampfaris/query-report-fixes-4 
fix: Update Datatable to 1.6.1
 2018-12-07 16:33:26 +05:30
Faris Ansari
5d3c739145 fix(Quill): Use pre tag instead of div (#6585) 2018-12-07 15:55:43 +05:30
Faris Ansari
a4e30abac2 fix: Update Datatable to 1.6.1 2018-12-07 15:30:18 +05:30
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
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
Faris Ansari
4d1a557fa3 fix: Only apply saved filters on page load (#6574) 2018-12-02 12:01:27 +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
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
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
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
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
Prateeksha Singh
0f6bc4c451
Update stale.yml 2018-11-26 14:43:19 +05:30
Faris Ansari
7bdfb1d67f
Merge pull request #6529 from rohitwaghchaure/dashboard_links_are_not_working 
[Fix] Dashboard links are not working
 2018-11-26 09:16:04 +01:00
Faris Ansari
7419ea8e49
Merge branch 'staging-fixes' into dashboard_links_are_not_working 2018-11-26 08:44:49 +01:00
Faris Ansari
c066bbc9e5
fix: Check length of filters 2018-11-25 21:01:02 +01:00
Rohit Waghchaure
41296ad030 [Fix] Dashboard links are not working 2018-11-23 17:18:14 +05:30
Ameya Shenoy
2698aede0c bumped to version 11.0.3-beta.30 2018-11-23 08:14:29 +00:00
Ameya Shenoy
d1d0edc636
Merge branch 'master' into staging-fixes 2018-11-23 08:07:36 +00:00
Ameya Shenoy
889d56ae54 bumped to version 10.1.64 2018-11-23 08:02:14 +00:00
rohitwaghchaure
840bd03944
Merge pull request #6527 from rohitwaghchaure/fetch_from_works_even_after_submission_of_document 
[Fix] Fetch from works after submission of document
 2018-11-23 11:43:21 +05:30
Suraj Shetty
b0bbc1860e
Merge branch 'staging-fixes' into fetch_from_works_even_after_submission_of_document 2018-11-23 11:08:31 +05:30
Faris Ansari
5e170de52e
Merge pull request #6478 from adityahase/redis-fix 
fix(redis-wrapper): Do not assume existence of superclass of redis.Redis
 2018-11-22 20:00:11 +01:00