Commit graph

26468 commits

Author SHA1 Message Date
Shivam Mishra
4ec875d7e7
Merge pull request #10944 from scmmishra/update-charts
feat: update frappe charts
2020-07-07 23:33:43 +05:30
Shivam Mishra
241062aa0b feat: update frappe charts 2020-07-07 23:22:09 +05:30
mergify[bot]
56e88889ec
Merge pull request #10929 from surajshetty3416/fix-workflow-state-count
fix: Do not check for orphaned states in new workflows
2020-07-07 10:00:52 +00:00
mergify[bot]
b2273d9ad8
Merge pull request #10936 from AfshanKhan/fix-pymsql-error-msg
fix: showing a clear message to user about error
2020-07-07 09:44:13 +00:00
mergify[bot]
500da48e93
Merge pull request #10937 from surajshetty3416/update-logo
chore: Update readme logo
2020-07-07 08:42:06 +00:00
Shivam Mishra
a7a8144266
Merge pull request #10817 from ernestoruiz89/patch-8
fix: Link on onboarding widget for add new record (fix PR#10769)
2020-07-07 13:58:52 +05:30
Shivam Mishra
f89978baac
fix: template literals syntax 2020-07-07 13:58:18 +05:30
Shivam Mishra
55d1df5249
refactor: remove unnecessary translate 2020-07-07 13:57:34 +05:30
Shivam Mishra
fc4e4b5efc
Merge pull request #10871 from gavindsouza/refactor-uninstall-app
refactor(commands): uninstall-app to remove all app related data from site
2020-07-07 13:42:37 +05:30
Suraj Shetty
599055e58d chore: Update readme logo 2020-07-07 13:05:55 +05:30
Afshan
974f00c771 fix: showing a clear message to user about error 2020-07-07 12:45:46 +05:30
Suraj Shetty
a7415b5601
Merge branch 'develop' into fix-workflow-state-count 2020-07-07 11:35:34 +05:30
mergify[bot]
e607e3d37e
Merge pull request #10912 from Thunderbottom/signup-xss
fix: sanitize name before user sign up
2020-07-07 05:46:37 +00:00
Suraj Shetty
0a0885c25e
Merge branch 'develop' into fix-workflow-state-count 2020-07-07 11:03:29 +05:30
Shivam Mishra
7bbf4ef7db
refactor: fix grammar (#10930) 2020-07-06 12:39:29 +05:30
mergify[bot]
0ba41de35c
Merge pull request #10924 from frappe/mergify/bp/develop/pr-10799
fix(sendmail): 'frappe' not defined (bp #10799)
2020-07-06 07:04:27 +00:00
Shivam Mishra
f24fb790ba
Merge pull request #10922 from Mangesh-Khairnar/fixes-webform-list
fix(webform): filter initial list records
2020-07-06 12:21:27 +05:30
Suraj Shetty
a5ed59bb4e fix: Do not check for orphaned states in new workflows 2020-07-06 12:08:34 +05:30
AminovE99
4ce70e2bcf fix(sendmail): 'frappe' not defined (#10799)
* 💄 Add frappe library

Signed-off-by: Emil <amionv99@gmail.com>

* 💄 directly import

Co-authored-by: gavin <gavin18d@gmail.com>

Co-authored-by: gavin <gavin18d@gmail.com>
(cherry picked from commit 6b9c92baf48c0671516727cb43761fc56a6dd12a)
2020-07-06 05:47:07 +00:00
Mangesh-Khairnar
0d0734cde7 fix(webform): filter initial list records 2020-07-05 02:04:25 +05:30
mergify[bot]
cac7cc402f
Merge pull request #10921 from frappe/onboarding1
fix: grammatical changes in website onboarding
2020-07-04 15:05:42 +00:00
michellealva
5e1f83ef39 fix: some more grammatical fixes 2020-07-04 12:50:46 +05:30
michellealva
5fedab29e7 fix: grammatical changes in website onboarding 2020-07-04 12:08:32 +05:30
mergify[bot]
72c596a50e
Merge pull request #10917 from ruchamahabal/fix-auto-repeat-failing
fix: ignore no_copy for auto repeat document creation
2020-07-03 16:15:25 +00:00
Rucha Mahabal
f4fa2c10a3 fix: ignore no_copy for auto repeat document creation 2020-07-03 18:10:43 +05:30
rohitwaghchaure
84bb7c4b7d
Merge pull request #10913 from rohitwaghchaure/fixed-frappe-patch-travis
fix: frappe patch travis failed
2020-07-03 16:04:33 +05:30
Rohit Waghchaure
6149fd6d25 fix: frappe patch travis failed 2020-07-03 13:09:25 +05:30
mergify[bot]
7da16ee895
Merge pull request #10589 from prssanna/leaderboard-date-range
feat: date range in leaderboard
2020-07-03 06:17:16 +00:00
Chinmay D. Pai
e4f852bfc8
fix: sanitize name before user sign up
do not allow html characters in name validation

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-07-03 11:39:57 +05:30
Suraj Shetty
eb833ed206
revert: "fix: show label for table fields" (#10897) 2020-07-03 11:32:12 +05:30
mergify[bot]
b08d72be15
Merge pull request #10803 from rmehta/email-reply-threading
fix: threading of email replies where message-id is not returned
2020-07-03 05:59:22 +00:00
Helkyd
09112389c2
fix(patch): reload_and_rename_view_log.py (#10890)
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-07-03 11:12:44 +05:30
mergify[bot]
203a70ff76
Merge pull request #10814 from scmmishra/refactor-portal
refactor: help article layout
2020-07-03 05:34:10 +00:00
mergify[bot]
7927ac803f
Merge pull request #10870 from Alchez/dev-patch-lock-table
fix: Adds LOCK TABLES grant for RDS version of grant_all_privileges (develop)
2020-07-03 05:29:15 +00:00
Suraj Shetty
002dfec30d
refactor: Use current_date variable 2020-07-03 10:59:00 +05:30
mergify[bot]
0c128c360b
Merge pull request #10827 from prssanna/chart-source-permission
fix: only give administrator permission to create Dashboard Chart Source
2020-07-03 04:57:34 +00:00
Suraj Shetty
f4b9f9d8ec
Merge branch 'develop' into dev-patch-lock-table 2020-07-03 10:19:15 +05:30
Suraj Shetty
3423ead5d7
Merge branch 'develop' into email-reply-threading 2020-07-03 10:08:13 +05:30
Suraj Shetty
2185d81792
Merge branch 'develop' into chart-source-permission 2020-07-03 10:07:53 +05:30
Chinmay Pai
5becb746a9
Merge pull request #10901 from ruchamahabal/whitelist-auto-repeat-func 2020-07-02 20:18:22 +05:30
Rucha Mahabal
c1615446bd fix: whitelist auto repeat query function 2020-07-02 11:54:14 +05:30
mergify[bot]
d1fe0a1acf
Merge pull request #10893 from Thunderbottom/search_whitelist-fix-fix
fix: get_attr before checking for whitelist
2020-07-01 15:57:44 +00:00
Chinmay D. Pai
d2c4b170a8
fix: get_attr before checking for whitelist
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-07-01 21:07:41 +05:30
mergify[bot]
63232f4867
Merge pull request #10764 from Mangesh-Khairnar/fix-sync-password
fix(google-calendar): reset sync token incase of invalid next sync token
2020-07-01 07:43:22 +00:00
Suraj Shetty
741367eee5
Merge branch 'develop' into email-reply-threading 2020-07-01 13:06:17 +05:30
Suraj Shetty
b4fc08883a
Merge branch 'develop' into fix-sync-password 2020-07-01 13:01:02 +05:30
Suraj Shetty
8d5cb35297
Merge branch 'develop' into refactor-uninstall-app 2020-07-01 12:13:23 +05:30
Suraj Shetty
8096c9e371
fix(permission): Show allowed rights on document for passed user (#10864) 2020-07-01 12:08:15 +05:30
mergify[bot]
f12a26766d
Merge pull request #10492 from Thunderbottom/search_whitelist-fix
fix: check for whitelist before calling from search
2020-07-01 05:29:53 +00:00
Suraj Shetty
a323506424
Merge branch 'develop' into email-reply-threading 2020-07-01 10:45:27 +05:30