Rushabh Mehta
7965deaae3
[feature] add bench auto-deploy command ( #4894 )
2018-01-23 15:18:51 +05:30
Martino Migliavacca
1fbde5c85d
Fiscal Year in naming series ( #4727 )
2018-01-23 14:53:37 +05:30
Loocor
c43d1fac59
frappe chinese document translation plan ( #4689 )
...
* [add] Chinese documents init.
* Videos chinese document translated
* Bench chinese documents translated half
* Bench chinese documents translated
* Fixed several mistakes for bench guides
* Frappé Tutorial chinese version in translation
2018-01-23 14:50:46 +05:30
tundebabzy
08f9cf7f4b
Doctypes Using Tree Structure Should Be Supported When Making Fixtures ( #4596 ) ( #4597 )
...
* Documents using tree structure now supported
* final cleanup
* remove hard coded primary button code
* fix bug in logic
* refactor to fix breaking build
2018-01-23 14:46:43 +05:30
Achilles Rasquinha
b97a006f28
Merge pull request #4889 from achillesrasquinha/chat-fixes
...
New Chat Room View 🎉 🎉 🎉
2018-01-23 14:36:49 +05:30
Britlog
07c0f4fd99
Stripe translations ( #4892 )
2018-01-23 14:34:11 +05:30
Achilles Rasquinha
d5e60746ff
revert
2018-01-23 14:24:29 +05:30
Achilles Rasquinha
650b692a50
revert
2018-01-23 14:20:56 +05:30
Achilles Rasquinha
bda2f52e41
revert
2018-01-23 14:19:51 +05:30
Achilles Rasquinha
d6a6a11808
revert
2018-01-23 14:13:26 +05:30
Achilles Rasquinha
6f5e35582d
Added Maxmind GeoIP
2018-01-23 13:38:33 +05:30
Achilles Rasquinha
f1f91e44a9
Fixed showdown.js
2018-01-23 13:18:54 +05:30
Achilles Rasquinha
17d334a5ff
chat-list-notifications
2018-01-23 12:21:30 +05:30
Achilles Rasquinha
966c9ebe5a
Merge pull request #4893 from frappe-pr-bot/translations-2018-01-23
...
[Translation] Updated Translations
2018-01-23 12:16:12 +05:30
frappe-pr-bot
e2dc4217f6
[Translation] Updated Translations
2018-01-23 07:53:00 +02:00
Achilles Rasquinha
3f8bf0b5a9
added background image
2018-01-23 10:06:10 +05:30
Achilles Rasquinha
aa58f515a9
Groupable
2018-01-22 23:26:03 +05:30
Achilles Rasquinha
04091a6d83
Fixed Chat Footer Margin
2018-01-22 22:41:22 +05:30
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
Achilles Rasquinha
63959c9483
Fixed chat-footer padding
2018-01-22 20:36:28 +05:30
Achilles Rasquinha
25b1c0af50
fixed panel padding
2018-01-22 19:53:40 +05:30
Achilles Rasquinha
2f6df81f4b
Fixed margin padding issue
2018-01-22 18:59:10 +05:30
Achilles Rasquinha
b04e3cce42
New Chat RoomView Layout
2018-01-22 18:35:25 +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
27e5cf6967
some minor updates
2018-01-21 11:46:58 +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
