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
Rushabh Mehta
b9f6bc3423
added email alerts
2014-07-15 14:50:49 +05:30
Rushabh Mehta
6083999f8a
added standard reply fixes frappe/erpnext#1819
2014-06-19 15:16:56 +05:30
Anand Doshi
0eb5e8120f
Fixes for apply user permissions and momentjs
2014-06-04 18:12:57 +05:30
Anand Doshi
11259e8eaa
Role and User Permissions
2014-06-04 17:52:50 +05:30
Anand Doshi
82d2a2fda1
Permission relogication continued
2014-06-04 17:52:49 +05:30
Anand Doshi
fec15666f4
Started permission relogication
2014-06-04 17:52:17 +05:30
Anand Doshi
b5032cf51e
Fixed moduleview language issue
2014-05-08 11:43:11 +05:30
Rushabh Mehta
bd097072c9
created System Settings and update to language setup
2014-04-17 18:47:48 +05:30
Anand Doshi
c709b48a03
Auto set Select values for new documents, other minor fixes
2014-04-15 16:19:20 +05:30
Rushabh Mehta
e11b737591
frappe/frappe#478 fix and added print heading
2014-04-03 15:04:19 +05:30
Anand Doshi
b5aa26b7bc
Updated margins for ul li, ol li elements, Changed Tools to Help in Toolbar, Moved Download Backup to Setup > System > Download Backup
2014-03-14 15:09:25 +05:30
Rushabh Mehta
f3810ae532
rename Profile to User frappe/frappe#470
2014-03-11 16:14:47 +05:30
Anand Doshi
2ff4d34fba
DocType Social Login Keys, to make it easy for setting up Social Logins. Fixes in Module View for Setup
2014-03-04 11:14:24 +05:30
Anand Doshi
ebd825e0c7
Outgoing Email Settings as part of Frappe, fix in copy doc
2014-03-03 20:30:50 +05:30
Anand Doshi
2946cbd1f5
Fix to User Restriction (accept Blank value), Permission Manager Help cleanup
2014-03-03 19:30:11 +05:30
Anand Doshi
d6a0b951ae
Module View, Removed Website Table of Contents
2014-03-03 15:04:03 +05:30
