Commit graph

244 commits

Author SHA1 Message Date
Achilles Rasquinha
ad9a207ec2
Merge pull request #5103 from achillesrasquinha/py3
Fix Unittest
2018-02-28 21:34:18 +05:30
Achilles Rasquinha
abb7f14bbd self.assertEqual 2018-02-28 21:19:01 +05:30
Achilles Rasquinha
826c14db31 [CHAT] Some cleanup from previous chat 2018-02-28 19:35:14 +05:30
Loocor
c43d1fac59 frappe chinese document translation plan (#4689)
* [add] Chinese documents init.

* Videos chinese document translated

* Bench chinese documents translated half

* Bench chinese documents translated

* Fixed several mistakes for bench guides

* Frappé Tutorial chinese version in translation
2018-01-23 14:50:46 +05:30
Shridhar
2d164ca70f Scheduler hooks event cron 2018-01-19 15:53:08 +05:30
Shridhar
75e503ef42 Documentation for Cron like events scheduler 2018-01-19 15:15:40 +05:30
Revant Nandgaonkar
5f22459013 Salesforce social login (#4819)
* Added Salesforce Social Login

* [Docs] Generate client_id client_secret for login providers

* [Fix] salesforce userid

Saleforce sub from openid is https://login.salesforce.com/id/ABC/XYZ
Extracting ABC/XYZ
2018-01-19 12:23:37 +05:30
LB (Ben Johnston)
4930985d70
Fix line break before Jinja Templating
Rendered version was not showing correctly, the bullet point `Codecademy Tutorial for jQuery` was showing as a header.
2018-01-10 18:44:41 +10:00
Revant Nandgaonkar
02aa7b6f41 Social login refactor (#4519)
* Added DocType Social Login Key

WIP for https://github.com/frappe/frappe/issues/4496
added basic fields
after_insert add provider_username and provider_userid fields on User dt
on_trash deletes added fields on User dt

* Added field to store fontawesome icon for provider

* [Patch] Social Login Keys to Social Login Key

* [Patch] Social Login Keys to Social Login Key

* Social Login Key generates boilerplate

* patch fixed for social_login_refactor

* removed patch-not working

* use social login keys to initiate flow

* Login page shows Social Login Key

* show login via if base_url present

* removed boilerplate generator

* Multiple Changes

fix zxcvbn import in password_strength.py
use of child table instead of additional fields on user dt to store username and userid

* Fetched Template on Client JS

* Frappe social login template working

* Added Social Login Key Templates

* Codacy fixes and validate social login key urls

* [Patch] Social Login Keys (untested)

* [Fix] Patch refactor social login keys

* [Fix] Patch refactor_social_login_keys manually tested

* Refactor OAuth 2.0 related changes for Social Login Key

* [Fix] Patch refactor social login keys

* Test - Adding Frappe Social Login Key

* Social Login Key Tests

check added child table entry on user for provider frappe
it also checks if userid is created

* [WIP] Office 365 Social Login Key Template

* [Fix] Social Login - Redirect URL

* [Test] Single sign-on icons for added provider

* [Fix] Codacy Errors

* [Fix] Social Login Key Form JS

* Docs Added for Social Login Key

* [Fix] Patch Refactor Social Login Keys

* Handle different icon types

Handle different icon types (image, icon, emoji) with just icon field

* Move the login methods to a new py file

frappe.integrations.oauth2_logins added
copied whitelisted guest oauth2 redirect endpoints from login.py
removing the functions from login.py will break backward compatibility

* Social Login Key Form Changes

Moved Enable field to top
Fields which are not editable are collapsed

* [Fix] Codacy Errors

* Corrected Docs, sync.py

* [Docs] Adding a social login provider

* [Fix] set frappe userid from User Social Login

* [Fix] frappe userid in oauth.py

* removed icon_type

* Use frappe.utils.is_image
2018-01-03 14:57:16 +05:30
mist-01
e5771e508e Updated docs - add notice about needing to be logged in as Administrator to view developer options. (#4651) 2017-12-18 17:44:32 +05:30
Sharath-Chikkanna
009e0bdc05 Note regarding CSRF-Token added to POST request rest api docs. (#4613) 2017-12-13 16:18:46 +05:30
Prateeksha Singh
1edc2b2936 update charts docs 2017-12-12 14:27:53 +05:30
Davide Bortolami
8e6d72e6ef GSuite Documentation updates (#4570)
I will update this PR with various documentation improvements in the following days
2017-12-07 13:00:48 +05:30
joezsweet
299ab6198a Cron like events scheduler (#4339)
* - trigger new "cron" event
- check cron string syntax
- added croniter to requirements

* - run scheduler ever 60 sec
- trigger all enabled events
- enqueue if now >= next time execution since last one

* Update task-runner.md

* fixed tests

* fix triggering with now = True

* modified sobstitution to cron_map
modified annually label to annual

* ability to use labels defined in cron_map in cron string definition
2017-10-27 14:48:48 +05:30
Faris Ansari
d20f9e2895 Data Migration Tool (for hub) (#4144)
* migration tool

* custom field for primary key added

* foreign key and multiple linking F_key issue resolved

* refined code

* many-to-one mapping temp fix

* added support for pre-process + cleaned up code

* [various] fixes to setup wizard for developer mode, frappe.enqueue_doc, share with assign

* Refactor data migration module

* added migration for hub

* Add "Skip errors" in data import tool

* move db_set to document.py

* Add Data Migration Run

* Dynamic Migration ID

* move run() from Mapping to Run

* Push Deleted Documents

* fixes

* [migration] doc operation counts

* insert and update instead of push in connection

* fix count and total_pages, skip sync if total_pages is 0

* [migration] child tables

* fix complete()

* [page] remove required libs

* Add sidebar.js, rename old sidebar.js to form_sidebar.js

* [minor] get_empty_state fixes

* svg in icon

* remove image check

* fix codacy

* fix is_child_table check

* [connector] add get_list()

* Add test for Data Migration Run

* fix test

* truncate tabNote

* fix test

* sync todo with event to fix test

* fix db count

* [mapping] export Mapping to json

* Add docs for Data Migration Tool

* [migration] pull data as list, test case

* [hub] remove mapping export to files

* Pull refactor

* [test]

* Add comments

* [mapping] exec in mapping formula

* fix codacy

* fix codacy

* Remove exec for pre-process and post-process

* Add pre and post process for Push

* Remove formula

* fixes

* [refactor] add failed_log to pull, handle error in pull

* [test] Push, pull, update

* Fix codacy, fix insert_doc for pull

* Set migration id on successful insert

* fix update_doc

* fix update_doc

* method is a function

* child table mapping

* Refactor logging

* fix update_doc again

* fix hostname, password

* update docs, minors

* Remove assign_if_none

* Remove error handling from connection methods

* [refactor] Data migration run

* Break push stages into methods

* Migration run refactor

- fix test
- add separate fields for logging

* fix codacy

* fix hostname password

* fix test
2017-10-05 11:15:35 +05:30
Revant Nandgaonkar
b6d982dfe7 Webhook doc correction 2017-09-14 17:39:44 +05:30
Revant Nandgaonkar
369ce0af66 [Docs] Webhook screenshot updated 2017-09-14 17:30:08 +05:30
Revant Nandgaonkar
cedb309446 Cleanup and Docs for Webhooks 2017-09-14 17:26:34 +05:30
Revant Nandgaonkar
9941128477 Merge branch 'develop' of frappe/frappe into web_hooks 2017-09-14 11:58:22 +05:30
tundebabzy
bd6bea9fec edit documentation and add correct image url (#4116) 2017-09-14 11:04:40 +05:30
Revant Nandgaonkar
f8a1d55689 Fix and Documentation
webhook_doctype field made Mandatory in Webhook
Documentation and screenshot added
2017-09-10 10:58:33 +05:30
Rushabh Mehta
8bc72a1255 [minor] list is extensible 2017-08-02 14:54:28 +05:30
Rushabh Mehta
ece91d903c [docs] simplified docs home 2017-07-31 17:39:44 +05:30
Rushabh Mehta
590310091b [docs] remove {{docs_base_url}} 2017-07-31 16:41:19 +05:30
Rushabh Mehta
8f2b001bd0 [docs] add headings 2017-07-31 16:21:13 +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
Prateeksha Singh
7fa8148d33 Graph additions (#3776)
* remove hardcoded height and width

* [graph] relative measures, offsets, generalise all base jobs

* Multiple datasets! (individually colored)

* [graph] Tooltips

* [graph] animate and change values

* [graph] percentage graph

* [graph] custom height, window resize refresh

* [graph] style changes

* [graph] update docs

* [graphs] make graphs.less

* [graphs] prefix classes with 'graph-', nest inside parent class
2017-07-28 11:14:33 +05:30
Frappe PR Bot
cbd257f0ba [Translation] Updated Translations (#3769) 2017-07-25 11:19:46 +05:30
felixvarghese
f189829240 Allow SSL connections to a remote database server (#3742)
* Allow SSL connections to a remote database server

Add the following options in site_config.json to use ssl

- "db_ssl_ca" = "/path/to/ca/cert.pem"
- "db_ssl_cert" = "/path/to/ssl/cert.pem"
- "db_ssl_key" = "/path/to/ssl/key.pem"

The files mentioned should be stored on the App server in the location mentioned.

This commit allows for basic ssl connections. X509 is still not supported.

If the above options are not set, the connection will not use an encrypted connection, and connect normally.

* docs - Allow SSL to remote database host
2017-07-20 18:00:02 +05:30
mbauskar
d674a69ba6 Merge branch 'master' into develop 2017-07-20 14:16:01 +05:30
Narciso E. Núñez Arias
923990872b [docs] Translation of the Guides And Resources section in bench to Spanish (#3747)
* Add basic files structure for spanish translation of the doc

* Translate the video tutorial index page

* Translate Before Start page

* Translate What is an app page

* Translate the Bench page

* Translate Conslusion page of the tutorial

* Translate to spanish Tutorial Index page

* Translate to spanish Reports page

* Translate to Spanish Roles Page

* Translate to Spanish the Tutorial Model Page

* Translate to Spanish the tutorial Single Doctypes page

* Translate to Spanish the tutorial Doctype files structure page

* Translate to Spanish the tutorial Start Bench page

* Translate to Spanish the tutorial New App page

* Translate to Spanish the tutorial Client Side Script page

* Translate to Spanish the tutorial Users and records page

* Translate to Spanish the tutorial Setting Up the site page

* Translate to Spanish the tutorial Task Runner page

* Translate to Spanish the tutorial Controllers Page

* Translate to Spanish the tutorial Doctypes page

* Translate to Spanish the tutorial Naming And Linking page

* Translate to Spanish the tutorial Web Views page

* Add basic file structure to translate the bench section of the tutorial

* [docs] Translate to Spanish the tutorial Adding custom domain page

* [docs] Translate to Spanish the tutorial Configuring HTTPS page

* [docs] Translate to Spanish the tutorial Diagnosing the Scheduler page

* [docs] Translate to Spanish the tutorial Settings Site Limits\ page

* [docs] Translate to Spanish the tutorial Setup Production page

* [docs] Translate to Spanish the tutorial Bench ProcFile page

* [docs] Translate to Spanish the tutorial Manual Setup page

* [docs] Translate to Spanish the tutorial Background Services page

* [docs] Translate to Spanish the tutorial Lets Encrypt Setup page

* [docs] Translate to Spanish the tutorial Setup Multitenancy page

* [docs] Translate to Spanish the tutorial Bench Commands page
2017-07-20 10:28:15 +05:30
Rushabh Mehta
5577442251 [tests] refactor tests (#3743)
* [tests] refactored client side tests

* [tests] refactored client side tests

* [tests] refactored client side tests
2017-07-19 18:09:06 +05:30
Narciso E. Núñez Arias
e081dff979 Translation of the Tutorial And Videos section to Spanish (#3718)
* Add basic files structure for spanish translation of the doc

* Translate the video tutorial index page

* Translate Before Start page

* Translate What is an app page

* Translate the Bench page

* Translate Conslusion page of the tutorial

* Translate to spanish Tutorial Index page

* Translate to spanish Reports page

* Translate to Spanish Roles Page

* Translate to Spanish the Tutorial Model Page

* Translate to Spanish the tutorial Single Doctypes page

* Translate to Spanish the tutorial Doctype files structure page

* Translate to Spanish the tutorial Start Bench page

* Translate to Spanish the tutorial New App page

* Translate to Spanish the tutorial Client Side Script page

* Translate to Spanish the tutorial Users and records page

* Translate to Spanish the tutorial Setting Up the site page

* Translate to Spanish the tutorial Task Runner page

* Translate to Spanish the tutorial Controllers Page

* Translate to Spanish the tutorial Doctypes page

* Translate to Spanish the tutorial Naming And Linking page

* Translate to Spanish the tutorial Web Views page
2017-07-19 10:29:16 +05:30
Frappe PR Bot
4885ecb116 [Translation] Updated Translations (#3710) 2017-07-17 17:50:51 +05:30
Prateeksha Singh
b602a07c7a Graphs, and target notifications (#3641)
* [sales goal] in company; graph, notifs

* cleanup notifications.js, summary and specific val in graph

* Add line graph, add goal data methods in goal.py

* [tests] targets in notification config

* [minor] type of graph as argument in parent

* Update graph docs

* remove company dependent test for notification

* [fix] test

* look for monthly history in cache

* check for cached graph data in field
2017-07-17 14:51:30 +05:30
Rushabh Mehta
25ad8ef16c Test Runner - Refactored (#3679)
* [tests] test_runner to run one JS test at a time

* [tests] test_runner to run one JS test at a time

* [test] ignore failing tests

* [test] comment test_calendar_view

* [test] add timeout

* [test] add timeout
2017-07-13 15:17:12 +05:30
negstek
ff5eb069c6 Update web-views.md (#3642)
Correction of typing error
2017-07-08 13:53:31 +05:30
Nabin Hait
698e2d8c69 Escaped success msg in web form. Fixes frappe/erpnext#9729 (#3643) 2017-07-08 13:53:00 +05:30
Frappe PR Bot
10318c3f12 [translation] translation updates (#3607) 2017-07-04 16:19:36 +05:30
Rushabh Mehta
f409fd7358 [ui-tests] python is back! (#3565)
* [ui-tests] python is back!

* [minor] remove old test

* [test] dont test test_runner

* [tests] try firefox

* [tests] try chrome

* [tests] try chrome

* [tests] try chrome

* [tests] try chrome 1

* [tests] try chrome 2

* [tests] try chrome 3

* [tests] try phantomJS

* [tests] try chrome

* [tests] try chrome

* [tests] try chrome

* [tests] try chrome

* [tests] try chrome

* [tests] try chrome

* [tests] try chrome

* [tests] try chrome

* [tests] login click button

* [tests] login click button

* [tests] show log

* [test] test with start_maximized

* [test] test only login

* [travis] test another port for selenium

* [travis] try running ui tests after unittests are done

* [travis] pring body_div if fails

* [tests] complete setup wizard for frappe

* [minor] move ui tests to frappe/ui/tests

* [tests] ui tests in public and codacy fixes

* [fix] tests + eslint

* [minor] move tests to tests/ui folder and print console after print

* [fix] linting

* [tests] added documentation and better integration testing

* [promise] form triggering is now promise based

* [test]

* [test]

* [test]

* [test]

* [test] print output

* [minor] default empty in select and print console

* [cleanup] more minor fixes

* [enhance] first-cut done!

* [minor] frappe.run_serially to pass arguments while chaining
2017-07-03 11:53:00 +05:30
frappe-pr-bot
a6f053389e [translation] translation updates 2017-06-27 08:34:50 +02:00
Sagar Vora
b919aa4b74 Organisation, adding more resources and language changes 2017-06-21 18:07:37 +05:30
Sagar Vora
dc51c4c439 minor spelling and grammar fixes 2017-06-21 15:39:46 +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
Fahim Ali Zain TP
ceec4af9c6 Create hooks.md 2017-06-13 05:45:05 +05:30
Karan Sharma
1d0c98c265 Missing + operator
`msgprint` has a missing `+` operator, which is syntactically incorrect.
2017-06-08 11:58:04 +05:30
Ramesh
67cff23db2 Update hooks.md
added additional hooks in hook.md. on_trash, on_change and after_delete.
2017-05-25 13:07:36 +05:30
JC
343d773bb0 [documentation] fix url to generators.png (#3220)
* Update index.txt

* [documentation] fix path to png, add {next} link to next page

* [documentation] fix url to generators.png
2017-05-04 12:16:47 +05:30
JC
ea3b712461 Update index.txt (#3198) 2017-05-01 12:32:36 +05:30
JC
63b5db0054 Update generators.md (#3197)
add {next} markup missing at bottom of page
2017-05-01 12:32:02 +05:30