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

19760 commits

This branch
This branch
All branches
Author SHA1 Message Date
Rushabh Mehta
f89448151f
Merge pull request #7640 from rmehta/energy-point-log-list 
fix(energy-point-list): use standard list view
 2019-06-05 12:03:31 +05:30
Rushabh Mehta
39bda1749c fix(linting) 2019-06-05 12:03:11 +05:30
Rushabh Mehta
538195de21 fix(energy-point-list): use standard list view 2019-06-05 11:29:54 +05:30
Rushabh Mehta
15a9cb7684 fix(minor): dont apply depends_on while selecting chart filters 2019-06-05 08:54:59 +05:30
Rushabh Mehta
ce592a40b4
Merge pull request #7616 from prssanna/popover-fix 
fix(Link Preview Popover): Popover doesn't hide
 2019-06-03 16:59:37 +05:30
Rushabh Mehta
6480619307
Merge pull request #7572 from surajshetty3416/bulk-workflow-approval 
feat(list view): Bulk workflow approval
 2019-06-03 16:58:57 +05:30
Saurabh
1c4ec65896
Merge pull request #7629 from surajshetty3416/fix-print-format 
fix: Encode print format name passed through url
 2019-06-03 16:58:19 +05:30
Prssanna Desai
5f9de6d170 fix: call handle_popover_hide once during setup 2019-06-03 14:06:15 +05:30
Suraj Shetty
17628d7256 fix: encodeURIComponent print format 
- to support & character in print format name
 2019-06-03 14:02:50 +05:30
Suraj Shetty
d327dc518e refactor: Make function to create new todo 2019-06-03 12:18:30 +05:30
Rushabh Mehta
ea95b153b0
Merge pull request #7623 from navdeepghai1/desktop-list-fixes 
fix(list-view bug): fix for overlapping text
 2019-06-03 12:15:29 +05:30
