Commit graph

1435 commits

Author SHA1 Message Date
Faris Ansari
171c650ddf
Merge pull request #6055 from Thunderbottom/file-api
Streamlined File API based on ORM
2018-09-25 17:38:04 +05:30
Roland
2a2e3ca0af fairlogin social ID provider (#6096)
* fairlogin

adding fairlogin provider

* fairlogin

add fairlogin provider

* fairlogin

* fairlogin

* fairlogin userid

fairlogin userid corrected to preferred_username

* removed trailing white space

* removed trailing white space

removing white space mourned by automated code review
2018-09-25 15:35:46 +05:30
Aditya Hase
ab81036c20 fix(python3): subproess.check_output should always be decoded (#6135) 2018-09-25 13:14:20 +05:30
Sachin Mane
5e5623d7f9 fix - default timeouts never picked up (#6098) 2018-09-24 13:08:08 +05:30
Achilles Rasquinha
97c02cae82 Installation Failure Fix for Python 3 - safe_decode bytes to string (#6130)
* Installation Failure Fix for Python 3 - safe_decode bytes to string

* Installation Failure Fix for Python 3 - safe_decode bytes to string

* Fixed merge conflict

* Use --short instead of first 7 characters
2018-09-24 12:34:31 +05:30
Chinmay Pai
6e84bbe80d
Merge branch 'develop' into file-api 2018-09-21 13:42:32 +05:30
Rushabh Mehta
2e6a202652 Postgres support for Frappe (#5919)
* [start] postgres

* [wip] started refactoring db_schema

* Add psycopg2 to requirements.txt

* Add support for Postgres SQL

- Separate frameworkSQL, database, schema, setup_db file for
mariaDB and postgres
- WIP

* Remove quotes from sql to make it compatible with postgres as well

* Moved some code from db_schema to database.py

* Move code from db_schema to schema.py

Add other required refactoring

* Add schema chages

* Remove redundant code in file

* Add invalid column name exception class to exceptions.py

* Add back tick in query wherever needed and replace ifnull with coalesce

* Update get_column_description code in database.py file

* Remove a print statement

* Add keys to get on_duplicate query

* Add bactick wherever necessary

- Remove db_schema.py file

* Remove DATE_SUB as it is incompatible with postgres

- Fix prepare_filter_condition

* Add backtick and quotes wherever necessary
- Move get_database_size to frappe.db namespace
- fix some left out bugs and errors

* Add code to create key and unique index
- added mysql and posgres in their respective database.py

* Add more bacticks in queries and fix some errors
- Pass keys to on_duplicate_update method
- Replace MONTH with EXTRACT function
- Remove DATEDIFF and CURDATE usage

* Cast state value to int in toggle_two_factor_auth
- since two_factor_auth has the datatype of Int

* Refactor
- Replace Timediff with normal arithmetic operator
- Add MAX_COLUMN_LENGTH
- Remove Redundant code
- Add regexp character constant
- Move create_help_table to database.py
- Add get_full_text_search_condition method
- Inherit MariaDBTable from DBTable

* Replace Database instance with get_db method

* Move db_manager to separate file

* Refactor
- Remove some unwanted code
- Separate alter table code for postgres and mysql
- Replace data_type with column_type in database.py

* Make fulltext search changes in global_search.py

* Add empty string check

* Add root_password to site config

* Create cli command for postgres console

* Move setup of help database to setup_db.py

* Add get_database_list method

* Fix exception handling
- Replace bad_field handler with missing_column handler

* Fix tests and sql queries

* Fix import error

* Fix typo db -> database

* Fix error with make_table in help.py

* Try test for postgres

* Remove pyhton 2.7 version to try postgres travis test

* Add test fixes

* Add db_type to the config of test_site_postgres

* Enable query debug to check the reason for travis fail

* Add backticks to check if the test passes

* Update travis.yml
- Add postgres addon

* Try appending 'd_' to hash for db_name
- since postgres does not support dbname starting with a number

* Try adding db_type for global help to make travis work

* Add print statements to debug travis failure

* Enable transaction and remove debug flag

* Fix help table creation query (postgres)

* Fix import issue

* Add some checks to prevent errors
- Some doctypes used to get called even before they are created

* Try fixes

* Update travis config

* Fix create index for help table

* Remove unused code

* Fix queries and update travis config

* Fix ifnull replace logic (regex)

* Add query fixes and code cleanup

* Fix typo
- get_column_description -> get_table_columns_description

* Fix tests
- Replace double quotes in query with single quote

* Replace psycopg2 with psycopg2-binary to avoid warnings
- http://initd.org/psycopg/docs/install.html#binary-install-from-pypi

* Add multisql api

* Add few multisql queries

* Remove print statements

* Remove get_fulltext_search_condition method and replace with multi query

* Remove text slicing in create user

* Set default for 'values' argument in multisql

* Fix incorrect queries and remove few debug flags
- Fix multisql bug

* Force delete user to fix test
- Fix Import error
- Fix incorrect query

* Fix query builder bug

* Fix bad query

* Fix query (minor)

* Convert boolean text to int since is_private has datatype of int
- Some query changes like removed double quotes
and replace with interpolated string to pass multiple
value pass in one of the query

* Extend database class from an object to support python 2

* Fix query
- Add quotes around value passed to the query for variable comparision

* Try setting host_name for each test site
- To avoid "RemoteDisconnected" error while testing data migration test
- Update travis.yml to add hosts
- Remove unwanted commit in setup_help_database

* Set site hostname to data migration connector (in test file)
- To connect the same site host

* Fix duplicate entry issue
- the problem is in naming series file.
In previous commits I unknowingly changed a part of a series query
due to which series were not getting reset

* Replace few sql queries with orm methods

* Fix codacy

* Fix 'Doctype Sessions not found' issue

* Fix bugs induced during codacy fixes

* Fix Notification Test

- Use ORM instead of raw sql

* Set Date fallback value to 0001-01-01

- 0000-00-00 is invalid date in Postgres
- 0001-01-01 works in both

* Fix date filter method

* Replace double quotes with single quote for literal value

* Remove print statement

* Replace double quotes with single

* Fix tests

- Replace few raw sql with ORM

* Separate query for postgres

- update_fields_to_fetch_query

* Fix tests

- replace locate with strpos for postgres

* Fix tests

- Skip test for datediff
- convert bytes to str in escape method

* Remove TestBot

* Skip fieldname extraction

* Replace docshare raw sql with ORM

* Fix typo

* Fix ancestor query test

* Fix test data migration

* Remove hardcoded hostname

* Add default option and option list for db_type

* Remove frappe.async module

* Remove a debug flag from test

* Fix codacy

* fix import issue

* Convert classmethod to static method

* Convert few instance methods to static methods

* Remove some unused imports

* Fix codacy

- Add exception type
- Replace few instance methods with static methods
- Remove unsued import

* Fix codacy

* Remove unused code

* Remove some unused codes

- Convert some instance methods to static function

* Fix a issue with query modification

* Fix add_index query

* Fix query

* Fix update_auth patch

* Fix a issue with exception handling

* Add try catch to a reload_doc

* Add try-catch to file_manager_hook patch

* import update_gravatar to set_user_gravatar patch

* Undo all the wrong patch fixes

* Fix db_setup code 😪
- previously it was not restoring db from source SQL
which is why few old patched were breaking
(because they were getting different schema structure)

* Fix typo !

* Fix exception(is_missing_column) handling

* Add deleted code
- This code is only used in a erpnext patch.
Can be moved to that patch file

* Fix codacy

* Replace a mariadb specific function in a query used in validate_series

* Remove a debug flag

* Revert changes (rename_parent_and_child)

* Fix validate_one_root method

* Fix date format issue

* Fix codacy
- Disable a pylint for variable argument warning
- Convert an instance method to static method

* Add bandit.yml

The Codacy seems to use Bandit which generates
warning for every subprocess import and its usage during pytest
Since we have carefully used subprocess (avoided user input),
warnings needs to be avoided.
This can be removed if we have any alternative for subprocess usage.

* Skip start_process_with_partial_path check

* Fix typo

* Add python 2.7 test

* Move python versions in travis.yml

* Add python versions to jobs

* Overwrite python version inheritance for postgres in travis.yml

* Add quotes around python version in .travis.yml

* Add quotes around the name of the job

* Try a travis fix

* Try .travis.yml fix

* Import missing subprocess

* Refactor travis.yml

* Refactor travis.yml
- move install and tests commands to separate files
- Use matrix to build combination of python version and db type

* Make install.sh and run-tests.sh executable

* Add sudo required to travis.yml to allow sudo cmmands in shell files

* Load nvm

* Remove verbose flag from scripts

* Remove command-trace-print flag

* Change to build dir in before script

* Add absolute path for scripts

* Fix tests

* Fix typo

* Fix codacy
- fixes - "echo won't expand escape sequences." warning

* Append (_) underscore instead of 'd' for db_name

* Remove printf and use mysql execute flag
2018-09-21 10:20:48 +05:30
Faris Ansari
c2ccc9886c
Merge pull request #6091 from netchampfaris/img-screenshot
fix(md_to_html): Add class screenshot to img elements
2018-09-14 14:44:30 +05:30
Faris Ansari
e8eb44c299
fix(change log): Import subprocess (#6093)
* fix(change log): Import subprocess

* fix: Ignore subprocess warning
2018-09-14 14:43:26 +05:30
Faris Ansari
e7c79b713e fix(md_to_html): Add class screenshot to img elements 2018-09-14 11:05:12 +05:30
Saurabh
3e7b387a7a [resolved] merge-conflicts 2018-09-12 14:52:46 +05:30
Rohit Waghchaure
5f4432a343 [Fix] Change Log 2018-09-10 13:21:02 +05:30
Saurabh
d2ce42fce4
Merge pull request #6060 from saurabh6790/get_app_version_and_branch_info
[enhance] in get_app_info return application branch and branch version if exists
2018-09-07 18:35:07 +05:30
Saurabh
dbb7ecb7fe [fix] check for developer mode before adding port to URL 2018-09-07 13:23:17 +05:30
Saurabh
371d7f87a9 [enhance] in get_app_info return application branch and branch version if exists 2018-09-06 17:41:26 +05:30
Chinmay Pai
8943f6cfd5
file-api: migration improvements and fixes
* migrate more functions to file class
* add get_content(), returns file content from file_name
* move get_file_path() to get_full_path() to decrease naming ambiguity

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
2018-09-06 17:30:33 +05:30
Chinmay Pai
6eca292e1a
[3/3] file-api: code migration
migrate api from file_manager.py to file.py

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
2018-09-06 01:18:21 +05:30
Ameya Shenoy
840f05054d
update-info: put json in redis, and generate message at user end 2018-09-05 14:32:52 +00:00
Faris Ansari
73c7984fcd fix: frappe.utils.get_url 2018-09-05 14:06:43 +05:30
Faris Ansari
0fcc0c9b89
Add only System Managers to update-user-set 2018-09-05 13:36:56 +05:30
Chinmay Pai
22ba310aaf
[2/3] file-api: code migration
migrate api from file_manager.py to file.py

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
2018-09-03 18:04:45 +05:30
Benji
8ef433ef45 Add safe_div() (#6006)
* Update receive.py

* Update receive.py

* Update receive.py

* Added safemath_div()

* Update data.py

* style: fix trailing whitespace
2018-09-03 10:59:23 +05:30
Faris Ansari
505a55474a feat: Add is_subset utility 2018-09-01 22:44:31 +05:30
Chinmay Pai
16a99f5472
[1/3] file-api: code migration
migrate api from file_manager.py to file.py

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
2018-08-31 01:55:15 +05:30
Faris Ansari
3838247f4d
Merge branch 'develop' into async-keyword-fix 2018-08-28 18:47:17 +05:30
Faris Ansari
116a0bc99c fix(async): Pass async param using dict 2018-08-28 18:45:56 +05:30
Aditya Hase
f3b959b1fe frappe: refactor async to realtime (#6015)
* frappe: refactor async to realtime

* frappe: refactor async to is_async
2018-08-28 15:31:20 +05:30
Rushabh Mehta
ad9ce8a3a3 fix(test): test_scheduler.py 2018-08-27 11:20:25 +05:30
Ameya Shenoy
a4f3ba6d99
translated strings and removed admin upgrade message 2018-08-24 11:38:37 +00:00
Ameya Shenoy
c60e976fdc
Merge pull request #5992 from codingCoffee/print
[feature] print multiple docs from multiple doctypes
2018-08-24 08:26:15 +00:00
Ameya Shenoy
8776376c13
multi fixes
- [fix] removed _ as a variable since it is used in translations
- linting fixes
- added error logging for permission errors
2018-08-23 10:47:01 +00:00
Benji
e166817c3c minor bugfix python 3 (#5997)
bugfix
2018-08-22 10:58:34 +05:30
Ameya Shenoy
65e96ff7a4 added docstring to download multi pdf
- also made the PDF name as a parameter which is passed by the user
2018-08-21 14:59:47 +05:30
rohitwaghchaure
a5d7182817 [Fix] Ascii code issue while downloading report (#5990) 2018-08-21 11:21:40 +05:30
Ameya Shenoy
b944fcfdb5
[minor] pop up shown to system managers and functionified code 2018-08-20 21:18:09 +00:00
Ameya Shenoy
4504bc1ebc
[feature] print multiple docs from multiple doctypes 2018-08-20 18:57:59 +00:00
Zarrar
c5ffec6c69 fix argument pass to class (#5989) 2018-08-20 12:38:10 +05:30
Himanshu Mishra
10361383c1 [fix]: use is_async in background jobs instead of async (#5986) 2018-08-20 10:36:26 +05:30
rohitwaghchaure
d13afe3e79
Merge pull request #5980 from rohitwaghchaure/download_report_not_working
[Fix] Download report not working
2018-08-17 13:22:17 +05:30
Rohit Waghchaure
c197ae6278 [Fix] Download report not working 2018-08-17 11:10:51 +05:30
Ameya Shenoy
5cee74e8db
python 2/3 fixes 2018-08-16 12:28:59 +00:00
Ameya Shenoy
21bbbd2dbb
[feature] show popup for version update
- added a new weekly hook to check if new version update is available
- added function to desk.js to show popup in case a new version is
available
- added redis wrappers for set related commands, namely sadd, srem,
sismember, spop, srandmember, smembers
2018-08-15 20:34:48 +00:00
Prateeksha Singh
d0a1565aa8 [csv-utils] don't decode when you've encoded special chars (#5970)
* [csv-utils] don't decode when you've encoded special chars

* Update csvutils.py
2018-08-15 11:25:56 +05:30
sivankar
a48b76b940 refactored code to add support in filters to get descendant or ancest… (#5847)
* refactored code to add support in filters to get descendant or ancestor for tree type documents

* added semicolon and comments to imporve code quality

* refactored code to add not ancestor and not descendants of filters

* added test cases for ancestors of and descendants of

* Translate labels
2018-08-14 12:19:18 +05:30
Prateeksha Singh
213279ec87
Merge pull request #5783 from szuyxy/global_search_support_and
[Enhance] Global search multi key words to pin point search result
2018-08-14 12:09:29 +05:30
Ameya Shenoy
5013405f45
Merge pull request #5748 from mhbu50/print_server
Print with Print server (CUPS)
2018-08-09 16:06:18 +05:30
Rushabh Mehta
e7c8b0c138 optimize(various): optimize with frappe.get_cached_value 2018-08-08 16:33:40 +05:30
Faris Ansari
b629080184 fix(email html): Allow pre and code tags in email html (#5929) 2018-08-07 14:43:07 +05:30
Ameya Shenoy
d5aec6e80c
Merge pull request #5925 from netchampfaris/md_to_html
Add utility frappe.utils.md_to_html
2018-08-06 16:10:20 +05:30
Faris Ansari
0a6deadc91 fix(syntax highlighting): Better syntax highlighting
- Update markdown2 to 2.3.5
- Only load syntax files for languages we support
- Enable highlightjs-lang extra to add class to code blocks
2018-08-05 20:04:13 +05:30