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

30561 commits

This branch
This branch
All branches
Author SHA1 Message Date
Suraj Shetty
c340f17083
Merge branch 'develop' into fix-reset-customizations 2021-01-26 09:56:55 +05:30
Suraj Shetty
0363d787e1
Merge branch 'develop' into default-desk-page 2021-01-26 09:55:18 +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
Suraj Shetty
a2fba77116
fix: Skip translation of gender while creating it (#12260) 2021-01-25 15:37:37 +05:30
mergify[bot]
b4b009326b
Merge pull request #12133 from nextchamp-saqib/email-account-signature-fix 
feat: fetch email account signature in email dialog
 2021-01-25 07:11:41 +00:00
mergify[bot]
e111f353a4
Merge pull request #12202 from hasnain2808/fix-links-html-report 
fix(Auto Email Report): HTML download of auto email report breaks for columns with link field type
 2021-01-25 06:20:20 +00:00
Suraj Shetty
15d638112b feat: Add icon to timeline action button 2021-01-25 11:27:17 +05:30
Suraj Shetty
ee694bf6c0 fix: Pass with_container parameter value 2021-01-24 18:19:21 +05:30
Suraj Shetty
82b426d013 Merge branch 'rebrand-ui' of https://github.com/frappe/frappe into rebrand-ui 2021-01-24 11:05:45 +05:30
Suraj Shetty
d8ad9b558f refactor: Move default email.css to the root css folder 2021-01-24 11:05:40 +05:30
pateljannat
e9e99f20c3 fix: user mandatory in change user dialog 2021-01-23 19:11:45 +05:30
prssanna
e877620ff5 fix: remove duplicate style 2021-01-22 15:41:21 +05:30
prssanna
f1427cdb3b Merge branch 'rebrand-ui' of https://github.com/frappe/frappe into rebrand-ui 2021-01-22 15:39:34 +05:30
prssanna
dcd445b4fd fix: reorganize styles 2021-01-22 15:33:24 +05:30
mergify[bot]
32d32aed81
Merge pull request #12249 from gavindsouza/get-datetime-in-timezone 
feat: Util to get datetime in specific timezone
 2021-01-22 08:42:32 +00:00
Saqib
bbc16f5866
fix: error message 
Co-authored-by: Prssanna Desai <prssud@gmail.com>
 2021-01-22 13:19:32 +05:30
Gavin D'souza
9b59b59e44 test: Update TestNewsletter.test_unsubscribe 
* Update selecting email to unsubscribe email logic
* style fixes
 2021-01-22 13:13:50 +05:30
Suraj Shetty
a2a1034e22 fix: Select control style 2021-01-22 12:58:15 +05:30
Suraj Shetty
b85c3d15fa fix: Keep indicator as first element 2021-01-22 12:42:03 +05:30
Suraj Shetty
b91e05d2d0 fix: Incorrect fix 2021-01-22 12:33:12 +05:30
Suraj Shetty
26c335d79b fix: Typo 2021-01-22 12:32:19 +05:30
Suraj Shetty
fc1505865f fix(Patch): Rename Desk Link only if it exists 2021-01-22 12:31:42 +05:30
Marica
aad9610b78
fix: checkbox label in UP List View Dialog 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-01-22 12:18:25 +05:30
Prssanna Desai
fe77c3c321
Merge pull request #12240 from shariquerik/collapsible-geolocation-fix 2021-01-22 11:50:41 +05:30
Shariq Ansari
5c9cc655cf
fix: Insufficient Permission for Leads > Dashboard Chart (#12243) 
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2021-01-22 11:50:04 +05:30
mergify[bot]
5461773259
Merge pull request #12248 from frappe/snyk-fix-f40a8131737dbb81805c07d9a1c531e0 
fix(Snyk): Security upgrade PyYAML from 5.3.1 to 5.4
 2021-01-22 06:18:22 +00:00
Gavin D'souza
0de38fe011 Merge branch 'develop' of github.com:frappe/frappe into get-datetime-in-timezone 2021-01-22 11:24:56 +05:30
Suraj Shetty
f468dd0c20 fix: Handle edge case in get_abbr method 2021-01-22 10:05:16 +05:30
Suraj Shetty
86b381716b Merge branch 'develop' of https://github.com/frappe/frappe into rebrand-ui 2021-01-21 19:07:30 +05:30
Saqib Ansari
98b293b759 fix: validate single default page 2021-01-21 19:02:50 +05:30
marination
4887dd1d5a chore: Rename 'Exclude Descendants' to 'Hide Descendants' 
- Rename 'Exclude Descendants' to 'Hide Descendants'
- Rename js trigger to 'toggle_hide_descendants'
 2021-01-21 18:48:25 +05:30
Suraj Shetty
611b74b8a0 refactor: Introduce variables for error state 2021-01-21 18:24:26 +05:30
Suraj Shetty
fd4d349e4c fix: Use get_abbr method for abbr 2021-01-21 16:46:40 +05:30
Suraj Shetty
1b5634d438 fix: Blockquote style 2021-01-21 16:46:11 +05:30
Suraj Shetty
e5482022f5 fix: Responsive email style 2021-01-21 15:57:56 +05:30
Suraj Shetty
37e54c3512 fix: Remove fallback title for brand logo 2021-01-21 15:45:00 +05:30
Suraj Shetty
927b62f39e fix: Email body spacing issue 2021-01-21 15:33:12 +05:30
Gavin D'souza
16f2b29cb3 style: Trim extra whitespace 2021-01-21 13:19:31 +05:30
Gavin D'souza
33ea496a8b feat: Added get_datetime_in_timezone in frappe.utils to get datetime in specific timezones 
* Added util in safe_exec to access via Server Scripts and System
Console
 2021-01-21 13:19:31 +05:30
Saqib Ansari
deac394c01 chore: add description 2021-01-21 12:51:31 +05:30
Suraj Shetty
dff1a2adf3 fix: Relaod docperm doctype to sync recent changes 2021-01-21 12:45:54 +05:30
Suraj Shetty
65a82bef1a fix: Show brand logo if header is set 2021-01-21 12:15:18 +05:30
Suraj Shetty
cb7c29b9f5 Merge branch 'rebrand-ui' of https://github.com/frappe/frappe into rebrand-ui 2021-01-21 12:14:45 +05:30