Commit graph

67 commits

Author SHA1 Message Date
Deepesh Garg
2c6561d485 feat: Newsletter link in email section (#6519) 2018-11-22 12:10:57 +05:30
Charles-Henri Decultot
c2b49ce572 Slack integration (#5640)
* Slack notifications

* Codacy corrections

* Slack notifications

* Codacy corrections

* Rename Email Alert to Notification

* Migration Patch

* Refactor of notification.py

* Dev cleanup

* Test correction
2018-06-11 15:11:00 +05:30
Suraj Shetty
a93bc87363 Permission fixes (#5530)
* Add User Permissions to Config module

* Update Permission Manager help

* Fix share button

* Remove user-permissions page

* Remove unnecessary error modals

* User Permission UI fixes
- Fix double multicheck bug on save
- Add margin above and below select all button

* Update user_permissions dict realtime on client side

- Remove user_permissions from boot

* Cast permission dict values to int
2018-05-04 19:49:11 +05:30
Shreya Shah
655e6daee5 Rename doctype Standard Reply to Email Template (#5444)
* Rename Standard Reply to Email Template

* rename occurrences
2018-04-19 20:57:40 -08:00
Suraj Shetty
436d7a0d4e Data export tool (#5213)
* Data export tool
New doctype to export data
Child table export option
Ability to add filter

* Filter view refactor
Separated filter css

* Moved exporter script from data import doctype to data export doctype

* some input validation

* removed unwanted file and some style fixes

* removed console log

* hide sidebar

* renamed export method

* added data export link in setup module page

* minor fix

* refactor exporter.py

* data export ui tweaks

* codacy and bug fix

* silly code fixes

* [minor] indentation fix
2018-03-22 11:30:48 +05:30
Prateeksha Singh
ee220861c5 Desktop icons select dialog in place of page (#4843)
* [module_icon_setup] Initial bindings

* [module_icon_setup] replace with dialog

* [module_icon_setup] remove modules setup page

* [module_icon_setup] remove app installer
2018-01-23 15:26:49 +05:30
Nabin Hait
28a8da6531 Added domain settings in setup page 2017-12-25 15:20:36 +05:30
Manas Solanki
520bfc2ae4 New data import (#4601)
* created/moved the files

* added the model for the downloading the data

* add the file with the error data

* changes added other changes and fix codacy

* changes in the config and utils files

* fixed the test cases

* minor changes in the data keys dict

* changed the test file location

* fixed the tests

* set the route in the list view and show only erors

* minor fixes in the childtable import and log tables rendering

* Refactor Download dialog to use MultiCheck
2017-12-15 12:17:24 +05:30
Rushabh Mehta
8c246365aa Role Profile (#4395)
* Added doctype Role Profile

* Set role profile for user

* Fetch roles from role profile

* Added tests, updated user.js and role_profile.py

* update_roles on add/delete moved to user controller

* added py test

* improved naming

* validate_roles method added

* [minor] style
2017-10-27 15:34:04 +05:30
Rushabh Mehta
7dedc69461 [print-style] sync, fix tests and remove selection 2017-08-18 14:53:38 +05:30
Makarand Bauskar
20145b231e [minor] check if user exists or not (#3831)
* [minor] check if user exists or not

* [minor] remove the User Permission Link from module view
2017-08-01 16:11:05 +05:30
Sagar Vora
5c81b899a9 Add icon for Deleted Documents 2017-06-15 15:31:41 +05:30
ahmadRagheb
72f0b6cc79 Fix "Print Format Builder" translation (#3403)
* First commit

* fix  "Print Format Builder" label to be translated
2017-05-30 15:20:53 +05:30
Saurabh
7620bb3789 Deprecate Integration Broker (#2831)
* [fix] remove razorpay from integration service

* [fix] clean-up js side integration service dependancies

* [fix] remove integration service, .py cleanup, move integration request to integration

* [fix] move oauth to integrations and deprecate integration broker

* [fix] mark services enabled and update integrations listing

* [fix] V7.1 and V7.2 integration service related pathch fixes and move payment gateway dotype to core module

* [fix] create payment gateway records if not exists

* [fix] module page for integrations

* [minor][fix] minor checks

* [fix] remove integration broker module only if not allocated to any doctype
2017-03-14 11:24:26 +05:30
Rohit Waghchaure
67f4de1802 [fix] Separate has role patch to make custom role from custom docperm, if custom role not available then chceck standard permission for page and report 2017-03-13 13:46:04 +05:30
robert schouten
48dc91a59f Email inbox (#2485)
* Communication_reconciliation

* Email inbox

* added collapsed timeline for communication

* new email prefill from when only one address

* timeline duplication and notifcation and stability fixs

* add subject to timeline

* email system v7 fixes

* added password required validation

* use proper email datetime

* email inbox v7.1 fixes

* email inbox communication_date used instead of created

* email inbox communication data cleanup

* remove old patch

* email inbox permit unlinking

* [fix] duplication queue and rename domain to email domain

* fix rename domain

* email inbox index optimisation

* email inbox relink doctype query usability fix

* email_inbox Set attachment variable for forwards and replies based on whether it exists or not

* uidnext fixes and cleanup

* email inbox fix tests

* fix rebase timeline issue

* email inbox threading and cleanup

* email inbox cleanup

* bring inbox into frappe and cleanup

* fix missed path

* inbox cleanup

* email-inbox move service back to account

* separate to erpnext contact match

* email inbox cleanup and move relink and timeline fix

* relink optimisation

* inbox fix footer

* keep email drafts on pages not just forms

* email inbox add sent items

* email inbox allow not save list settings on query

* email inbox cleanup and remove communications recon

* add suspend sending button in email queue

* fix rebase error

* email inbox assorted fixes

* email inbox fixes and relink option only when linked otherwise link;

* email inbox fix sender fullname as administrator

* create user email to custom button

* email inbox sent no match and seen

* email inbox fix unicode issues with subject recipient and sender
2017-01-13 14:45:11 +05:30
Nabin Hait
958d8ea6c0 Merge branch 'master' into develop 2016-12-08 12:32:20 +05:30
robert schouten
bfadc9f81f move email group with newsletter (#2416) 2016-12-07 11:27:41 +05:30
Rushabh Mehta
7bc7e3bc63 Upgrade Font Awesome (#2410)
* Font-Awesome V3.x to V4.x

Font-Awesome V3.x to V4.x

* Font Tidy

Font Tidy

* FA4 Upgrade - Html Js & Json

FA4 Upgrade - Html Js & Json

* Minor

Minor
2016-12-05 13:07:03 +05:30
Nabin Hait
4cf123bd8f Fixed merge conflict 2016-11-28 14:25:11 +05:30
robert schouten
570f242841 move newsletter to tools (#2370) 2016-11-25 16:10:07 +05:30
robert schouten
074f0fcc0b tag catagories 2016-10-26 19:33:04 +05:30
Revant Nandgaonkar
d48b270bf5 OAuth 2 Provider for frappe (#2167)
* OAuth 2.0 Classes Added

Added oauthlib in requirement.txt
Added class WebApplicationServer for Authorization code grant and Bearer tokens.
Added class OAuthWebRequestValidator for Validating Oauth Request for Web Application

* copied code from mnt_oauth needs review

* [New] OAuth2 Doctypes and endpoints added

Integrations > OAuth Provider Settings
Integration Broker > OAuth Bearer Token
Integration Broker > OAuth Authorization Code
Integration Broker > OAuth Client
endpoints for authorize, approve, get_token, revoke_token and test_resource

* oauth2.py: renamed skipauth to skip_auth

* [Fix] Parse URL instead of storing it in settings

* [Fix] get skip_auth from OAuth Provider Settings

* Success URL format. Failure URL added. Confirmation dialog layout changed.

* Validate access token if passed during use of REST API

* OAuth Confirmation colours fixed

* Multiple Changes

Added links for OAuth under Integrations in Module list.
Updated permissions on OAuth doctypes.
Updated layout of OAuth Client doctype.

* [Docs] Integrations > How to setup OAuth

* [Docs] Integration > Using OAuth

* [Fix] get_token endpoint must to handle POST request

* [Fix] http verbs and responses for OAuth 2.0 Endpoints

* [Fix] accept oauth2 access_token from headers

* Removed unused imports from api.py
2016-10-25 10:28:32 +05:30
Saurabh
205ae26751 [fix] refactor integration services (#2087)
* [fix] refactor integration services

* [fix] patch fix

* [fix] added redirect url.

* [fix] custom redirect to and reditect message for paypal and service setup information

* [minor][fix] remove ldap dependancy from requirements
2016-10-10 17:16:21 +05:30
Rushabh Mehta
9d7ee83c5e [refactor] scheduler log is now error log and as MyISAM (commit not required) (#2152)
* [refactor] scheduler log is now error log

* [minor] new naming series

* [fix] engine

* [fix] saved by tests
2016-10-06 17:17:55 +05:30
Rushabh Mehta
2e66bd044b [docs] and other minor fixes 2016-09-15 13:55:37 +05:30
Rushabh Mehta
db9ba845e5 [enhancement] bulk update tool! 2016-07-15 16:28:20 +05:30
Kanchan Chauhan
a23ee192f3 Newsletter moved to Frappe 2016-06-28 18:28:24 +05:30
Rushabh Mehta
d0c2e57e1f [translation] moved Translation DocType from erpnext 2016-03-02 14:50:11 +05:30
rohitwaghchaure
9adaabbf38 [enhancement] multi-lingual print formats 2016-03-01 15:19:22 +05:30
Anand Doshi
d8f24822a9 [fix] cleanup, re-org and fixes to error snapshot 2015-12-16 19:39:56 +05:30
Rushabh Mehta
d977d027cf [enhancement] App Installer 2015-11-18 16:52:24 +05:30
Rushabh Mehta
22b828f55d [cleanup] desktop re-organization 2015-10-30 16:18:36 +05:30
Anand Doshi
ebdaaca779 [fix] dropbox backup typo and added backups under Setup > System 2015-09-28 19:37:12 +05:30
Rushabh Mehta
2191312c87 [enhancement] document management system 2015-09-21 15:41:34 +05:30
Anand Doshi
c079e27d3f Moved Backup Manager and Social Login keys to the new Integrations Module, prepared frappe for Mandrill Integration 2015-08-11 12:03:13 +05:30
Nabin Hait
c2a2128bad removed duplicate download backup link 2015-05-26 16:45:53 +05:30
Rushabh Mehta
b354ab9b58 [minor] messages on permission, website etc 2015-03-25 13:59:06 +05:30
Rushabh Mehta
c94033013d [link] add doctype option in customize 2015-03-04 12:06:45 +05:30
Anand Doshi
f6cdd4a655 Merge remote-tracking branch 'frappe/develop' into v5.0
Conflicts:
	frappe/__version__.py
	frappe/core/doctype/communication/communication.py
	frappe/core/page/desktop/desktop.js
	frappe/hooks.py
	frappe/translations/ar.csv
	frappe/translations/es.csv
	frappe/translations/fr.csv
	frappe/translations/hr.csv
	frappe/translations/id.csv
	frappe/translations/ja.csv
	frappe/translations/nl.csv
	frappe/translations/pl.csv
	frappe/translations/pt-BR.csv
	frappe/translations/ru.csv
	frappe/translations/tr.csv
	frappe/translations/zh-cn.csv
	frappe/translations/zh-tw.csv
	frappe/utils/email_lib/html2text.py
	setup.py
2015-02-24 18:06:16 +05:30
Anand Doshi
f3b37df2dd [fix] Added unicode_literals if missing in py files 2015-02-24 12:24:20 +05:30
Rushabh Mehta
2ad5612b56 [fixes] various 2015-02-21 14:38:34 +05:30
Rushabh Mehta
756af9af97 [share] completes #992 2015-02-05 17:26:23 +05:30
Rushabh Mehta
cf3074a20b [print-format] completed print format builder 2015-01-30 17:08:12 +05:30
Rushabh Mehta
3e58c29904 wip 2014-12-26 12:51:42 +05:30
Rushabh Mehta
27440ab7a0 [mailbox] frappe/erpnext#561: 2014-09-29 12:21:56 +05:30
Rushabh Mehta
5a0a9aac66 [refactor] frappe.widgets > frappe.desk 2014-09-29 12:21:12 +05:30
81552433qqcom
cf82903609 permission_manager.js translation
doclistview, no {0} found.
setup.py, translated.

Issue exists: read, write etc translation doesn't show.(note, not sure if it is case sensitive)

Conflicts:
	frappe/core/page/permission_manager/permission_manager.js
2014-08-27 15:08:52 +05:30
Anand Doshi
022a912ecd Moved Social Login Keys doctype to Website module 2014-08-13 18:42:53 +05:30
Rushabh Mehta
2aa0e3d1b6 cleaned up print (js) and added print settings 2014-07-25 13:01:47 +05:30