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

27698 commits

This branch
This branch
All branches
Author SHA1 Message Date
mergify[bot]
59e6929492
Merge pull request #11562 from gavindsouza/site-conf-better-error 
fix: Give better errors about corrupt site config
 2020-09-24 08:44:17 +00:00
Faris Ansari
0db383499e
Merge pull request #11555 from netchampfaris/website_theme_hook 2020-09-24 14:13:16 +05:30
Faris Ansari
45e461a10a
Merge pull request #11527 from netchampfaris/override-doctype-class 2020-09-24 14:11:57 +05:30
gavin
0ee7d890bc
fix: Provide file paths instead of "title"s 
Co-authored-by: Faris Ansari <netchampfaris@users.noreply.github.com>
 2020-09-24 13:38:10 +05:30
Michelle Alva
12465d6cff
fix(DocType): Change label to "Linked Documents" (#11563) 2020-09-24 13:19:21 +05:30
Faris Ansari
5e25e9b6b6 fix: test 2020-09-24 13:04:36 +05:30
Gavin D'souza
04e0af578b fix: Give better errors about corrupt configs 2020-09-24 11:59:32 +05:30
Faris Ansari
26066b5f70 fix: startswith check 2020-09-24 11:45:59 +05:30
Faris Ansari
26c6beda46 fix(UX): Move ignored apps above scss preview 2020-09-24 11:45:35 +05:30
Faris Ansari
a152477c89 fix: Double render 2020-09-24 11:45:09 +05:30
Faris Ansari
17aa5134cf
Merge pull request #11554 from netchampfaris/db-getall-pluck 
fix: Pluck syntax for get_all and friends
 2020-09-23 16:09:12 +05:30
Faris Ansari
e4b8f0cac7
Merge pull request #11532 from frappe/web_template_module 2020-09-23 13:50:54 +05:30
mergify[bot]
fb5e2fd33f
Merge pull request #11479 from KanchanChauhan/padding-in-about-page 
fix(About Us): Padding in About Us page sections
 2020-09-23 08:15:10 +00:00
Shivam Mishra
7920ba34db
Merge pull request #11468 from prssanna/report-reorder-columns 
fix(Reports): reorder result for custom columns
 2020-09-23 13:31:49 +05:30
mergify[bot]
2c3fd72c72
Merge pull request #11552 from netchampfaris/fix-frappe-defaults-import 
fix: Remove unused import
 2020-09-23 07:45:43 +00:00
Faris Ansari
ed9abe0d7c fix: Pluck syntax for get_all and friends 2020-09-23 12:55:16 +05:30
Faris Ansari
a28d328f04
Merge pull request #11411 from ruchamahabal/fix-duration-control-import-export 2020-09-23 12:52:07 +05:30
Shivam Mishra
0ddf55aef2
Merge pull request #11544 from rmehta/web-page-dynamic-route 
feat(web_page): add dynamic routes to web page like /project/<project>
 2020-09-23 12:37:11 +05:30
Faris Ansari
dfa1cc3d42
Merge pull request #11528 from abhishekbalam-xyz/owner_fix 
fix(DocType): Reset "owner" and "modified_by" values in DocTypes to Administrator
 2020-09-23 12:34:18 +05:30
Rucha Mahabal
bb4e6faad5
fix: exporter.py 
Co-authored-by: Faris Ansari <netchampfaris@users.noreply.github.com>
 2020-09-23 09:43:57 +05:30
Rucha Mahabal
175c2fdb65
Merge branch 'develop' into fix-duration-control-import-export 2020-09-23 09:39:32 +05:30
Abhishek Balam
76422328b5 fix: override values on save now 2020-09-22 19:12:35 +05:30
Faris Ansari
f010a08796 fix: Remove unused import 2020-09-22 17:37:41 +05:30
Raffael Meyer
b4ef2a0237
fix: remove WebPageBlock.render() 2020-09-22 12:38:53 +02:00
mergify[bot]
fdf74f131f
Merge pull request #11551 from ruchamahabal/fix-grid-upload-develop 
fix: Validate whether file type is CSV in Grid Upload
 2020-09-22 10:03:06 +00:00
Faris Ansari
489f6e9d76 test: Add tests for override_doctype_class 2020-09-22 15:20:52 +05:30
Rucha Mahabal
d1083d6b87 fix: Validate whether file type is CSV in Grid Upload 2020-09-22 15:13:59 +05:30
Rucha Mahabal
91714386e7
chore: revert #10917 (#11540) 2020-09-22 12:34:58 +05:30
mergify[bot]
31cb17f416
Merge pull request #11400 from gavindsouza/uninstall-app-for-non-existing-apps 
fix: Uninstall App even if it doesn't exist on bench
 2020-09-22 03:54:42 +00:00
Faris Ansari
0b4471cd80 fix: empty array does not trigger form change 2020-09-22 09:09:24 +05:30
Faris Ansari
9673a96ebc fix: style 2020-09-22 08:54:48 +05:30
Faris Ansari
b987090b93 fix: Convert imports to ignore into child table 
- Checkbox UI for ignoring apps in form for better UX
 2020-09-22 08:54:29 +05:30
Faris Ansari
a11b6306b3 Merge remote-tracking branch 'upstream/develop' into website_theme_hook 2020-09-22 07:23:20 +05:30
Abhishek Balam
94e7f23d0a fix: override modified_by to 'Administrator' to non-custom doctypes 2020-09-21 22:33:04 +05:30
barredterra
4dc140a3ea refactor: render web_template in python 
... instead of in jinja. (For better debugging.)
 2020-09-21 16:53:47 +02:00
Prssanna Desai
bb5ea19255
Merge pull request #11543 from prssanna/auto-email-report-filters 2020-09-21 18:52:46 +05:30
barredterra
1f833da6be Merge branch 'develop' into web_template_module 2020-09-21 14:03:42 +02:00
barredterra
f06807daab Merge branch 'develop' into website_theme_hook 2020-09-21 14:02:50 +02:00
barredterra
7f600ca71b fix: remove unused import 2020-09-21 13:35:28 +02:00
barredterra
ad5c007e2b feat: after_migrate hook 2020-09-21 13:21:13 +02:00
Rushabh Mehta
5006ec8f51 feat(web_page): add dynamic routes to web page like /project/<project> 2020-09-21 16:51:06 +05:30
barredterra
0475004fea refactor: move get_rendered_template() into WebTemplate.render() 2020-09-21 12:19:55 +02:00
prssanna
0907474ca9 fix: fetch report filters when report is selected 2020-09-21 15:42:48 +05:30
barredterra
d02335238e fix: no abbreviations 2020-09-21 12:00:39 +02:00
Wolfram Schmidt
a4c7eb9620
Update salutation.json (#11501) 
Abbility to merge salutations after creation. Usefull when Mistakes are made like "Mrs." and "Mrs"

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
 2020-09-21 15:04:08 +05:30
Prssanna Desai
94f505396f
Merge pull request #11533 from josephalbaph/patch-1 
fix: Fix misaligned columns for Exported Excel reports
 2020-09-21 14:19:57 +05:30
Shivam Mishra
df6c52cac1
Merge pull request #11525 from Mangesh-Khairnar/fix-document-follow 
fix(document-follow): reduce time taken to check existing records
 2020-09-21 13:28:05 +05:30
mergify[bot]
29da83f22a
Merge pull request #11537 from scmmishra/category-patch-fix 
fix: reload doc before blog patch
 2020-09-21 07:15:06 +00:00
mergify[bot]
176929d8a4
Merge pull request #11535 from gavindsouza/fix-name-validation 
fix: Don't allow trailing or leading whitespace in DocType name
 2020-09-21 07:09:59 +00:00
Shivam Mishra
20828ecedf
Merge pull request #11536 from ruchamahabal/datatable-fix 2020-09-21 12:38:08 +05:30