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

16634 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
Charles-Henri Decultot
91098b01ac Removing trailing whitespaces 2018-09-10 13:20:28 +00:00
Charles-Henri Decultot
ad11396d92 Correct error on stopping auto repeat + translation 2018-09-10 13:03:34 +00:00
Charles-Henri Decultot
b6157a3b72 Auto repeat improvement 2018-09-10 12:38:15 +00:00
Rohit Waghchaure
5f4432a343 [Fix] Change Log 2018-09-10 13:21:02 +05:30
Rohan Bansal
28d592e182 Move import inside function 2018-09-10 11:03:19 +05:30
Shreya Shah
1a2993ed7f Show names in dropdown, but send mails to email set in user's master (#6050) 2018-09-10 09:39:28 +05:30
Aditya Hase
2073873064 feature(coverage): Add test coverage to frappe travis builds (#6065) 2018-09-10 09:37:23 +05:30
Faris Ansari
99bfa2fb17 fix(like filter): Append % only if not already added by user (#6069) 2018-09-10 09:36:49 +05:30
Faris Ansari
fa359537bb fix: Datepicker styles (#6070) 2018-09-10 09:36:03 +05:30
Faris Ansari
d635c5f97d feat(report view): Ability to export all of the filtered rows (#6071) 
- Earlier only rows currently rendered were exportable
- Also show paging information in the page footer
 2018-09-10 09:35:47 +05:30
Saurabh
d2ce42fce4
Merge pull request #6060 from saurabh6790/get_app_version_and_branch_info 
[enhance] in get_app_info return application branch and branch version if exists
 2018-09-07 18:35:07 +05:30
Zarrar
c760ad5245 put hub node back in modules.txt (#6064) 2018-09-07 17:48:42 +05:30
Faris Ansari
a26a916d32
Merge pull request #6062 from saurabh6790/check_for_developer_mode 
[fix] check for developer mode before adding port to URL
 2018-09-07 13:39:27 +05:30
Saurabh
dbb7ecb7fe [fix] check for developer mode before adding port to URL 2018-09-07 13:23:17 +05:30
Ranjith Kurungadam
5b54d8acb0 fix edit profile (#6059) 2018-09-07 13:20:45 +05:30
Faris Ansari
030d6d89f0
Merge pull request #6035 from rohitwaghchaure/email_notify_not_working 
On assignment notification is not sent to the assigned user
 2018-09-07 12:45:01 +05:30
Faris Ansari
c250918dac
Merge pull request #6057 from netchampfaris/assignment-message 
fix(assignment): Assignment message for self assignment
 2018-09-07 12:44:41 +05:30
Faris Ansari
2a6fb43e6b
Merge pull request #5960 from codingCoffee/popup 
[feature] show popup for version update
 2018-09-07 12:43:02 +05:30
Saurabh
371d7f87a9 [enhance] in get_app_info return application branch and branch version if exists 2018-09-06 17:41:26 +05:30
Faris Ansari
2a54c674ed fix(assignment): Assignment message for self assignment 2018-09-06 15:33:10 +05:30