Commit graph

63 commits

Author SHA1 Message Date
Rushabh Mehta
ae097e5139 fix: tests, check for spam comments 2019-02-07 16:35:50 +05:30
Rushabh Mehta
41d90fa6d1 BREAKING CHANGE: Comments are now handled separately from Communication and Version 2019-02-07 16:35:50 +05:30
Rushabh Mehta
65d2167551 feat: various fixes to Web Form and content type selection for Web Page and Blog Post 2019-02-06 15:50:57 +05:30
Rushabh Mehta
f537d75946
feat: Allow website templates to have different base templates (#6811)
* feat: Allow website templates to have different base templates

* test: custom base template
2019-01-27 20:46:23 +05:30
Rushabh Mehta
b66d233360 merge: staging-fixes for latest test fixes 2019-01-03 15:28:36 +05:30
Shivam Mishra
b86663490c [Base 64 Fix]: Added check for base64 image in abs_url (#6688)
* [Base 64 Fix]: Added check for base64 image in abs_url

The abs_url filter used in website appends a '/' before every link.
This broke the website image display.

* fix(abs_url): add check for all image types

* Update utils.py
2019-01-02 09:11:05 +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
Achilles Rasquinha
c0f674f5e5 cmp alternative 2018-03-08 11:49:31 +05:30
Achilles Rasquinha
798228fce5 [min] import functools 2018-02-28 12:57:46 +05:30
Achilles Rasquinha
cbc8831add sort using cmp_to_key 2018-02-28 12:38:19 +05:30
Aditya Hase
52c7b04932 Use next(iter) instead of iter.next() 2017-09-27 01:08:07 +05:30
Rushabh Mehta
bc4d46a362 [fix] style and move setup to system settings 2017-08-08 14:29:22 +05:30
Aditya Hase
62bb03ef6e Replaced Python 2 print syntax with Python 3 syntax (#3838)
* Replaced Python 2 print syntax with Python 3 syntax

* Update utils.py
2017-08-02 17:10:40 +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
tundebabzy
bbde2ec4cf rewrite use of dict.iteritems (#3498)
* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility
2017-06-19 09:10:21 +05:30
Rushabh Mehta
6bac96704c [minor] better title extraction for web page 2017-01-04 12:34:44 +05:30
Rushabh Mehta
3c7c17215d [fix] fix toc for docs, url for local and other fixes #2293 (#2346) 2016-11-21 16:43:16 +05:30
Dony Sukardi
2dedc9a3de Fix for Documentation
The following issues are addressed in this commit:
- Synchronize CSS with the layout changes in Docs
- Hide 'Shopping Cart' on Docs pages
- Load Frappe context for Jinja
- Fix for 'Improve this page' link
- Get title for ToC from .md files
- Fix for non-pages child routes
2016-07-12 03:16:05 +08:00
Rushabh Mehta
349a65402f [website] fixes for generating docs 2016-06-23 18:22:03 +05:30
Rushabh Mehta
47005e9e02 [fix] parent_website_route + '/' + page_name = route 2016-06-23 15:47:47 +05:30
Anand Doshi
8df1c36a17 Merge pull request #1784 from vjFaLk/frappe-limits
[WIP] Move Frappe subscription features to Frappe App as Limits
2016-06-13 12:21:20 +05:30
shreyas
9511e14353 Move Frappe subscription features to Frappe App as Limits 2016-06-10 16:34:53 +05:30
Rushabh Mehta
9e008ce1ca [fix] add communication in comments, fixes frappe/erpnext#5450 2016-06-08 15:29:00 +05:30
Rushabh Mehta
6824df7ac9 [cleanup] rename functions in website and router for cleaner meaning 2016-05-29 14:25:49 +05:30
Rushabh Mehta
e7e7f0e218 [optimize] index tabcommunication based on modified and creation 2016-05-20 11:20:37 +05:30
Rushabh Mehta
1e235afdb5 [minor] [website] page_name set to max 140 chars 2016-02-11 12:38:27 +05:30
Anand Doshi
465318878e [enhancement] Merge Comment and Feed into Communication 💥 2016-02-04 17:46:53 +05:30
Rushabh Mehta
9e2ba37823 [minor] add hook for website user home page by function 2016-01-25 15:10:44 +05:30
Rushabh Mehta
eac452a926 [cleanup] web templates, now using standard jinja architecture and removed push-state 2016-01-01 17:49:25 +05:30
Rushabh Mehta
02f39bf71a [docs] added docs first-cut 2015-10-29 18:46:04 +05:30
Rushabh Mehta
e95b72665f [fixes] [style] for docs and fix to web form 2015-10-28 15:11:40 +05:30
Rushabh Mehta
0194fa099f [fixes] table of contents 2015-10-27 10:57:26 +05:30
Rushabh Mehta
2a7fa0f065 [fix] more style, navigation fixes, added TOC 2015-10-27 10:57:26 +05:30
Rushabh Mehta
17c270fb67 [setup-docs] generate docs and static pages 2015-10-27 10:57:25 +05:30
Anand Doshi
9b5811ea35 [fix] return title if missing in cleanup_page_name 2015-10-19 16:56:00 +05:30
Pratik Vyas
58b97794ec [fix] abs_path 2015-06-03 17:30:18 +05:30
Pratik Vyas
dccebf938a [hotfix] revert abs_url 2015-06-01 17:01:10 +05:30
Anand Doshi
78b1e72633 [fix] replace filter with_leading_slash with abs_url, ensures consistent urls by changing relative to absolute urls wherever the filter is used 2015-05-29 14:30:15 -04:00
Rushabh Mehta
ad100e3054 [cache] fix for website, default, meta, etc 2015-05-08 18:04:13 +05:30
Anand Doshi
95abc4753d removed scrub_relative_urls—now we can have relative urls! 2015-04-24 13:15:47 -04:00
Nabin Hait
b4e69f48d3 fixed conflict 2015-04-21 16:43:23 +05:30
Anand Doshi
d783fb9942 fixed noto-sans errors and scrub_relative_urls 2015-04-14 12:32:52 -04:00
Rushabh Mehta
acc314d0ab [website] add full_index and list cleanups 2015-03-23 18:40:08 +05:30
Anand Doshi
9098041417 get home page of last app 2015-03-18 18:03:43 +05:30
Anand Doshi
5b4dceb6f7 [website] 2015-03-10 14:37:02 +05:30
Anand Doshi
2995f02f3b Web Notes to Frappe, better alerts, css fixes, fixed splash 2015-03-03 15:09:34 +05:30
Anand Doshi
7f75e233a8 Website Listing 2015-02-23 22:30:03 +05:30
Anand Doshi
50f2d1b5cd Website Offcanvas Sidebar 2015-02-23 22:13:39 +05:30
Anand Doshi
a1290bbdab Website Theme 2015-02-23 22:13:38 +05:30