Commit graph

16301 commits

Author SHA1 Message Date
Prateeksha Singh
158d324b76 [data-migration] Make Runs observable
- Allow Runs to execute a post-process specified in Migration Plan
2018-07-28 22:34:55 +05:30
Faris Ansari
1922dcc87f Add broken images handler (#5884)
- Also add flex-column class utility
2018-07-27 19:03:49 +05:30
Zarrar
88b659d3ac
Merge pull request #5880 from Zlash65/min-fix
[Minor] Default for items should be empty list
2018-07-27 13:12:55 +05:30
Zlash65
8d6aef871a minor fix 2018-07-27 13:06:42 +05:30
Zarrar
c0b7712b04 [Enhance] Add items to dashboard through client-side scripting (#5861)
* add items in dashboard as need be
- doctypes can be added throguh js side if needed

* refresh handles open count
2018-07-27 10:47:06 +05:30
Faris Ansari
737330247e [website] Load chat only if chat is enabled (#5874)
* [website] Load chat only if chat is enabled

* Update website.js
2018-07-27 10:43:35 +05:30
Prateeksha Singh
edde827a95
Merge pull request #5875 from shreyashah115/text-muted
Add text-muted property
2018-07-26 17:39:17 +05:30
Shreya
0057537f9b Add text-muted property 2018-07-26 17:30:20 +05:30
Saurabh
d46fd09b44 [WIP][Enhancement] Provision to pull reports from slave systems (#5844)
* [Enhancement] Provision to pull reports from slave systems

* [fix] check if master_db exists

* Pull list view from slave system
2018-07-24 17:42:21 +05:30
Rushabh Mehta
aef1046b1f
[email] remove style from email so it does not mess up desk (#5860)
* [email] remove style from email so it does not mess up desk

* [fix] tests

* [fix] image parsing, #savedbyatestcase

* [fix] timeout issues in test

* [fix] timeout issues in test
2018-07-24 17:00:14 +05:30
Fisher Yu
e7ddbb7c5e [bug fix] Label in dashboard.html not translated (#5859)
* Update translate.py

New label introduced via dashboard html template file can not be translated, because the logic to fetch to be translated label for the doctype does not include dashboard.html

* Update translate.py
2018-07-24 17:00:05 +05:30
Prateeksha Singh
0c5f5dcb92 [prepared-report] see if report took more than 10 seconds (#5864)
* [prepared-report] see if report took more than 10 seconds

* Update query_report.py

* Update query_report.py
2018-07-24 16:30:17 +05:30
Dominik Ottenbreit
feee6cc07e Create more clear docstring for trim_tables (#5863)
* Create more clear docstring for trim_tables

Current DocString was not clear enough. I updated the description to give background information on why this function may be needed.

* Update meta.py
2018-07-24 16:30:00 +05:30
Zarrar
3ee8f396c9 minor fix for translation check (#5866) 2018-07-24 16:28:35 +05:30
Nabin Hait
2b14116d83
Fixed webform perms and set defaults based on url params (#5856) 2018-07-24 11:06:04 +05:30
Rushabh Mehta
b8a936f998 [fix] [style] update-password.html 2018-07-24 10:58:17 +05:30
Faris Ansari
15482dce95 Factory: class.extend -> es6 class (#5857) 2018-07-24 10:39:40 +05:30
Prateeksha Singh
8b2aa69203 [prepared-report] show tabular filters (#5851)
* [prepared-report] show tabular filters

* [form] prepared report interaction updates

* [prepared-report] hide ref doctype
2018-07-24 10:36:59 +05:30
Prateeksha Singh
0d8b9c8653 Revert "Modules dropdown" (#5855)
* Revert "bench use <site> should check if the  site exists (#5849)"

This reverts commit 630858eb96.

* Revert "Add option to convert password to use ASCII instead of Unicode when needed by smtp server config (#5793)"

This reverts commit 191684f6a5.

* Revert "Token based authentication (#5752)"

This reverts commit abd3333bae.

* Revert "[minor] test fix"

This reverts commit b6ba3915a6.

* Revert "allow null when time field is not required (#5832)"

This reverts commit 803f6b0c7b.

* Revert "remove duplicate field entry for fieldname two_factor_authentication (#5846)"

This reverts commit 6a06e65d20.

* Revert "Query Report (#5845)"

This reverts commit f870a0bd25.

* Revert "Modules dropdown (#5767)"

This reverts commit 6f908b3443.
2018-07-23 15:34:34 +05:30
Shridhar Patil
630858eb96 bench use <site> should check if the site exists (#5849)
* bench use <site> should check if the  site exists

* check site path while running use site
2018-07-23 14:35:17 +05:30
IOWEB TECHNOLOGIES
191684f6a5 Add option to convert password to use ASCII instead of Unicode when needed by smtp server config (#5793) 2018-07-23 11:08:15 +05:30
Shridhar Patil
abd3333bae Token based authentication (#5752)
* token based authentication

* authentication

Basic base64encode(api_key:api_secret)
token api_key:api_secret

* test added

Validation: only user with system manager can generate the keys

* codacy issues fixed

* token based authentication

* authentication

Basic base64encode(api_key:api_secret)
token api_key:api_secret

* test added

Validation: only user with system manager can generate the keys

* codacy issues fixed

* use frappe.safe_encode

* base64 encode use frappe.safe_encode

* set frappe.local.form_dict after setting user

* removed test

* removed unused imports

* test for python 3

* Update user.js

* [user.py] throw correct error

* Update user.py
2018-07-23 11:06:29 +05:30
Rushabh Mehta
b6ba3915a6 [minor] test fix 2018-07-23 11:06:27 +05:30
Mohamed_Alsum
803f6b0c7b allow null when time field is not required (#5832)
* allow null when time field is not required

* Update base_document.py
2018-07-23 10:36:42 +05:30
schilgod
6a06e65d20 remove duplicate field entry for fieldname two_factor_authentication (#5846) 2018-07-23 10:35:51 +05:30
Faris Ansari
f870a0bd25
Query Report (#5845)
* Query Report

- Use report formatter if exists

* missing semicolon
2018-07-20 17:19:00 +05:30
Prateeksha Singh
6f908b3443 Modules dropdown (#5767)
* [modules-dropdown] init

* [modules-sidebar] setup structure

* [modules-sidebar] add chunks to group

* [modules-dropdown] ellipsis

* [move] help menu to explore menu

* merge help column to modules

* [modules-dropdown] get explore links from hooks

* [add] explore_link secondary

* [modules-dropdown] Places list

* [modules-dropdown] deprecate desk link, make icon dropdown

* [modules-dropdown] collapsible help menu

* [remove] global navbar icon style

* [boot] define core modules, use in dropdown

* [modules-dropdown] code style fixes
2018-07-19 18:06:37 +05:30
Prateeksha Singh
d38e5d51ad
Merge pull request #5841 from pratu16x7/help-fixes
[fix][help] image links
2018-07-19 14:52:43 +05:30
Prateeksha Singh
ac6f938cd9 [fix][help] image links 2018-07-19 14:50:55 +05:30
Rushabh Mehta
a62e783bc0 [fix] webform for list 2018-07-19 14:24:51 +05:30
Saurabh
6b0faa74f2
Merge pull request #5840 from saurabh6790/staging_version_1
Update staging version to support semantic versioning
2018-07-19 13:39:04 +05:30
Saurabh
96a15617dc Update staging version to support symentic versioning 2018-07-19 13:37:31 +05:30
Saurabh
aa83c64b5a [fix] resolved merge conflicts 2018-07-19 13:34:10 +05:30
Saurabh
b9fffc9914 Merge branch 'hotfix' 2018-07-19 13:33:07 +05:30
Saurabh
d53a5c04b0 bumped to version 10.1.42 2018-07-19 14:03:07 +06:00
Prateeksha Singh
f566850728
[help] revert assets path, fix broken images 2018-07-19 13:10:34 +05:30
Charles-Henri Decultot
8fc2af64ad Allow custom confirmation page (#5835) 2018-07-19 12:50:35 +05:30
Rushabh Mehta
8cb936db86 [fix] potential fix for auto-scrolling issues 2018-07-19 12:24:03 +05:30
Rushabh Mehta
47a9c05b72 [fix] for webform css 2018-07-19 12:15:34 +05:30
Prateeksha Singh
ec7858fc1e
Merge pull request #5839 from KanchanChauhan/timeline-fix
[Bug fix] Timeline had from and to reversed
2018-07-19 11:58:43 +05:30
Nabin Hait
5b6786f372 Merge branch 'master' into develop 2018-07-19 11:14:21 +05:30
Nabin Hait
cd6c41546e Merge branch 'hotfix' 2018-07-19 11:14:20 +05:30
Nabin Hait
5ddbe495c1 bumped to version 10.1.41 2018-07-19 11:44:20 +06:00
Kanchan Chauhan
8cd6545bfe [Bug fix] Timeline had from and to reversed 2018-07-19 10:58:47 +05:30
Saurabh
bff5e1126a
Merge pull request #5838 from rohitwaghchaure/not_able_to_login
[Fix] Not able to login
2018-07-19 10:10:16 +05:30
Rohit Waghchaure
53154c3971 [Fix] Not able to login 2018-07-19 09:44:24 +05:30
Saurabh
176f3b6a15 Resolved merge conflicts 2018-07-18 16:20:06 +05:30
Saurabh
f0504b5b15 Merge branch 'hotfix' 2018-07-18 16:06:37 +05:30
Saurabh
6033e1e929 bumped to version 10.1.40 2018-07-18 16:36:37 +06:00
Faris Ansari
09735e9f3e Query Report: deprecated query_report_filters_by_name (#5834)
* QueryReport

- Remove set_filters_by_name
- Remove save_user_settings
- Only print visible columns

* Query Report

- Deprecate frappe.query_report_filters_by_name
- New API: get_filter_value and set_filter_value
in frappe.query_report object
- Replace instances of old API with new API

* Undo changes in query_report.py
2018-07-18 09:28:36 +05:30