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

16654 commits

This branch
This branch
All branches
Author SHA1 Message Date
Saurabh
aaebe0bce1 Merge branch 'master' into staging-fixes 2018-09-20 13:16:25 +05:30
Saurabh
087562fc56 Merge branch 'hotfix' 2018-09-20 13:16:23 +05:30
Saurabh
acfdc5a0f3 bumped to version 10.1.48 2018-09-20 13:46:23 +06:00
Nabin Hait
bf71d5dbaf Merge branch 'develop' into staging-fixes 2018-09-20 12:50:33 +05:30
Faris Ansari
8df1b38f77
Merge pull request #6105 from netchampfaris/keyed-translation-fixes 
fix(translations): Replace translations by keyword with indexed version
 2018-09-20 11:25:37 +05:30
Faris Ansari
162f1012f8
Merge pull request #6109 from rohitwaghchaure/fix_case_sensitive_for_options 
[Fix] Case sensitive for the doctype name in the options
 2018-09-20 11:25:10 +05:30
Faris Ansari
ae7e71e0e9
Merge pull request #6110 from netchampfaris/listview-filters-fix 
fix(filters): Allow filter on same field multiple times
 2018-09-20 11:25:02 +05:30
Faris Ansari
f2cb9827eb
Merge pull request #6106 from netchampfaris/list-view-fixes 
fix(list view): Remove list items that should not be visible
 2018-09-20 11:24:47 +05:30
Prateeksha Singh
ffc0f05ea8
Merge pull request #6114 from pratu16x7/webform-link-field 
[webform] allow_read to bypass permissions on Link options
 2018-09-20 10:33:23 +05:30
Prateeksha Singh
168addbfb2 [webform] allow_read to bypass permissions on Link options 2018-09-20 10:32:20 +05:30
Faris Ansari
bdeae00a6e fix(filters): Allow filter on same field multiple times 2018-09-19 17:46:04 +05:30
Rohit Waghchaure
06566e5036 [Fix] Case sensitive for the doctype name in the options 2018-09-19 16:39:59 +05:30
Faris Ansari
525c09b005 fix(list view): Remove list items that should not be visible 
When some docs are updated, the list view is refreshed realtime,
but old docs that should not visible remains.
 2018-09-18 12:45:30 +05:30
Faris Ansari
89d56e4de1 fix(translations): Replace translations by keyword with indexed version 
Keywords in the translation also gets translated which
results in an error because python cannot find the key
 2018-09-18 11:55:10 +05:30
