Commit graph

27728 commits

Author SHA1 Message Date
barredterra
6371b1bb23 Merge branch 'develop' into refactor_web_template 2020-09-28 10:11:40 +02:00
mergify[bot]
20032d89ea
Merge pull request #11568 from netchampfaris/fix-checkbox-css
fix: Checkbox CSS per browser
2020-09-28 04:17:33 +00:00
mergify[bot]
94677b0e92
Merge pull request #11574 from frappe/fix_oauth_tests
test: fix/refactor oauth tests
2020-09-28 04:14:24 +00:00
mergify[bot]
a4596d2145
Merge pull request #11564 from gavindsouza/update-node-sass
fix: yarn upgrade node-sass
2020-09-28 04:12:45 +00:00
barredterra
105dd44ce1 refactor: extract get_client_scopes(), use all() instead of complicated loop 2020-09-26 20:28:31 +02:00
barredterra
22b12ff0ac fix: remove unused imports 2020-09-26 20:25:27 +02:00
barredterra
28d9ca79e9 test: special method to encode spaces the right way 2020-09-26 20:23:59 +02:00
barredterra
8dda805654 fix: simplify test 2020-09-25 17:14:31 +02:00
barredterra
dbcf6bc5c3 fix: login, get_full_url 2020-09-25 16:54:36 +02:00
barredterra
8dfea8a3e3 test: fix/refactor oauth tests 2020-09-25 16:43:24 +02:00
barredterra
0ccf1d0840 fix: return of the recursive values 2020-09-25 00:56:36 +02:00
barredterra
2fa4f861b7 feat: add Web Page to dashboard 2020-09-25 00:50:38 +02:00
barredterra
f8d71c73a6 fix: handle doc_before_save == None 2020-09-25 00:26:43 +02:00
Faris Ansari
c67425f626 fix: Checkbox CSS per browser 2020-09-24 20:14:37 +05:30
barredterra
61dc490a49 refactor: Web Template 2020-09-24 15:06:22 +02:00
Gavin D'souza
436ebde0ec fix: yarn upgrade node-sass 2020-09-24 15:13:43 +05:30
mergify[bot]
3275cc4c5a
Merge pull request #11500 from gavindsouza/mysql-syntax-error
fix(doctype): Allow MySQL keywords as Docfields
2020-09-24 08:45:34 +00:00
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
Gavin D'souza
309508b422 test: Test for reading aliased field query 2020-09-24 13:28:58 +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
Gavin D'souza
4cfc4c90d8 test: Use lowercase fields 2020-09-24 10:59:43 +05:30
Gavin D'souza
6cf7e4575f fix: Precision shouldn't be allowed as its a meta attrib
Fieldname precision conflicting with meta object
2020-09-23 19:11:59 +05:30
Gavin D'souza
646f29f628 test: Test for RU using DB reserved keywords
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-09-23 18:56:20 +05:30
Gavin D'souza
6f4931845e test: test once for 40 keyword fields instead 2020-09-23 17:19:10 +05:30
Gavin D'souza
ba0ac381f4 test: Fix fields added in doctype 2020-09-23 16:52:23 +05:30
Gavin D'souza
471202585c fix: Sider 2020-09-23 16:17:53 +05:30
Gavin D'souza
21c898583f test: Add test for creating doctypes with fields for reserved db
keywords
2020-09-23 16:12:48 +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
Gavin D'souza
31bf172f73 fix: Check if as token in statement explicitly
tests failing due to this conditon becoming truthy for value: "assignment_rule"
2020-09-23 15:15:26 +05:30
Gavin D'souza
e6eee1ff83 Merge branch 'develop' of github.com:frappe/frappe into mysql-syntax-error 2020-09-23 15:00:39 +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