vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
13155 commits 1 branch 0 tags 587 MiB
Commit graph

102 commits

Author SHA1 Message Date
felixvarghese
f189829240 Allow SSL connections to a remote database server (#3742) 
* Allow SSL connections to a remote database server

Add the following options in site_config.json to use ssl

- "db_ssl_ca" = "/path/to/ca/cert.pem"
- "db_ssl_cert" = "/path/to/ssl/cert.pem"
- "db_ssl_key" = "/path/to/ssl/key.pem"

The files mentioned should be stored on the App server in the location mentioned.

This commit allows for basic ssl connections. X509 is still not supported.

If the above options are not set, the connection will not use an encrypted connection, and connect normally.

* docs - Allow SSL to remote database host
 2017-07-20 18:00:02 +05:30
Rushabh Mehta
45cbb7facc [minor] cleanups and optimization fixes 2017-06-20 12:46:43 +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
Prateeksha Singh
d8fb2c2c0d [fix] Enqueue syncing global search (#3455) 
* [fix] Enqueue syncing global search

* make passing flags optional

* Create global_search.py
 2017-06-16 11:02:22 +05:30
tundebabzy
6fbe20caaa Except and raise statement python 3 compatible style (#3216) 
* changes exception and raise statements to python 3 style

* changes except statement to python 3 style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* adds six.reraise to fix python 3 style raise statements with traceback

* fixes indentation
 2017-05-11 10:51:59 +05:30
Rushabh Mehta
ba289eaa62 [minor] remove print 2017-03-15 15:31:16 +05:30
Rushabh Mehta
d453dea055 [minor] catch tag count exception for filters that include child tables 2017-03-15 15:02:08 +05:30
Rushabh Mehta
1e7229c45f [enhance] global search in website (#2810) 
* [enhance] global search in website

* [fix] create table query

* [website] navbar search in header if set

* [minor] navbar_search in website settings
 2017-03-07 16:37:50 +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
385da2b7b1 [check] use utf8mb4 as the connection charset 2017-01-30 14:15:44 +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
4bd2285159 File Based Locking at Document Level (#2374) 
* [redesign] improved locking in documents and redesigned recent documents

* [minor] patch to update doctype in existing documents
 2016-11-25 16:14:00 +05:30
robert schouten
aed15c02ae add order_by to get_value and document (#2357) 2016-11-22 22:15:13 +05:30
Rushabh Mehta
a099690e8f Revert "[optimize] remove count(*) from queries" (#2353) 2016-11-22 10:55:13 +05:30
Rushabh Mehta
0ff140fa2b [optimize] remove count(*) from queries 2016-11-21 14:58:18 +05:30
rohitwaghchaure
abc4996a20 Added docstring for get_single_value, get_singles_dict methods (#2292) 2016-11-19 13:02:49 +05:30
Rushabh Mehta
3b93e04887 [fix] frappe.db.set_value 2016-11-17 09:45:44 +05:30
Rushabh Mehta
9ef8f18fcf [fix] for tests, and db_set now accepts dict 2016-11-17 09:45:44 +05:30
Anand Doshi
f2a7ce3dc0 [fix] removed mysql auto-connect on 'mysql has gone away' 2016-07-14 14:38:26 +05:30
Anand Doshi
5feaf817db [fix] reconnect if mysql has gone away 2016-06-20 17:39:37 +05:30
Rushabh Mehta
c9f4a16893 [fix] [tests] 2016-03-31 12:21:20 +05:30
Rushabh Mehta
123842ffda [enhancement] edit-profile in frappe 2016-03-30 17:15:03 +05:30
Rushabh Mehta
c955e001b4 [fix] minor update realtime 2016-02-17 16:32:48 +05:30
Rushabh Mehta
e1ac647a13 [cleanup] system settings, added deny_multiple_sessions 2016-02-16 15:05:59 +05:30
Nabin Hait
930cd7d78e [fix] Get defaults based on doctype or fieldname 2015-12-23 16:34:43 +05:30
Anand Doshi
5572f24c5d [fix] A percentage in file name caused 404 error in case of private file while checking permissions 2015-12-21 15:44:50 +05:30
Anand Doshi
357e61f9d5 [fix] injection 2015-11-17 18:27:29 +05:30
Rushabh Mehta
d3dc9711f0 [enhancement] added **not like** in filter options 2015-11-05 11:18:15 +05:30
Cristi Harjoi
006a2a1754 [fix] database: escape percent sign in strings 2015-10-23 14:03:38 +03:00
Anand Doshi
ad493f7942 [fix] permission tests 2015-09-08 17:29:31 +05:30
Rushabh Mehta
22d3c513cc [minor] enhancements to frappe.db.get_single_value. Now cached and converted to integer for 0 and 1 2015-09-03 11:15:47 +05:30
Anand Doshi
9a9790a78c Merge branch 'commit-only-on-write' of https://github.com/rmehta/frappe into rmehta-commit-only-on-write 
Conflicts:
	frappe/website/doctype/web_page/web_page.json
 2015-08-17 14:14:10 +05:30
Anand Doshi
baec4f855f Change Check fields to have default as 0 (if not specified) and not null 2015-07-30 11:54:27 +05:30
Rushabh Mehta
1654c5b038 [minor] commit only if there were writes 2015-07-21 13:33:49 +05:30
Rushabh Mehta
562b1b2c50 [fixes] cleanup of web from, portal, login page 2015-06-01 17:14:53 +05:30
Pratik Vyas
c75bb40b3b Fix merge mistake 2015-05-19 12:51:47 +05:30
Pratik Vyas
136ec9e2c6 Merge branch 'develop' 2015-05-19 12:07:45 +05:30
Pratik Vyas
906c6c1990 Set multi statements to off 2015-05-13 11:20:36 +05:30
Pratik Vyas
11c8e3ee67 Set multi statements to off 2015-05-13 11:15:39 +05:30
Anand Doshi
c5c1b9d9dd [hotfix] use sqlparse to prevent multiple sql queries 2015-05-12 14:48:16 -07:00
Anand Doshi
50b80c89a2 [fix] use sqlparse to ensure only one query is executed in frappe.db.sql 2015-05-12 14:30:35 -07:00
Anand Doshi
3aacd3015f [hotfix] frappe.db.set_temp 2015-05-12 14:13:19 -07:00
Anand Doshi
6d16ba450f [hotfix] prevent multiple sql queries 2015-05-12 13:04:25 -07:00
Anand Doshi
5cdc71bae9 [hotfix] prevent multiple sql queries 2015-05-12 13:01:51 -07:00
Anand Doshi
47ec703fbc [hotfix] prevent multiple queries 2015-05-12 12:50:22 -07:00
Rushabh Mehta
ad100e3054 [cache] fix for website, default, meta, etc 2015-05-08 18:04:13 +05:30
Rushabh Mehta
eb21f50c0f [cleanup] frappe.get_user() 2015-05-01 10:33:23 +05:30
Rushabh Mehta
9334f91eb9 [fixes] added for update in document save to prevent double saving 2015-04-27 13:13:04 +05:30
Rushabh Mehta
b3e20f63b2 [enhancement] custom script fixtures via fixtures/custom_script 2015-04-20 12:46:44 +05:30
Anand Doshi
c0653c31fc [fix] timedelta to mysql time converter 2015-04-08 21:20:13 +05:30