Commit graph

16668 commits

Author SHA1 Message Date
Ameya Shenoy
ffcc3fc838
Merge branch 'staging' into develop 2018-09-21 10:59:49 +00:00
Ameya Shenoy
86bd7df010
Merge branch 'staging-fixes' into staging 2018-09-21 10:59:46 +00:00
Ameya Shenoy
ea082ce8a3 bumped to version 11.0.2 2018-09-21 10:59:46 +00:00
Ameya Shenoy
d55ce6ab05
Merge pull request #6125 from codingCoffee/soc_login
fix(patch): refactor social login keys
2018-09-21 16:08:36 +05:30
Ameya Shenoy
24e0a69ed9
Merge pull request #6126 from codingCoffee/bleach
fix(dependencies): locked down bleach to 2.1.4
2018-09-21 16:08:12 +05:30
Ameya Shenoy
dc983f49c6
fix(patch): refactor social login keys
escaped special characters in query

Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
2018-09-21 15:45:21 +05:30
Ameya Shenoy
95c80eb4a5
fix(dependencies): locked down bleach to 2.1.4
bleach.clean used in html_utils depends on the latest version of bleach

Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
2018-09-21 15:42:47 +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
Ameya Shenoy
ecd61baf0a
Merge branch 'staging' into develop 2018-09-20 10:23:24 +00:00
Ameya Shenoy
651df31590
Merge branch 'staging-fixes' into staging 2018-09-20 10:23:18 +00:00
Ameya Shenoy
fc805699b6 bumped to version 11.0.1 2018-09-20 10:23:18 +00:00
Ameya Shenoy
f5ff6ad701
Merge pull request #6116 from codingCoffee/permhook
fix(hooks.py): changed permissions to 664
2018-09-20 15:51:52 +05:30
Ameya Shenoy
76761749ff
fix(hooks.py): changed permissions to 644
Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
2018-09-20 15:51:12 +05:30
Saurabh
aaebe0bce1 Merge branch 'master' into staging-fixes 2018-09-20 13:16:25 +05:30
Saurabh
022ea5d20c Merge branch 'master' into develop 2018-09-20 13:16:24 +05:30
Saurabh
087562fc56 Merge branch 'hotfix' 2018-09-20 13:16:23 +05:30
Saurabh
acfdc5a0f3 bumped to version 10.1.48 2018-09-20 13:46:23 +06:00
Nabin Hait
bf71d5dbaf Merge branch 'develop' into staging-fixes 2018-09-20 12:50:33 +05:30
Faris Ansari
8df1b38f77
Merge pull request #6105 from netchampfaris/keyed-translation-fixes
fix(translations): Replace translations by keyword with indexed version
2018-09-20 11:25:37 +05:30
Faris Ansari
162f1012f8
Merge pull request #6109 from rohitwaghchaure/fix_case_sensitive_for_options
[Fix] Case sensitive for the doctype name in the options
2018-09-20 11:25:10 +05:30
Faris Ansari
ae7e71e0e9
Merge pull request #6110 from netchampfaris/listview-filters-fix
fix(filters): Allow filter on same field multiple times
2018-09-20 11:25:02 +05:30
Faris Ansari
f2cb9827eb
Merge pull request #6106 from netchampfaris/list-view-fixes
fix(list view): Remove list items that should not be visible
2018-09-20 11:24:47 +05:30
Prateeksha Singh
ffc0f05ea8
Merge pull request #6114 from pratu16x7/webform-link-field
[webform] allow_read to bypass permissions on Link options
2018-09-20 10:33:23 +05:30
Prateeksha Singh
168addbfb2 [webform] allow_read to bypass permissions on Link options 2018-09-20 10:32:20 +05:30
Faris Ansari
bdeae00a6e fix(filters): Allow filter on same field multiple times 2018-09-19 17:46:04 +05:30
Rohit Waghchaure
06566e5036 [Fix] Case sensitive for the doctype name in the options 2018-09-19 16:39:59 +05:30
Faris Ansari
525c09b005 fix(list view): Remove list items that should not be visible
When some docs are updated, the list view is refreshed realtime,
but old docs that should not visible remains.
2018-09-18 12:45:30 +05:30
Faris Ansari
89d56e4de1 fix(translations): Replace translations by keyword with indexed version
Keywords in the translation also gets translated which
results in an error because python cannot find the key
2018-09-18 11:55:10 +05:30
Nabin Hait
48e18a11fd Merge branch 'staging' into develop 2018-09-18 11:47:06 +05:30
Frappe PR Bot
76d8ebdf3c [Translation] Updated Translations (#6100) 2018-09-17 15:59:27 +05:30
Prateeksha Singh
afa8ae0e65
remove patch step 2018-09-16 16:03:21 +05:30
Aditya Hase
768f28f5a2 Report coverage on unexecuted files as well
keyword argument `include` doesn't seem to report on unexecuted files
coverage.py documentation claims using `source` instead will do just that
2018-09-14 17:07:23 +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
Fisher Yu
bdbf604317 Update table.js (#6072)
Allow directly copy tab delimited multi records from Excel or text files, paste directly to the child table
2018-09-12 22:25:42 +05:30
Nabin Hait
b4c063e96c fix(syntax): rollup config 2018-09-12 18:13:55 +05:30
Nabin Hait
77999e13ae Merge branch 'staging' into develop 2018-09-12 17:44:52 +05:30
Nabin Hait
30abaa4f8a feat(test runner): break run-tests on first error 2018-09-12 17:44:44 +05:30
Nabin Hait
ff343d577c Merge branch 'staging-fixes' into staging 2018-09-12 17:44:24 +05:30
Faris Ansari
568289ba6b
Merge pull request #6076 from chdecultot/auto_repeat_improvements
Auto repeat improvements
2018-09-12 17:22:17 +05:30
Faris Ansari
64d8bff387 fix(ux): Merge notification and message section 2018-09-12 17:18:59 +05:30
Nabin Hait
696d209ae4 Merge branch 'develop' into staging 2018-09-12 17:16:18 +05:30
Nabin Hait
3729562358 feat(test runner): break run-tests on first error 2018-09-12 17:16:02 +05:30
Ameya Shenoy
460329770e
Merge pull request #6081 from rohitwaghchaure/permission_issue_v10_for_permlevel_1
Permlevel 1 fields are not visible to the users after submission of the document
2018-09-12 17:03:03 +05:30
Ameya Shenoy
3fd4e20926
Merge pull request #6052 from Alchez/hotfix-gmaps-client
Check if Google Maps is enabled when trying to get the client
2018-09-12 16:45:52 +05:30
Ameya Shenoy
61f4015599
Merge pull request #6079 from netchampfaris/rollup-import-feat
feat(rollup): Ability to import assets from any app
2018-09-12 16:25:42 +05:30
Faris Ansari
a69d44c720
Merge pull request #6073 from codingCoffee/email
email: fix track_email_status not working
2018-09-12 16:19:48 +05:30
Faris Ansari
18787a5709
Merge pull request #6078 from frappe/adityahase-coverage-badge
Add coverage badge to README.md
2018-09-12 16:17:20 +05:30
Charles-Henri Decultot
24a1003f22 Smallest currency fraction for EUR (#6077) 2018-09-12 15:51:03 +05:30