Commit graph

30443 commits

Author SHA1 Message Date
prssanna
d5f915dfd8 fix: set_route 2021-01-29 16:21:26 +05:30
prssanna
c07cf233d0 fix: disabled cursor for disabld fields 2021-01-29 15:12:15 +05:30
prssanna
029525c992 Merge branch 'rebrand-ui' of https://github.com/frappe/frappe into rebrand-ui 2021-01-29 13:36:02 +05:30
prssanna
4f3f6edf68 style: indent issues 2021-01-29 13:35:36 +05:30
Suraj Shetty
3c52d41873 chore: Add .stylelintrc file to add rules 2021-01-29 13:27:50 +05:30
Suraj Shetty
2720efda74 Merge branch 'rebrand-ui' of https://github.com/frappe/frappe into rebrand-ui 2021-01-29 13:15:58 +05:30
Suraj Shetty
32e10f55ae style: Fix formatting 2021-01-29 13:14:48 +05:30
prssanna
d87e8efd6e Merge branch 'rebrand-ui' of https://github.com/frappe/frappe into rebrand-ui 2021-01-29 13:07:11 +05:30
prssanna
f925ba2a1d style: indent issues 2021-01-29 13:06:39 +05:30
Suraj Shetty
33da252486 Merge branch 'rebrand-ui' of https://github.com/frappe/frappe into rebrand-ui 2021-01-29 13:06:14 +05:30
Suraj Shetty
8ff00fbe76 fix: Remove tnum variation of zero
- to avoid readability issue
2021-01-29 13:05:36 +05:30
prssanna
a5b06c5cfc style: brace formatting issues 2021-01-29 12:38:42 +05:30
prssanna
68f5afe137 style: spacing issues 2021-01-29 12:24:57 +05:30
prssanna
1ef8cd9032 fix: ui tests 2021-01-29 12:12:24 +05:30
prssanna
84399160dc fix: list view ui test 2021-01-29 11:53:39 +05:30
Suraj Shetty
40aafdbcd2 test: Fix newsletter test 2021-01-29 07:34:47 +05:30
Suraj Shetty
4052772795 test: Import unquote 2021-01-28 23:29:54 +05:30
Suraj Shetty
d5f4edcda9 style: Fix sider issues 2021-01-28 22:18:12 +05:30
Suraj Shetty
6c53857026 test: Enable tests for recorder 2021-01-28 20:07:36 +05:30
Suraj Shetty
ce379bc200 Merge branch 'develop' of https://github.com/frappe/frappe into rebrand-ui 2021-01-28 19:56:54 +05:30
Suraj Shetty
d28fd926db fix: Recorder routing 2021-01-28 19:50:46 +05:30
Suraj Shetty
50bfd9f6db Merge branch 'rebrand-ui' of https://github.com/frappe/frappe into rebrand-ui 2021-01-28 18:17:07 +05:30
Suraj Shetty
90d0095b35 fix: Add map defaults 2021-01-28 18:17:00 +05:30
Suraj Shetty
6f774d6d0c
fix: Check for fieldlevel permission for report query (#12163)
Co-authored-by: Prssanna Desai <prssud@gmail.com>
2021-01-28 17:14:47 +05:30
prssanna
332295838d Merge branch 'rebrand-ui' of https://github.com/frappe/frappe into rebrand-ui 2021-01-28 16:56:48 +05:30
prssanna
5dc42f9c1d fix: make add filter a button 2021-01-28 16:55:06 +05:30
Deepesh Garg
bcd1ad446d
feat: Module Profiles (#12148)
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2021-01-28 14:58:49 +05:30
Prssanna Desai
f185d869f3
Merge pull request #12224 from ollyboy/frappe_dev_ob 2021-01-28 14:01:04 +05:30
Prssanna Desai
36fcc1d55b
fix: use frappe.parse_json 2021-01-28 13:58:01 +05:30
prssanna
941decbb23 fix: revert login password changes 2021-01-28 12:32:48 +05:30
mergify[bot]
62d08005aa
Merge pull request #12209 from marination/nested-doc-user-perms
feat: Hide Child Records for a Nested DocType via User Permissions
2021-01-28 05:49:30 +00:00
mergify[bot]
f221e668ed
Merge pull request #12257 from pateljannat/user-mandatory-in-change-user-dialog
fix: user mandatory in change user dialog
2021-01-28 04:55:31 +00:00
prssanna
c4d322956c fix: common indicator style for website and desk 2021-01-27 17:42:05 +05:30
prssanna
255ab6525e Merge branch 'rebrand-ui' of https://github.com/frappe/frappe into rebrand-ui 2021-01-27 14:33:40 +05:30
prssanna
26821d4fbe fix: ui tests 2021-01-27 14:31:00 +05:30
Suraj Shetty
385d6bd9c6 Merge branch 'rebrand-ui' of https://github.com/frappe/frappe into rebrand-ui 2021-01-27 12:50:42 +05:30
Suraj Shetty
fb0b0ef7be fix: Email server-side tests 2021-01-27 12:50:35 +05:30
Rushabh Mehta
73b4aad317 fix(minor): weird grid scrolling behaviour 2021-01-27 10:46:26 +05:30
ollyboy
b2fbcacfd4 #12224 improve 2021-01-26 18:32:34 +00:00
Faris Ansari
acb258fe89 fix: file browser in uploader
- use new icons
- server side search
- pagination for files in folder
2021-01-26 14:36:00 +05:30
mergify[bot]
569995f5a4
Merge pull request #12152 from scmmishra/fix-reset-customizations
fix: Reset customizations don't get committed
2021-01-26 04:52:44 +00:00
Suraj Shetty
c340f17083
Merge branch 'develop' into fix-reset-customizations 2021-01-26 09:56:55 +05:30
Suraj Shetty
e1c84560dc
Merge branch 'develop' into nested-doc-user-perms 2021-01-26 09:54:55 +05:30
Mohammad Hasnain Mohsin Rajan
707557f49b
fix: Validate reqd report filters (#12230)
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2021-01-26 09:54:13 +05:30
Suraj Shetty
726d9faaa0 fix: Temporarily comment buggy code to avoid confusion 2021-01-25 22:09:24 +05:30
Suraj Shetty
60470a9ae6 fix(form): Check for action type instead of key 2021-01-25 22:04:52 +05:30
Suraj Shetty
4f32726cd7 fix: Show content in right timeline
- Previously, it used to show content of other form's
timeline in another form's timeline
2021-01-25 17:01:36 +05:30
mergify[bot]
8efdc078dd
Merge pull request #12263 from pilou-/travis_fix_regex_sed_command
ci: fix a regex used in Travis config
2021-01-25 10:52:56 +00:00
Suraj Shetty
d1175c1e88 fix: Stat indicator style in shortcut 2021-01-25 16:10:22 +05:30
Pierre-Louis Bonicoli
a4396a83d0
ci: fix a regex used in Travis config
Fix this line in Procfile:

	redis_# socketio: redis-server config/redis_socketio.conf
2021-01-25 11:10:30 +01:00