Commit graph

122 commits

Author SHA1 Message Date
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
aa78c34664 Update integrations.py and Standard Reply naming 2017-11-20 10:51:07 +08:00
Dominik
eafecf9241 [New Integration] Googlemaps and edit Standard Reply Naming 2017-11-17 15:46:41 +08:00
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
Rishabh Nambiar
0e412de72e [major] AWS S3 Integration for Frappé (#4272)
* Added S3 Integration, need to add backup limit

* Fix validation in s3 doctype

* Added auto-deletion of old backups and backup_limit usage

* Fixes for codacy PR review

* Improved exception handling.

* Update s3_backup_settings.py
2017-10-17 12:45:25 +05:30
Revant Nandgaonkar
ff8215331a [Add] Webhook DocType and Tests 2017-09-08 17:17: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
Rushabh Mehta
ece91d903c [docs] simplified docs home 2017-07-31 17:39:44 +05:30
Rushabh Mehta
c519122929 [docs] Build docs in an app (#3796)
* [docs] to be rendered in website

* [docs] generating-docs.md

* [fix] codacy

* [docs] minor updates

* [fix] routing
2017-07-28 11:43:16 +05:30
Rushabh Mehta
63ed486bfc [hot] fix grid display bug 2017-06-17 13:57:24 +05:30
Sagar Vora
5c81b899a9 Add icon for Deleted Documents 2017-06-15 15:31:41 +05:30
KanchanChauhan
f52e389d4f Salutation and Gender in Contact (#3079) 2017-06-13 15:25:53 +05:30
almeidapaulopt
b17b73c4f3 GSuite integration (#3252)
* GSuite initial commit

* GSuite initial commit

* cleanups

* exception handle

* gsuite script: add doGet

* Add GSuite integration to the upload popup

* hide dialog fields if gsuite disabled

* move gsuite code to gsuite.js from upload.js

* documentation

* change name format

* typo on GSuite

* copy paste the file .gs

* fix:don't show gsuite when creating a file in filemanager

* add version to webapp

* add webapp default url

* move webapp to html fied

* fix rebase

* fixes for codecy
2017-06-13 14:55:07 +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
77ef3e8a27 [fix] list stripe payment gateway under integrations (#3270)
* [fix] list stripe payment gateway under integrations

* Update integrations.py
2017-05-12 15:22:01 +05:30
Rushabh Mehta
12775c9a5f [fixes] listview strip and email inbox list view 2017-04-03 09:34:18 +05:30
mbauskar
4de21b8024 [patch] Email inbox desktop icon fixes 2017-03-31 08:49:15 +05:30
mbauskar
c8db0b292c [minor] removed the email inbox selector, deleted user from locals on create email account 2017-03-29 18:40:58 +05:30
mbauskar
882c9613fb [minor] email inbox desktop icon 2017-03-14 17:55:07 +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
Rushabh Mehta
8ac3a9a7ca [web-forms] added text-editor and using div in summernote instead of p 2017-02-28 12:13:36 +05:30
Faris Ansari
0490efd1af [minor] Kanban permission, Calendar route (#2692)
* [fix] Calendar route in desk, notification frappe/erpnext#7670

* [kanban] set permission rule to All
2017-02-09 12:52:01 +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
Rushabh Mehta
d579cea70d Configurable Website Sidebar in Web Pages (#2530)
* [wip] website fixes

* [added] Website Sidebar
2016-12-30 12:39:01 +05:30
Rushabh Mehta
ca97204bdb [fix] tests + add google analytics id in docs 2016-12-09 16:39:38 +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
Nabin Hait
9af61bbe79 Merge pull request #2388 from rmehta/merge-kb
[feature] merge knowledge base in Frappe, fixes frappe/erpnext#6030
2016-12-05 14:42:31 +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
Rushabh Mehta
2a8902326d [feature] merge knowledge base in Frappe, fixes frappe/erpnext#6030" 2016-11-28 17:26:53 +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
Rushabh Mehta
7c8652fbf2 [docs] added some style and some fixes (#2352) 2016-11-22 10:55:32 +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
b6bee64370 [enhance] minor fixes + background jobs 2016-08-18 18:26:15 +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
349a65402f [website] fixes for generating docs 2016-06-23 18:22:03 +05:30
Rushabh Mehta
8a91f1a790 [rename] Bulk Email to Email Queue 2016-06-22 13:06:06 +05:30
Rushabh Mehta
5ab8a8d405 [cleanup] form links dashboard and added blocked in Desktop Icons, standard icons hidden by default 2016-04-13 17:21:15 +05:30
Rushabh Mehta
fc5155c2fb [minor] chat link, fixes frappe/erpnext#5127 2016-04-04 11:53:41 +05:30
Rushabh Mehta
1dbd6c83ea [rename] messages -> chat 2016-03-31 11:52:28 +05:30
Rushabh Mehta
dacaa7ab0c [enhancement] portal settings for portal menu 2016-03-30 12:28:55 +05:30