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

21941 commits

This branch
This branch
All branches
Author SHA1 Message Date
Himanshu Warekar
02cebdd7d3 fix: use frappe.tags 2019-10-03 16:43:36 +05:30
Himanshu Warekar
c0a5ad1456 Merge branch 'develop' of https://github.com/frappe/frappe into global_tags 2019-10-03 12:30:53 +05:30
ci2014
f0b59df21c Let developers choose the margins (#8513) 
* Let developers choose the margins

Let the developers choose the margins

* fix: remove trailing whitespace
 2019-10-03 06:25:38 +00:00
Faris Ansari
70e11cdb91
fix: Show Text Editor for Content Type Rich Text (#8537) 2019-10-03 11:47:41 +05:30
Bob Schulze
14222cb078 handle case that df is None for this branch too (#8529) 2019-10-03 06:17:34 +00:00
Deepesh Garg
198e999baf fix: Show maximum 5 values for a field in filter description (#8539) 2019-10-03 11:22:32 +05:30
Himanshu
9dfce7bbbf fix: run specific code only if auto linking is onn (#8542) 
* fix: run specific code only if auto linking is onn

* fix: rerun comm patch again

* chore: remove extra comma from dict

* fix: change email_account name
 2019-10-03 05:50:36 +00:00
mergify[bot]
997dff896d
Merge pull request #8518 from ruchamahabal/fix-webhook-fields 
fix: webhook data
 2019-10-02 13:21:35 +00:00
mergify[bot]
172ce12fe9
Merge pull request #8540 from adityahase/fix-ugly-ui 
fix(list-view): Remove ugly scroll from list view
 2019-10-02 13:18:48 +00:00
Aditya Hase
2ec267f63b
fix(list-view): Remove ugly scroll from list view 2019-10-02 18:37:27 +05:30
Rucha Mahabal
6a56349173 fix: webhook label changes 2019-10-02 17:59:38 +05:30
Himanshu
3f980dbd79 fix(Global Search Settings): Show progress while setting global search doctypes (#8515) 
* fix: add frm dashboard

* fix: add search for other domains

* fix: set global search doctypes for all domains

* fix: add doctypes to global search dict in hooks

* fix: Remove unused variable
 2019-10-02 11:43:42 +00:00
Sahil Khan
0d77727789 Merge branch 'develop' into version-12 2019-10-02 16:35:43 +05:30
Sahil Khan
bd5cc03f4a bumped to version 12.0.16 2019-10-02 16:55:43 +05:50
mergify[bot]
063786c498
Merge pull request #8536 from scmmishra/raw-printing-check 
fix: validate conditions for raw printing
 2019-10-02 09:18:39 +00:00
mergify[bot]
9b9c046c80
Merge pull request #8530 from frappe-pr-bot/translations-2019-10-01 
feat: Updated translation
 2019-10-02 08:42:08 +00:00
Faris Ansari
fcd638020c fix: Show Text Editor for Content Type Rich Text 2019-10-02 14:00:46 +05:30
Shivam Mishra
8cb6528c03 fix: validate conditions for raw printing 2019-10-02 13:19:52 +05:30
mergify[bot]
4acf9ad543
Merge pull request #8514 from saurabh6790/handle_SMTPRecipientsRefused_exception 
fix: handle smtp recipients refused exception
 2019-10-02 07:07:36 +00:00
mergify[bot]
3aa99f0143
Merge pull request #8532 from surajshetty3416/fix-file-issue 
fix: Ignore permissions while creating file for prepared report
 2019-10-02 06:55:48 +00:00
Himanshu Warekar
a5a48f2054 fix: left join Tag Link 2019-10-02 11:39:25 +05:30
mergify[bot]
775503cfd8
Merge pull request #8497 from thefalconx33/internal-issues 
fix: Incorrect currency value while pasting from excel to grid and other UX issues
 2019-10-02 06:02:47 +00:00
Deepesh Garg
915b1947d3 feat: Fully customizable query reports (#8516) 
* fix: Custom print format
* fix: Allow deleting columns in custom report
 2019-10-02 11:29:49 +05:30
mergify[bot]
70fe3f96f0
Merge pull request #8534 from surajshetty3416/fix-style-review-popover 
fix: Prevent long review text from busting out of the body
 2019-10-02 05:55:32 +00:00
Suraj Shetty
acd33a4e50 fix: Prevent long review text from busting out of the body 2019-10-02 10:45:09 +05:30
Suraj Shetty
1281020181
Merge pull request #8533 from surajshetty3416/fix-typo 
fix: Typo
 2019-10-02 09:27:49 +05:30
Suraj Shetty
3c7125a2eb
style: Fix formatting 2019-10-02 09:18:27 +05:30
Suraj Shetty
14ad837969 fix: Typo 2019-10-02 09:10:28 +05:30
Suraj Shetty
a2d9e5df1a fix: Ingore permissions while creating file for prepared report 2019-10-01 19:06:55 +05:30
frappe
502db9fbc5 feat: Updated translation 2019-10-01 11:44:42 +00:00
Faris Ansari
63cb27b924
feat: New Data Import (#8310) 2019-09-30 23:54:54 +05:30
Faris Ansari
d3b3d0c38d style: Fix codacy errors 2019-09-30 20:08:28 +05:30
Faris Ansari
15c48079df tests: Make exporter tests pass 2019-09-30 19:32:21 +05:30
Faris Ansari
4277da02eb test: Make tests pass 2019-09-30 19:17:27 +05:30
Himanshu Warekar
30595889bd fix: rename patch file 2019-09-30 18:39:56 +05:30
Himanshu Warekar
cd16373b53 patch: move to new tag structure 2019-09-30 18:12:37 +05:30
mergify[bot]
1e54db0df5
Merge pull request #8521 from Thunderbottom/notification-mail-fix 
fix(notifications): do not send emails if no recipients
 2019-09-30 10:38:38 +00:00
Chinmay D. Pai
e2f4c076c7
fix(notifications): do not send emails if no recipients 
notifications triggered through hooks have no checks for recipients, if
no recipients exist, sending mails shouldn't be attempted

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2019-09-30 15:41:16 +05:30
mergify[bot]
d6c5b6d10d
Merge pull request #8519 from hrwX/addr_cont_fix 
fix(Contact): change filters for contact
 2019-09-30 09:57:32 +00:00
mergify[bot]
5f33dd17c6
Merge pull request #8489 from prssanna/leaderboard-refactor 
feat(Leaderboard): Add Energy Points Leaderboard to Leaderboard
 2019-09-30 09:47:09 +00:00
Himanshu Warekar
ff1ef65e94 fix: rename filters for contact 2019-09-30 14:33:36 +05:30
Himanshu Warekar
c01eadcac0 Merge branch 'develop' of https://github.com/frappe/frappe into global_tags 2019-09-30 13:59:28 +05:30
Faris Ansari
b382be67d5 feat: data-import command 
Use the new Data Import from the command line

```
bench --site sitename data-import --doctype Item --file /path/to/csvfile.csv
```
 2019-09-30 13:39:43 +05:30
Faris Ansari
660a1d43d2 fix: Commonify autoname_field code 2019-09-30 13:38:41 +05:30
Faris Ansari
d87f60b177 fix: Child row parsing logic 
if the row is blank, it's a child row doc
if the row has same values as parent row, it's a child row doc
if any of those conditions dont match, it's the next doc
 2019-09-30 13:36:31 +05:30
Rucha Mahabal
0f2f907922 fix: webhook data 2019-09-30 13:21:26 +05:30
Suraj Shetty
b4e616c0de fix: Rename "Energy Point Log" with "User" 
Because it's user's leaderboard
 2019-09-30 13:21:03 +05:30
Suraj Shetty
258fea55f0 style: Fix Codacy 2019-09-30 13:07:50 +05:30
Faris Ansari
a38aca52c0 fix: Freeze Start Import button on click 2019-09-30 12:45:54 +05:30
Rushabh Mehta
34eee3775e
Merge pull request #8517 from rmehta/count-fix 
fix(minor): count fix
 2019-09-30 11:51:40 +05:30