Commit graph

115 commits

Author SHA1 Message Date
Faris Ansari
5345d4ce7b Merge branch 'develop' of https://github.com/frappe/frappe into print-format-builder-beta 2021-10-20 18:40:18 +05:30
Faris Ansari
18b3651b46 feat: Google font selection
google_fonts.json with a decent selection of fonts
2021-10-20 17:20:59 +05:30
Gavin D'souza
3ae80af2c4 chore: Drop unmaintained sample config file
Use https://frappeframework.com/docs/user/en/basics/site_config for
reference instead
2021-09-13 15:17:39 +05:30
barredterra
80c75d9806 feat: option to anonymize ip for google analytics 2020-09-28 19:04:09 +02:00
Frappe Bot
d2c652ef3a Merge branch 'staging' into develop 2018-12-19 06:30:46 +00:00
Frappe Bot
395972bf0b Merge branch 'master' into staging-fixes 2018-12-19 06:26:37 +00:00
khushalti
0367fe3025 [Fix] - Corrected json format (#6621) 2018-12-18 08:56:37 +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
Stavros Anastasiadis
9607b336a4 Select fields to allow in quick entry (#5461) 2018-05-22 11:49:32 +05:30
Tom Price
e641ae70bd Migrate password hashing away from mysql password()
This is deprecated and needs to be replaced. 
Use passlib to hash, store, verify and upgrade as necessary.
Includes patch to migrate existing passwords in a non-breaking way.

Fixes #5195
2018-04-09 12:26:48 +01:00
tundebabzy
672b0dffc7 fix translatable docfields (#5041) 2018-02-21 11:04:38 +05:30
KanchanChauhan
43cdb2104d Define Icon and color in doctype (#4909) 2018-02-07 11:04:36 +05:30
Rushabh Mehta
45e1649340 [fix] add restrict_to_domain in Framework.sql 2017-09-22 14:50:02 +05:30
Rushabh Mehta
6dff729d88 [enhance] Web View settings in DocType (#2798)
* [enhance] add web view settings doctype

* [enhance] add web view settings doctype

* [fix] default for checks (?)

* [fix] framework json

* [fix] missing return

* [fix] hooks for website_generators
2017-03-05 11:12:32 +05:30
Rushabh Mehta
86ceb21005 [feature] Global Search (again) (#2710)
* [start] global search frappe/erpnext#6674

* [fix] setup before running test

* [start] global search frappe/erpnext#6674

* Display result as rudimentary list, rebuild old doctypes

* Media view, child tables, delete document updates, searchable fields

* More results UI

* Code clean up

* remove msgprint from document.py to resolve merge conflict

* Modularization stage 1, get show more to work with it

* Dedicated modal Search bar works, some clean up needed

* Can't data-dismiss on links, Bootstrap issue, use hashchange

* Accomodate missing field content syndrome

* Search in boolean mode, make GS default in awesome bar, fix double modal bug and cleanup

* Add in Meta

* Add in customize form

* Modularise Global Search

* Search object

* Commonify Search UI: Stage I

* II: save list state, UI, default condensed view, refactor

* Fix SQL bug, Refactor awesome bar, Fix unicode bug, add nav results

* Refactor using separate search objects, some async issues

* Fix async flow

* Fix preceding more list bug

* UI additions

* another async fix, back link

* Help: Stage I

* Help: Stage II

* Background jobs, fix route options bug

* Fix GS syncing on install

* Add GS options in awesome bar: test

* Input now remembers search type state

* More UI updates

* Add description for GS results in awesome bar

* Fix help modal bug

* Fix: not commit during install

* Test cases, some fixes

* Update in_test flag in enqueue

* Disable GS sync when not install_db

* Add flag check

* Disable field in child tables

* Cleanups

* Create table fix

* Fix redis exception, remove commit enqueue, add gs in migrate

* Fix tests

* Single enqueue

* cleanups

* Fix tests

* Fix event test

* Fix duplication, search as first option

* Add show name in global search

* fix event tests and desk.less

* Fix communication.json

* [fixes] wip

* [fix] tests

* [minor] for tests

* [minor] for tests

* [minor] for tests

* [minor] for tests
2017-02-13 14:50:54 +05:30
Rushabh Mehta
e329962756 [minor] remove in_fitler, fixes #7381 (#2649) 2017-01-30 15:30:44 +05:30
Rushabh Mehta
3f91c9455f [enhance] custom perms 2017-01-11 17:34:55 +05:30
Rushabh Mehta
d989a95472 [feature] document versioning #2469 (#2523)
* [feature] document versioning #2469

* [minor] remove on_update from WebsiteGenerator

* [fix] delete shares when deleting user

* [test] don't run delete in background if test

* [fix] test_db

* [added] Deleted Document

* [fix] added track_changes in all documents

* [fix] add to deleted only if exists

* [fix] in_install flag in deleted documents

* [minor] name will always be reset
2016-12-29 18:01:42 +05:30
Rushabh Mehta
63b26b0fad [minor] added "Remove app" and updated app list, fixes #1558 2016-12-27 13:23:11 +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
342e3ec10a Merge branch 'master' into develop 2016-11-14 17:39:07 +05:30
Nabin Hait
bfecd424c1 Delete paypal_integration.json 2016-11-14 13:17:57 +05:30
Nabin Hait
c41ef2de2d Delete razorpay_integration.json 2016-11-14 13:17:47 +05:30
Rushabh Mehta
8f6d3d9a11 [fix] in_standard_filter should be in docfield, not doctype 2016-10-26 19:33:04 +05:30
Rushabh Mehta
424f99e6f3 [cleanup] dashboard filters 2016-10-26 19:33:04 +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
d0aecc0be6 [fix] print report issue 2016-09-29 17:44:50 +05:30
Nabin Hait
bfea7f687b Fixed version conflict 2016-09-21 13:09:01 +05:30
shreyas
7aceb2f37d [Minor] Added Civil contracting to app listing to allow installations 2016-09-20 16:57:09 +05:30
KanchanChauhan
9590ec546f Added columns field to grid (#1998) 2016-08-23 16:47:51 +05:30
Rushabh Mehta
f30a6b8360 [refactor] Language is now a doctype (#2003) 2016-08-23 16:38:03 +05:30
Nabin Hait
e9336c4d6d Merge pull request #1990 from strixaluco/patch-1
[minor] Paypal app title typo fix
2016-08-18 14:22:43 +05:30
strixaluco
b28bed12c3 [minor] Razorpay app title typo fix
"app_title": "Razorpay Integation" → "app_title": "Razorpay Integration"
2016-08-18 10:45:07 +08:00
strixaluco
906f8fcdaa [minor] Paypal app title typo fix
"app_title": "Paypal Integation" → "app_title": "Paypal Integration",
2016-08-18 10:43:53 +08:00
sbkolate
e297dcd9c1 Updated limits
Updated limits from following link
https://frappe.github.io/frappe/user/en/bench/guides/settings-limits
2016-08-09 11:33:03 +05:30
Rushabh Mehta
c10d7ec8cb [minor] add quick_entry and added icelandic language 2016-07-25 15:03:26 +05:30
Rushabh Mehta
104df66ab4 [editable fields] now configable and customizable 2016-07-08 14:33:29 +05:30
Saurabh
1c6b04c611 [enhance] razorpay integration app listing 2016-06-28 15:03:45 +05:30
Anand Doshi
526e9ea2d7 [security] encrypt passwords that need to be retrievable, except User password which should be hashed 2016-06-13 17:18:59 +05:30
Rushabh Mehta
8092f4a031 [minor] style fixes for image view 2016-06-08 16:26:59 +05:30
Rushabh Mehta
faf45e4811 [fix] double child table bug and added beta in doctype 2016-05-02 18:43:32 +05:30
Rushabh Mehta
d0d1c9094e Merge pull request #1659 from semilimes/sendgrid_integration
[enhancement] SendGrid Integration app added to app listing
2016-05-02 13:33:23 +05:30
Rushabh Mehta
90fb3ebcb9 [enhancement] added image_field so image will appear in the sidebar 2016-04-04 16:56:35 +05:30
Alex Melkoff
3a4de08a00 [enhancement] SendGrid Integration app added to app listing 2016-03-30 14:31:40 +08:00
Rushabh Mehta
d029eae1f7 [enhancement] added feature to track user seen, fixes #1648 2016-03-25 16:27:31 +05:30
Rushabh Mehta
a7407e2f3f [minor] [apps] set as featured 2016-02-29 14:45:59 +05:30
Rushabh Mehta
c4549468d3 [app] added paypal_integration to app listing 2016-02-29 12:24:05 +05:30
Anand Doshi
85546d7359 [fix] always set timeline doc on update 2016-02-16 12:27:53 +05:30
Anand Doshi
3445303f1d [language] Added Estonian, Telugu and Urdu. Fixes frappe/translator#64 and frappe/translator#66 2016-01-27 12:34:48 +05:30
Anand Doshi
6e7ac2339e [translations] + added Gujarati - Fixes frappe/translator#63 2015-12-21 17:09:56 +05:30