Rushabh Mehta
|
a6aec85674
|
Merge pull request #7407 from surajshetty3416/communication-email-template
feat: Add email template field to Communication
|
2019-05-10 08:28:29 +05:30 |
|
Rushabh Mehta
|
743e082ebf
|
Merge pull request #7438 from netchampfaris/fix-text-editor-style-d
fix: Text editor styles when readonly
|
2019-05-10 08:26:46 +05:30 |
|
Shivam Mishra
|
a6017891f8
|
Merge pull request #7440 from surajshetty3416/fix-energy-point-trigger
fix: Process for energy points on any doc changes
|
2019-05-10 08:22:40 +05:30 |
|
Suraj Shetty
|
b803dac772
|
fix: Process for energy point on any doc changes
Previously changes on submitted document
were not processed for energy points
|
2019-05-09 22:13:09 +05:30 |
|
Suraj Shetty
|
20cd78e25d
|
Merge pull request #7431 from netchampfaris/bulk-operations-update-message
fix: Success message on bulk edit
|
2019-05-09 17:59:22 +05:30 |
|
Faris Ansari
|
7b479f0200
|
fix: Text editor styles when readonly
|
2019-05-09 16:12:39 +05:30 |
|
Saurabh
|
f068bc9800
|
Merge pull request #7432 from sahil28297/sync_site_develop
feat(sync_site): sync site via central agent
|
2019-05-09 15:17:02 +05:30 |
|
Sahil Khan
|
0eb9fc5eec
|
fix(sync_site): syntax error
|
2019-05-09 14:52:37 +05:30 |
|
Sahil Khan
|
42fc641fd9
|
feat(sync_site): sync site via central agent
|
2019-05-09 14:22:47 +05:30 |
|
Faris Ansari
|
9586de8d67
|
fix: Success message on bulk edit
|
2019-05-09 11:50:49 +05:30 |
|
Anurag Mishra
|
a9d85c3222
|
fix: add seconds parameter seconds
* fix: add seconds parameter seconds
* fix: added paramater for minutes
|
2019-05-08 17:39:54 +05:30 |
|
Suraj Shetty
|
3680ded331
|
Merge pull request #7426 from frappe/user-perm-fix
fix: typo in default user permission validation message
|
2019-05-08 10:12:45 +05:30 |
|
Suraj Shetty
|
2972507a69
|
Merge pull request #7422 from surajshetty3416/fix-energy-point-rule
fix: Skip energy point log creation if user from the rule comes out to be an admin
|
2019-05-08 09:28:45 +05:30 |
|
Suraj Shetty
|
6daaa02fcc
|
fix: use .get to avoid attribute error
|
2019-05-08 00:50:17 +05:30 |
|
Rushabh Mehta
|
76dbb3b8e8
|
Merge pull request #7403 from rmehta/error-reporting-develop
fix: error reporting
|
2019-05-07 19:05:11 +05:30 |
|
Mangesh-Khairnar
|
fbd58f2fe5
|
fix(user-permission): remove typo
|
2019-05-07 18:39:18 +05:30 |
|
Rushabh Mehta
|
f49163b2e3
|
fix(email): try matching replies from a longer timeframe (60 days)
|
2019-05-07 17:42:50 +05:30 |
|
Rushabh Mehta
|
b391d698b8
|
fix(typo): formatter.js
|
2019-05-07 17:35:56 +05:30 |
|
Rushabh Mehta
|
971a219414
|
Merge pull request #7414 from rmehta/group-by-fixes
fix(wip): group by in reports
|
2019-05-07 17:34:16 +05:30 |
|
Rushabh Mehta
|
be4c610286
|
fix: apply group by
|
2019-05-07 16:05:50 +05:30 |
|
Rushabh Mehta
|
87082e2c07
|
fix(report): charting in reports now supports group by and saved in user settings;
|
2019-05-07 15:50:18 +05:30 |
|
Suraj Shetty
|
09d36621c7
|
Merge pull request #7413 from netchampfaris/disable-portal-routes
fix: Disable Portal Routes
|
2019-05-07 14:08:01 +05:30 |
|
Suraj Shetty
|
53ef9f265b
|
Merge pull request #7421 from netchampfaris/website-redirects
feat: Website Redirects
|
2019-05-07 13:06:47 +05:30 |
|
Suraj Shetty
|
0bbb3b3ad6
|
fix: listview count while filtering with child table (#7420)
* fix: Add distinct to count query if filter includes child table
|
2019-05-07 12:34:32 +05:30 |
|
Suraj Shetty
|
b62a92694a
|
fix: Skip log creation if user from the rule comes out to be Admin
|
2019-05-07 11:37:35 +05:30 |
|
Faris Ansari
|
11ad92a21f
|
feat: Website Redirects
|
2019-05-07 11:32:28 +05:30 |
|
Rushabh Mehta
|
c6b7d183df
|
Merge pull request #7415 from scmmishra/disable-customize
feat: disable customize option for single doctypes
|
2019-05-07 11:10:45 +05:30 |
|
Rushabh Mehta
|
699b5524f8
|
fix(report): save group by settings in report
|
2019-05-06 22:05:12 +05:30 |
|
Rushabh Mehta
|
3cab2186f3
|
fix(report): save group by settings in report
|
2019-05-06 20:01:33 +05:30 |
|
Rushabh Mehta
|
07746ff7c9
|
fix: column mapping
|
2019-05-06 19:37:03 +05:30 |
|
Shivam Mishra
|
b79d35033f
|
feat: disable customize option for single doctypes
|
2019-05-06 18:42:28 +05:30 |
|
Rushabh Mehta
|
b4e9d3d7a8
|
fix(wip): group by in reports
|
2019-05-06 16:19:54 +05:30 |
|
Faris Ansari
|
ef2979c7e7
|
fix: Disable Portal Routes
|
2019-05-06 15:12:21 +05:30 |
|
Rushabh Mehta
|
1dcf80b92a
|
Merge pull request #7411 from rmehta/fix-link-preview
fix(link-preview): cleanup and fixes
|
2019-05-06 13:44:29 +05:30 |
|
Rushabh Mehta
|
51d95321c1
|
fix(link-preview): cleanup and fixes
|
2019-05-06 13:42:25 +05:30 |
|
Rushabh Mehta
|
ceda36d9ec
|
fix(minor): don't freeze screen in frappe.model.with_doctype
|
2019-05-06 12:32:41 +05:30 |
|
Suraj Shetty
|
ee50f29375
|
Merge pull request #7410 from surajshetty3416/fix-energy-point-ux
feat: Append modified_field to the user_feilds of energy point rule
|
2019-05-06 08:52:52 +05:30 |
|
Suraj Shetty
|
8948a014d2
|
fix: Skip energy point for admin
|
2019-05-06 08:26:24 +05:30 |
|
Suraj Shetty
|
9d96d707af
|
feat: Append modified_field to the user_feilds of energy point rule
|
2019-05-06 07:42:44 +05:30 |
|
Suraj Shetty
|
4e82a2edf5
|
Merge pull request #7409 from surajshetty3416/fix-pdf
fix(pdf): Define filedata before it is used
|
2019-05-05 13:44:59 +05:30 |
|
Suraj Shetty
|
d67bcd2212
|
fix: Define filedata before it is used
|
2019-05-05 12:23:46 +05:30 |
|
Suraj Shetty
|
8af25cce99
|
feat: Add email template field to Communication
|
2019-05-04 17:32:03 +05:30 |
|
Suraj Shetty
|
beb8b0bcbd
|
Merge pull request #7400 from surajshetty3416/goto-page-button
fix: Need to refresh page when navigating to page after visiting page form
|
2019-05-04 17:25:24 +05:30 |
|
Rushabh Mehta
|
4c578e8238
|
fix: dont show double messages
|
2019-05-04 14:14:56 +05:30 |
|
Rushabh Mehta
|
d727aa9e57
|
fix(minor): fix error reporting exception JSON handling
|
2019-05-04 14:05:49 +05:30 |
|
Saurabh
|
c178014f49
|
Merge pull request #7398 from surajshetty3416/fix-postgres-query
fix(postgres): Get data of empty table from pg_stat_all_tables
|
2019-05-03 17:04:22 +05:30 |
|
Rushabh Mehta
|
311202611b
|
fix(style): cleanup blog subtitle
|
2019-05-03 15:01:41 +05:30 |
|
Suraj Shetty
|
c8822191c9
|
style: Remove log statement
|
2019-05-03 13:54:09 +05:30 |
|
Suraj Shetty
|
da8612aa0f
|
style: Add a space and user frappe.session.user instead of just user
|
2019-05-03 13:38:23 +05:30 |
|
Suraj Shetty
|
3d555c80bb
|
fix: Only use local's page object if it has page script
|
2019-05-03 13:37:28 +05:30 |
|