Commit graph

14919 commits

Author SHA1 Message Date
frappe-pr-bot
e2dc4217f6 [Translation] Updated Translations 2018-01-23 07:53:00 +02:00
Achilles Rasquinha
a7de4281f9
Merge pull request #4887 from mntechnique/spelling-correction-build-py
Corrected warning message in make_asset_dirs in build.py
2018-01-22 22:37:48 +05:30
Saurabh
507e05181a Merge branch 'master' into develop 2018-01-22 15:31:04 +05:30
Saurabh
26dec6157c Merge branch 'hotfix' 2018-01-22 15:31:04 +05:30
Saurabh
a18e0661df bumped to version 10.0.13 2018-01-22 16:01:03 +06:00
Gaurav Naik
7c7719f4c0 Corrected warning message in make_asset_dirs in build.py 2018-01-22 14:04:53 +05:30
Josh Reeder
ca294b99b5 Fix Domain vs Service selection (#4886)
Users confused by option to select both a Service AND a Domain. Fixing display depends on, fixes this UX bug.
2018-01-22 12:33:25 +05:30
Josh Reeder
421e0c4171 Description improvement for Google Cloud installs. (#4885)
Google Cloud allows port 587 for smtp.gmail.com and 2525 for other services such as SparkPost and Mailgun. Took a long time to figure this out.
2018-01-22 12:31:05 +05:30
Zarrar
7432722469 [Fix] Hide options for date filter (#4825)
* hide like and not like for date based filter

* hide invalid options according to fieldtype

* cleanup
2018-01-22 12:24:09 +05:30
rohitwaghchaure
7086cf8312
Merge pull request #4880 from rohitwaghchaure/wrong_communication_date
[Fix] Showing today's date as communication date for old emails in the popup
2018-01-22 11:40:50 +05:30
Achilles Rasquinha
c9ebd2e1f2
Merge pull request #4878 from shridarpatil/docs
Document update: Cron like events scheduler
2018-01-20 11:05:15 +05:30
Achilles Rasquinha
cc9cec8f4e
Merge pull request #4882 from Zlash65/onclick-tree-fix
[Fix] Onclick select node not working in TreeView
2018-01-20 11:04:10 +05:30
Zlash65
471e1a679e pass node on click 2018-01-19 18:58:01 +05:30
Rohit Waghchaure
452d9042fc [Fix] Showing today's date as communication date for old emails in the popup 2018-01-19 18:04:53 +05:30
Shridhar
2d164ca70f Scheduler hooks event cron 2018-01-19 15:53:08 +05:30
Prateeksha Singh
2bb25442fd
Merge pull request #4876 from pratu16x7/hotfix
ignore xss on barcode by default, fixes frappe/erpnext#11973
2018-01-19 15:16:19 +05:30
Shridhar
75e503ef42 Documentation for Cron like events scheduler 2018-01-19 15:15:40 +05:30
Prateeksha Singh
077230c922 ignore xss on barcode by default, fixes frappe/erpnext#11973 2018-01-19 15:11:27 +05:30
nick9822
46d6b46c0f Update Save button after file attach #4638 (#4639)
* docstatus check before save

* Submit changed to Update to be more precise
2018-01-19 13:36:29 +05:30
Rohit Waghchaure
87a0b6213b Merge branch 'master' into develop 2018-01-19 13:06:50 +05:30
Rohit Waghchaure
2755e07364 Merge branch 'hotfix' 2018-01-19 13:06:49 +05:30
Rohit Waghchaure
5b156197eb bumped to version 10.0.12 2018-01-19 13:36:49 +06:00
Revant Nandgaonkar
5f22459013 Salesforce social login (#4819)
* Added Salesforce Social Login

* [Docs] Generate client_id client_secret for login providers

* [Fix] salesforce userid

Saleforce sub from openid is https://login.salesforce.com/id/ABC/XYZ
Extracting ABC/XYZ
2018-01-19 12:23:37 +05:30
Frappe PR Bot
9fae12da1b [Translation] Updated Translations (#4842) 2018-01-19 12:18:03 +05:30
Achilles Rasquinha
6a238b0048 Send me a Copy not in BCC (#4874) 2018-01-19 12:15:07 +05:30
Achilles Rasquinha
a6e98dd73e
Merge pull request #4872 from achillesrasquinha/chat-fixes
Fixed Chat Sound issues and Room Layout
2018-01-18 19:28:58 +05:30
Achilles Rasquinha
a56452744a Fixed Chat Sound issues and Room Layout 2018-01-18 19:12:41 +05:30
Achilles Rasquinha
2a615d112a
Merge pull request #4870 from achillesrasquinha/new-chat-ui
"New" Chat UI
2018-01-18 18:19:45 +05:30
Achilles Rasquinha
c53ec2e12c
Merge pull request #4871 from achillesrasquinha/Fix-4869
[FIX] permission issues for non System Managers
2018-01-18 18:19:19 +05:30
Achilles Rasquinha
9b5b86a485
Merge pull request #4864 from achillesrasquinha/fix-chat-3
Filter Chat Message List
2018-01-18 18:19:07 +05:30
Achilles Rasquinha
b499dbdf69
Merge pull request #4856 from achillesrasquinha/fix-chat-2
[frappe-chat] Fix Chat Hint View
2018-01-18 18:18:57 +05:30
Achilles Rasquinha
c2a8006db2
Merge pull request #4826 from achillesrasquinha/Feature-get_single_value
Client-Side get_single_value
2018-01-18 18:18:39 +05:30
Achilles Rasquinha
c0d9122592 Fixed Codacy 2018-01-18 17:01:39 +05:30
Achilles Rasquinha
eb229ad14b Fixed Codacy 2018-01-18 16:57:04 +05:30
Achilles Rasquinha
42732aeb3e Fixed Codacy 2018-01-18 16:54:03 +05:30
Achilles Rasquinha
8db0ee37cf Fixed permissions 2018-01-18 16:50:43 +05:30
Achilles Rasquinha
67021b451e new chat ui 2018-01-18 16:37:10 +05:30
Faris Ansari
eff0183151
Listview fixes (#4827)
* Rename _fields to fields

* Update datatable lib
2018-01-18 15:39:40 +05:30
rohitwaghchaure
97e18c809e [Fix] Date between filter not working properly on report and listview (#4810) 2018-01-18 15:39:12 +05:30
rohitwaghchaure
3e187d7d50 [Fix] Showing status as Replied after adding the comment in the emails (#4865) 2018-01-18 15:37:46 +05:30
rohitwaghchaure
cf4060d632 [Fix] Feedback issue (#4867) 2018-01-18 15:37:28 +05:30
Faris Ansari
32a83ce81f
only promise 2018-01-18 14:56:44 +05:30
Faris Ansari
ba9818a61e
Listview fixes (#4846)
* [minor] Handle empty fieldselect map

* Handle 0 rows in reportview
2018-01-18 14:50:54 +05:30
Ameya Shenoy
7c6efd2e24 Filter dynamic link doctypes enhancement (#4860) 2018-01-18 14:50:33 +05:30
Achilles Rasquinha
42dc1d9a42 Fixed Default Dependency Field Group (#4868) 2018-01-18 14:48:32 +05:30
Achilles Rasquinha
14ee88207a
Merge pull request #4866 from achillesrasquinha/fix-chat-4
Realtime Chat Enable/Disable Feature
2018-01-18 14:16:39 +05:30
Achilles Rasquinha
5551632511 Fixed Codacy 2018-01-18 14:02:09 +05:30
Aditya Hase
8c525fc5d4 Python 3 compatibility Frappe installation fixes (#4863)
* Use consistent indentation

* Fix print syntax

* Pass unicode argument to pymysql.escape_string
2018-01-18 13:52:46 +05:30
Achilles Rasquinha
900b65e9c3 added logging 2018-01-18 13:13:37 +05:30
Faris Ansari
477f4b92ea
[fix] file test (#4861)
* [fix] file test

* minor

* [fix] refresh after apply filter
2018-01-18 13:12:34 +05:30