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

23356 commits

This branch
This branch
All branches
Author SHA1 Message Date
Deepesh Garg
c0cf5fddbd Merge branch 'develop' of https://github.com/frappe/frappe into skip_total_row 2020-02-03 19:19:25 +05:30
Deepesh Garg
8677360cb2 feat: Ability to dynamically skip total row in Script Reports 2020-02-03 19:17:36 +05:30
mergify[bot]
e0acaaf4d3
Merge pull request #9391 from surajshetty3416/fix-release-notes-popup-ux 
fix(UX): Show release notes/update popup only to System Manager
 2020-02-03 12:55:53 +00:00
mergify[bot]
58f89a43c7
Merge pull request #9371 from prssanna/dashboard-week-ending 
fix(Dashboards): Dashboard chart week ending
 2020-02-03 11:26:48 +00:00
Suraj Shetty
4742e88957
Merge branch 'develop' into dashboard-week-ending 2020-02-03 16:38:06 +05:30
mergify[bot]
35583d8164
Merge pull request #9404 from ruchamahabal/fix-auto-repeat 
fix: handle PermissionError for auto repeat email notifications
 2020-02-03 10:45:59 +00:00
Suraj Shetty
8d496c7055
fix: Invalid syntax 2020-02-03 16:03:13 +05:30
Suraj Shetty
7a4ee06acf
fix: Translatable string for error 2020-02-03 15:58:26 +05:30
Rucha Mahabal
70bf6f3bc8 fix: change mutliline error message to single line for translations 2020-02-03 15:39:32 +05:30
Rucha Mahabal
d1942838d1 fix: handle PermissionError for auto repeat email notifications 2020-02-03 14:51:29 +05:30
Rucha Mahabal
dc13938667 fix: auto repeat test 2020-02-03 13:00:28 +05:30
Prssanna Desai
526527a958
fix: increase chat message alert time to 15 seconds (#9398) 2020-02-02 21:45:02 +05:30
Frappe PR Bot
abbc93916a
feat: Updated translation (#9354) 
Co-authored-by: sahil28297 <37302950+sahil28297@users.noreply.github.com>
 2020-02-02 16:03:41 +05:30
Suraj Shetty
62eb7ec38e fix(UX): Show release notes/update popup only to System Manager 2020-01-31 17:29:41 +05:30
Kyra
9fe65cb809
fix(sms_settings): add support for sending data as json (#9381) 
* Add support for sending JSON to SMS Settings

Many SMS gateways expect data in raw JSON and do not accept plain
form data. This change enables this by detecting a "Content-Type"
header in the parameters with a value of "application/json", and
in this case decoding the message text to unicode as expected by
the `requests` module before passing the data to the `json`
parameter.

* Update frappe/core/doctype/sms_settings/sms_settings.py

Co-Authored-By: Chinmay Pai <chinmaydpai@gmail.com>

* Update frappe/core/doctype/sms_settings/sms_settings.py

Co-Authored-By: Chinmay Pai <chinmaydpai@gmail.com>

Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
 2020-01-31 15:46:05 +05:30
Suraj Shetty
1de92794af
fix: Send password notification email if password is not set (#9385) 2020-01-31 15:00:46 +05:30
Rucha Mahabal
4dc2fb47b9
fix: set initial auto repeat day count to max (#9387) 2020-01-31 14:40:13 +05:30
Snyk bot
214a494a9d
fix: .snyk & package.json to reduce vulnerabilities (#9382) 
The following vulnerabilities are fixed with a Snyk patch:
- https://snyk.io/vuln/SNYK-JS-LODASH-450202
 2020-01-31 10:29:31 +05:30
mergify[bot]
5db37f257d
Merge pull request #9383 from hrwX/tf_fix 
fix(System Settings): change system settings modified by
 2020-01-31 04:46:04 +00:00
Himanshu Warekar
132e1da8e1 fix: change time_format modified by 2020-01-31 08:34:34 +05:30
gavin
5a276efa10
docs: update discuss.frappe.io link in template (#9358) 
* chore(docs): updated templates

* docs: update link for markdown compatibility
 2020-01-31 07:06:51 +05:30
mergify[bot]
2fe8b14a27
Merge pull request #9366 from prssanna/notification-fix 
fix(Notification): fix for invalid notification condition
 2020-01-30 16:36:53 +00:00
Saurabh
0b17e8a534
Merge pull request #9376 from sahil28297/add_fil_lang 
feat(translation): add Filipino language
 2020-01-30 19:13:08 +05:30
Sahil Khan
20785737d9 feat(translation): add Filipino language 2020-01-30 19:07:23 +05:30
mergify[bot]
3f2b8d835a
Merge pull request #9369 from surajshetty3416/fix-incorrect-translations 
fix(translations): Incorrect syntax
 2020-01-30 07:23:40 +00:00
prssanna
2f32097c62 fix: pass doc.as_dict to get_context 2020-01-30 12:48:13 +05:30
prssanna
28f541d3a6 fix: get_week_ending returns wrong date 2020-01-30 12:39:12 +05:30
Faris Ansari
41b0cf87e5
fix: Move .format out of translation method 2020-01-30 12:31:04 +05:30
Faris Ansari
47de77b2b1
fix: Undo print statement 2020-01-30 12:23:14 +05:30
Suraj Shetty
51bae0df50 fix(translations): Incorrect syntax 2020-01-29 15:35:28 +05:30
Suraj Shetty
dee4a7336c fix(translations): Incorrect syntax 2020-01-29 15:22:35 +05:30
prssanna
4344348a94 fix: don't return doc as dict in get_context 2020-01-28 21:00:23 +05:30
mergify[bot]
9830225bea
Merge pull request #9367 from prssanna/auto-email-report 
fix: auto email report naming
 2020-01-28 11:37:08 +00:00
Marica
b1db148dc8 fix: More informational error message in Address. (#9352) 
* fix: More informational error message in Address.

* fix: Changed message, added title.

* fix: Changes compatible with translations.

* fix: Translation fixes.

* style: Fix formatting

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2020-01-28 10:43:18 +00:00
Faris Ansari
2e2c038f35 fix: Skip Email Queue doctype in delete_doc (#9364) 2020-01-27 21:33:47 +05:30
Rohan
b427c934b0 fix: py3 compatibility for error snapshot creation (develop) (#9336) 
* fix: py3 compatibility for error snapshot creation

* fix: remove invalid checks

* Revert "fix: remove invalid checks"

This reverts commit f636c122146e38a5e0cd964686a6c7187ccb53b4.

* fix: use six to maintain py2 and py3 compatibility
 2020-01-27 21:32:23 +05:30
prssanna
e032e817db fix: auto email report naming 2020-01-27 20:35:46 +05:30
prssanna
411ca69400 fix: pass doc as dict to safe_eval 2020-01-27 17:36:47 +05:30
mergify[bot]
f11b8fc476
Merge pull request #8567 from ruchamahabal/offline-erpnext 
feat: Events Streaming
 2020-01-27 11:58:15 +00:00
Rucha Mahabal
fff17ef87a feat: add event streaming to automation module page 2020-01-27 16:31:05 +05:30
Rucha Mahabal
8147fa45dd fix: anti-pattern code 2020-01-27 14:07:13 +05:30
Rucha Mahabal
38b99f7aa0 fix: trim extra / from producer url to overcome url mismatch 2020-01-27 13:51:58 +05:30
Rucha Mahabal
c0b22871fb fix: set parent in child table row dependency 2020-01-27 13:38:50 +05:30
Rucha Mahabal
19c69e5316 fix: anti-pattern code 2020-01-27 12:26:12 +05:30
mergify[bot]
94d796ea1c
Merge pull request #9362 from marination/map_current_doc_fixes 
fix: Removed annotations due to py>=3.7 compatibility.
 2020-01-27 06:46:00 +00:00
marination
e65486f0c7 fix: Removed annotations due to py>=3.7 compatibility. 2020-01-27 11:59:40 +05:30
mergify[bot]
308971928e
Merge pull request #9334 from marination/map_current_doc 
fix: Allow map_docs to accommodate 'args' sent from client call
 2020-01-27 04:13:48 +00:00
Rucha Mahabal
d2445a6a40 fix: second level nested link dependency not syncing 2020-01-26 23:19:58 +05:30
mergify[bot]
85e1555c39
Merge pull request #9357 from sumitbhanushali/fix-calendar-view 
fix(calendar):  UI fix
 2020-01-26 06:43:38 +00:00
mergify[bot]
66a5bf3320
Merge pull request #9347 from frappe/breadcrumb-schema-org 
fix: Update breadcrumb itemtype to schema.org
 2020-01-24 12:57:43 +00:00