Nabin Hait
48e18a11fd Merge branch 'staging' into develop 2018-09-18 11:47:06 +05:30
Frappe PR Bot
76d8ebdf3c [Translation] Updated Translations (#6100) 2018-09-17 15:59:27 +05:30
Prateeksha Singh
afa8ae0e65
remove patch step 2018-09-16 16:03:21 +05:30
Aditya Hase
768f28f5a2 Report coverage on unexecuted files as well 
keyword argument `include` doesn't seem to report on unexecuted files
coverage.py documentation claims using `source` instead will do just that
 2018-09-14 17:07:23 +05:30
Faris Ansari
c2ccc9886c
Merge pull request #6091 from netchampfaris/img-screenshot 
fix(md_to_html): Add class screenshot to img elements
 2018-09-14 14:44:30 +05:30
Faris Ansari
e8eb44c299
fix(change log): Import subprocess (#6093) 
* fix(change log): Import subprocess

* fix: Ignore subprocess warning
 2018-09-14 14:43:26 +05:30
Faris Ansari
e7c79b713e fix(md_to_html): Add class screenshot to img elements 2018-09-14 11:05:12 +05:30
Fisher Yu
bdbf604317 Update table.js (#6072) 
Allow directly copy tab delimited multi records from Excel or text files, paste directly to the child table
 2018-09-12 22:25:42 +05:30
Nabin Hait
b4c063e96c fix(syntax): rollup config 2018-09-12 18:13:55 +05:30
Nabin Hait
77999e13ae Merge branch 'staging' into develop 2018-09-12 17:44:52 +05:30
Nabin Hait
30abaa4f8a feat(test runner): break run-tests on first error 2018-09-12 17:44:44 +05:30
Nabin Hait
ff343d577c Merge branch 'staging-fixes' into staging 2018-09-12 17:44:24 +05:30
Faris Ansari
568289ba6b
Merge pull request #6076 from chdecultot/auto_repeat_improvements 
Auto repeat improvements
 2018-09-12 17:22:17 +05:30
Faris Ansari
64d8bff387 fix(ux): Merge notification and message section 2018-09-12 17:18:59 +05:30
Nabin Hait
696d209ae4 Merge branch 'develop' into staging 2018-09-12 17:16:18 +05:30
Nabin Hait
3729562358 feat(test runner): break run-tests on first error 2018-09-12 17:16:02 +05:30
Ameya Shenoy
460329770e
Merge pull request #6081 from rohitwaghchaure/permission_issue_v10_for_permlevel_1 
Permlevel 1 fields are not visible to the users after submission of the document
 2018-09-12 17:03:03 +05:30
Ameya Shenoy
3fd4e20926
Merge pull request #6052 from Alchez/hotfix-gmaps-client 
Check if Google Maps is enabled when trying to get the client
 2018-09-12 16:45:52 +05:30
Ameya Shenoy
61f4015599
Merge pull request #6079 from netchampfaris/rollup-import-feat 
feat(rollup): Ability to import assets from any app
 2018-09-12 16:25:42 +05:30
Faris Ansari
a69d44c720
Merge pull request #6073 from codingCoffee/email 
email: fix track_email_status not working
 2018-09-12 16:19:48 +05:30
Faris Ansari
18787a5709
Merge pull request #6078 from frappe/adityahase-coverage-badge 
Add coverage badge to README.md
 2018-09-12 16:17:20 +05:30
Charles-Henri Decultot
24a1003f22 Smallest currency fraction for EUR (#6077) 2018-09-12 15:51:03 +05:30
Frappe PR Bot
eb4fd98ba1 [Translation] Updated Translations (#6075) 2018-09-12 15:49:27 +05:30
Nabin Hait
98ba2f958a feat(test runner): break run-tests on first error 2018-09-12 15:47:54 +05:30
Saurabh
3e7b387a7a [resolved] merge-conflicts 2018-09-12 14:52:46 +05:30
Saurabh
90cedec253 Merge branch 'hotfix' 2018-09-12 14:50:15 +05:30
Saurabh
e058e81ba4 bumped to version 10.1.47 2018-09-12 15:20:15 +06:00
Ameya Shenoy
5af49947cc
Merge pull request #6074 from rohitwaghchaure/minor_issue_change_log 
[Fix] Change Log
 2018-09-12 11:51:14 +05:30
Faris Ansari
9136df623e
Merge pull request #6082 from netchampfaris/int-control-fix 
fix(Int control): Skip evaluating numbers with commas
 2018-09-12 10:57:20 +05:30
Ameya Shenoy
ea40ca6bca
Merge pull request #6083 from sibidharan/patch-1 
Fix #6068
 2018-09-12 10:53:27 +05:30
Sibidharan Nandhakumar
d46c1b5491
Fix #6068 
Fix #6068 where empty options keep adding on each save for fieldtype select.
 2018-09-11 21:57:47 +05:30
Faris Ansari
6b918c2408 fix(Int control): Skip evaluating numbers with commans 2018-09-11 18:53:11 +05:30
Rohit Waghchaure
312ec9f14d Permlevel 1 fields are not visible to the users after submission of the document 2018-09-11 18:41:05 +05:30
Faris Ansari
91d3731a60 feat(rollup): Ability to import assets from any app 
To import a js file from the frappe app into any app
```
import 'frappe/public/js/frappe/ui/comment.js';
```
 2018-09-11 11:38:10 +05:30
Aditya Hase
e0db2fd286
Update README.md 2018-09-10 19:27:14 +05:30
Ameya Shenoy
7c2fceb6b7
email: fix track_email_status not working 
the initial method was not able to get the track_email_status value if
the email account had been set in site_config, the current method checks
for the same

Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
 2018-09-10 18:57:22 +05:30