Commit graph

864 commits

Author SHA1 Message Date
Faris Ansari
17e2ea2cc5 fix: Cleanup Blog, List, Comment templates for Bootstrap 4
- Bootstrap 4 class migration
2019-01-15 09:54:05 +05:30
Faris Ansari
a171aa33f8 fix: Modal primary button 2019-01-02 23:10:37 +05:30
Faris Ansari
8641383ed1 Merge branch 'develop' of https://github.com/frappe/frappe into website-bootstrap-4 2018-12-26 19:51:35 +05:30
Frappe Bot
0499b4a845 Merge branch 'staging' into develop 2018-12-26 12:03:03 +00:00
Suraj Shetty
45911faa23
Merge branch 'staging-fixes' into staging-fixes 2018-12-18 15:26:11 +05:30
Saurabh
2de5dfdbb3 Merge branch 'staging' into develop 2018-12-18 10:20:24 +05:30
Faris Ansari
d6833996d3 fix: Include meta_block in Web Page (#6627) 2018-12-17 13:55:32 +05:30
Faris Ansari
727e24fbb6 feat: Add metatags on every webpage
- Add keywords field in Web Page for SEO
2018-12-14 10:55:11 +05:30
Faris Ansari
5cb91ae57b Merge branch 'develop' of https://github.com/frappe/frappe into website-bootstrap-4 2018-12-14 10:07:15 +05:30
Suraj Shetty
9a0ff3bad0 Merge branch 'staging-fixes' of https://github.com/frappe/frappe into staging-fixes 2018-12-10 16:27:00 +05:30
Frappe Bot
b2779c617a Merge branch 'staging' into develop 2018-12-06 09:31:40 +00:00
Frappe Bot
b39bbe9baf Merge branch 'master' into staging-fixes 2018-12-06 09:09:06 +00:00
Saif
7610d6fb05 WebsiteGenerator call super class clear_cache (#6542) 2018-12-03 09:35:03 +05:30
Aditya Hase
e3ae0722c4 fix(security): Make Jinja tighter (#6564) 2018-11-29 17:24:46 +05:30
rohitwaghchaure
1cb64cf06e fix: Web form grid view for Text Editor showing toolbar (#6547) 2018-11-28 10:14:11 +05:30
Suraj Shetty
e79cfc531a Merge branch 'staging-fixes' of https://github.com/frappe/frappe into staging-fixes 2018-11-21 13:18:33 +05:30
Frappe Bot
4426a321e4 Merge branch 'staging' into develop 2018-11-15 09:16:23 +00:00
Aditya Hase
2858118f91 fix(chat): Setup and render chat on website pages as well 2018-11-13 12:48:26 +05:30
Faris Ansari
68a7b81374 feat: Migrate Website to Bootstrap 4
- Use bootstrap 4 base for website assets
- hooks.py: Remove bootstrap hook
- Upgrade navbar, breadcrumbs to 4
- Support multi-level dropdown

BREAKING CHANGE
2018-11-12 18:09:59 +05:30
Ameya Shenoy
d0e7690ae2
Merge branch 'staging' into develop 2018-11-05 06:48:46 +00:00
Suraj Shetty
1d0037d9b1 Fix codacy 2018-11-05 10:39:28 +05:30
Suraj Shetty
4b0f78a6d5 Add test to check contextual user permission 2018-11-01 21:18:15 +05:30
Faris Ansari
10c2e8f262 fix: Only allow images in Attach Image 2018-11-01 19:38:07 +05:30
Nabin Hait
d37d111f61 Fixed merge conflict 2018-10-15 15:53:26 +05:30
Nabin Hait
b218a16dc3 fix(name): naming of workflow action based on hash 2018-10-15 14:21:40 +05:30
Zlash65
b3865174e4 add an option to route to success message for logged in user 2018-10-10 18:19:07 +05:30
agustincl
899b5d4d0f Update Web Form header buttons (#6190)
The headers buttons needs to have absolute path in order to function, otherwise the pathname and the route is concatenated.
2018-10-05 11:26:01 +05:30
Prateeksha Singh
bcef7b8ef3
Merge pull request #6089 from jodeq/view-attachments-in-web-form
[Proposal] View attachments in Web Form
2018-09-26 00:16:51 +05:30
Mohamed_Alsum
97fb641583 Fix webform error while loading (#6134)
* remove dublicate error mgs on submit web_form

* show side-bar in RTL lang

* fix webfrom success msg
2018-09-25 21:58:55 +05:30
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
Govind S Menokee
e6d5a61186 [FIX] Slideshow images should be a list but instead map object is being passed (#6103)
Files should be passed as a list. Here it is being passed as a map object.
2018-09-24 12:45:55 +05:30
Chinmay Pai
6e84bbe80d
Merge branch 'develop' into file-api 2018-09-21 13:42:32 +05:30
Chinmay Pai
75c7992557
file-api: add new test, fix minor bugs and code indentation
Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
2018-09-21 13:40:25 +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
Prateeksha Singh
168addbfb2 [webform] allow_read to bypass permissions on Link options 2018-09-20 10:32:20 +05:30
JodeQ
43a98fbd60 View attachments in Web Form 2018-09-13 22:52:15 +02:00
Chinmay Pai
5bd66f134d
file-api: add improvements to save() api
file can now be saved by calling save() on the file object instance

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
2018-09-13 09:46:48 +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
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
Ameya Shenoy
6221bf2f15
web_form_class: using value instead of get_value 2018-08-31 10:12:26 +00:00
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
Ameya Shenoy
a302501752
webform: render image in web form using setTimeout 2018-08-30 14:03:47 +00:00
Chinmay Pai
ff03d8d0fe
file-api: major refactor
migrate from file_manager.py to file.py

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
2018-08-30 18:02:59 +05:30
Ameya Shenoy
6ebc9581fc
grid_list: fixed event binding on paging 2018-08-27 11:04:19 +00:00
Faris Ansari
aeed1979f6 Portal list filters (#6007)
* Add list filters in portal

* Show label on input
2018-08-24 15:14:31 +05:30
Prateeksha Singh
9f04cfc968 [webform][attachments] allow saving filename, insert file path later 2018-08-23 10:03:28 +05:30
Mohamed_Alsum
893b7e0980 remove duplicate error mgs on submit web_form (#5972)
* remove dublicate error mgs on submit web_form

* show side-bar in RTL lang
2018-08-20 10:39:54 +05:30
Ameya Shenoy
2d62d12521
Merge pull request #5979 from pratu16x7/webform-delete
[webform-list] add delete multiple to list table
2018-08-17 11:29:08 +05:30
Prateeksha Singh
23ca07769d [webform-list] add delete multiple to list table 2018-08-17 11:27:24 +05:30
Ameya Shenoy
e0853af409 web form allow others 2018-08-16 13:45:05 +05:30