Shivam Mishra
6628f1d017 fix: dropbox exception formatting (#7597) 2019-06-03 12:13:55 +05:30
Rushabh Mehta
33ef5e1e93
Merge pull request #7619 from deepeshgarg007/report-print-fix-develop 
fix: Query report print fix
 2019-06-03 12:10:11 +05:30
Suraj Shetty
b887091cbd fix: Clear cache after creating workflow 2019-06-03 12:05:33 +05:30
Saurabh
80b5a8f177
Merge pull request #7621 from saurabh6790/ignore_if_profile_already_cancelled 
fix(paypal): Ignore if profile is already cancelled
 2019-06-03 10:59:52 +05:30
Saurabh
745d123cd0
Merge pull request #7528 from saurabh6790/razopay_payment_capture_fix 
fix: before capturing payment first check payment status
 2019-06-03 10:50:02 +05:30
Mangesh-Khairnar
42ecf75ab5 fix: check required fields to create dashboard chart (#7620) 2019-06-03 10:22:56 +05:30
Suraj Shetty
8d40f513eb test: Add clear cache command 2019-06-03 09:33:51 +05:30
Suraj Shetty
4b120aabea test: Update list view UI test 2019-06-03 08:51:06 +05:30
Suraj Shetty
67b41deb44 test: Add test case to check get_common_transition_actions 2019-06-02 10:56:20 +05:30
Faris Ansari
38ad0e8018 fix: Add Blogger in module links (#7618) 
* fix: Add Blogger in module links

* fix: Blogger block styling on blog post
 2019-06-02 09:06:06 +05:30
Himanshu
0cefc9264b fix(Communication): table doesn't exist (#7624) 
* fix: table doesnt exist

* fix: import frappe
 2019-06-02 08:57:17 +05:30
navdeepghai1
3b9ff43549
fix(list-view bug): fix for overlapping text 2019-05-31 21:36:02 +04:00
Saurabh
b4d01ff8ee fix: ignore if profile already in cancelled state 2019-05-31 18:38:14 +05:30
deepeshgarg007
a25e66cc00 fix: Query report print fix 2019-05-31 16:54:50 +05:30
Prssanna Desai
1b762737cd fix: popover goes away after 10 seconds 2019-05-31 14:30:37 +05:30
Suraj Shetty
8528298b55 test: Init bulk approval test 2019-05-31 13:44:15 +05:30
Suraj Shetty
0d9ee53fab fix: Toggle workflow actions only if workflow exists 2019-05-31 13:43:58 +05:30
Deepesh Garg
56cef48169
Merge pull request #7612 from adityahase/fix-query-report-custom-columns 
fix(query-report): Adding custom column data when result row is a tuple
 2019-05-30 19:12:43 +05:30
Aditya Hase
2ff298c587 fix(query-report): Adding custom column data when result row is a tuple 
Result row can be a list, dict or a tuple.

Previously handled cases:
Case dict: row can be used as it is
Case list: row is converted to an equivalent dict

Unhandled case (fixed with this commit):
Case tuple: row is converted to a list so that it can be handled with the list case
 2019-05-30 17:47:54 +05:30
Suraj Shetty
12f06d6af7 fix: Change progress title 2019-05-30 17:29:35 +05:30
Rushabh Mehta
f0ca3109c0
Merge pull request #7606 from netchampfaris/blog-post-styling 
fix: Blog Post styling
 2019-05-30 17:16:21 +05:30
Rushabh Mehta
a145c88256
Merge pull request #7611 from adityahase/validate-fieldname 
fix(doctype): Fieldname should not be in restricted fieldnames
 2019-05-30 17:12:40 +05:30
Faris Ansari
7f24a3f71d fix: Show user fullname in mentions (#7592) 
* fix: Show user fullname in mentions

* fix: Remove unused import

* fix: Update tests
 2019-05-30 16:37:40 +05:30
Aditya Hase
f16476a117 fix(doctype): Fieldname should not be in restricted fieldnames 
If fieldname wasn't provided and the fieldname generated from label
was found to be in restricted names then 1 was appended to the newly
prepared fieldname
e.g. Name becomes name1

But the fieldname was allowed to be edited later to bypass this restriction
i.e.. name1 can be renamed to name

This fixes that.

Co-authored-by: Suraj Shetty <surajshetty3416@gmail.com>
 2019-05-30 16:06:59 +05:30
Saurabh
769e600ef0
Merge pull request #7609 from frappe-pr-bot/translations-2019-05-30 
feat: Updated translation
 2019-05-30 15:55:52 +05:30
Rushabh Mehta
6b721eee44 fix(minor): jquery_plugins for website 2019-05-30 15:28:35 +05:30
Suraj Shetty
50a1f1023f
fix: Use get_meta to avoid error 2019-05-30 15:16:09 +05:30
Faris Ansari
b84bca546b fix: Move add_options plugin to select.js (#7608) 2019-05-30 14:22:14 +05:30
Karthikeyan S
0404390064 fix(Barcode): excluding Barcode feild from XSS FIlter (#7604) 2019-05-30 13:50:05 +05:30
Faris Ansari
00e77355df fix: Make Blogger avatar rounded (#7603) 2019-05-30 13:48:30 +05:30
Faris Ansari
12d12c640b fix: Web Page (#7593) 
- Sender fullname bug
- Rename section SEO to "Header, Breadcrumbs and Meta Tags"
 2019-05-30 13:48:03 +05:30
frappe
1eb5257887 feat: Updated translation 2019-05-30 08:17:44 +00:00
Saurabh
b28c55e718
Merge pull request #7607 from saurabh6790/handle_import_error 
fix: remove line numbers from source messages
 2019-05-30 13:01:16 +05:30
Saurabh
3fde67d308 fix: remove line numbers from source messages 2019-05-30 12:26:48 +05:30
Faris Ansari
069e694881 fix: Blog Post styling 2019-05-30 12:26:38 +05:30
Aditya Hase
b94bbb34a9 fix(list-view): Escape quotes in data-name (#7600) 
Fixes misbehaviour in bulk actions when selected documents have names
with quotes.
 2019-05-30 10:52:50 +05:30
Suraj Shetty
61cc0d7918 Merge branch 'develop' of https://github.com/frappe/frappe into bulk-workflow-approval 2019-05-29 20:38:17 +05:30
Shivam Mishra
37283e4e84
Merge pull request #7595 from adityahase/fix-email-autosuggest-develop 
fix(email): Search contacts by email_id as well
 2019-05-29 20:03:12 +05:30
Aditya Hase
df58d1e1c4 fix(email): Search contacts by email_id as well 
Email auto suggest now performs lookup on contact name and email_id fields
 2019-05-29 18:05:43 +05:30