Commit graph

12075 commits

Author SHA1 Message Date
Nabin Hait
ec5717e451 Merge branch 'bohlian-develop_customize_form_report_hide_fixes' into develop 2017-03-30 14:27:06 +05:30
Nabin Hait
916d4d2ebe Merge branch 'develop_customize_form_report_hide_fixes' of https://github.com/bohlian/frappe into bohlian-develop_customize_form_report_hide_fixes 2017-03-30 14:23:11 +05:30
Faris Ansari
3bf9c976c1 [fix] Reports in sidebar 2017-03-30 13:05:26 +05:30
joezsweet
619a09f96d Update calendar.js
- load locale-all.js
- localization based on user language settings
2017-03-30 12:40:23 +05:30
joezsweet
12f26ae939 Add files via upload 2017-03-30 12:40:23 +05:30
Nabin Hait
b9c5cab87c Newsletter email group patch fix 2017-03-30 12:36:04 +05:30
Nabin Hait
32f1256c54 Newsletter email group patch fix 2017-03-30 12:33:32 +05:30
Rohit Waghchaure
e37362d0e9 [fix] On change of permission from the role permission manager, do not save the doctype 2017-03-30 12:22:50 +05:30
Manas Solanki
48b9b58e84 Patch for newsletter 2017-03-30 12:17:42 +05:30
mbauskar
b4c1af5699 [minor] typecast the int names to string 2017-03-30 12:16:43 +05:30
Faris Ansari
9b55540a4c [fix] Show toggle sidebar button in mobile view 2017-03-30 12:16:05 +05:30
mbauskar
0678bf392d [minor] delete permission for communication and other minor fixes 2017-03-30 12:15:03 +05:30
mbauskar
54384c774f [minor] exception handling in get_app_branch if git is not initialized for app 2017-03-30 12:14:19 +05:30
joezsweet
630b29d5b2 fix error rised if no module permission
error: 
`Traceback (most recent call last):
  File "/home/frappe/frappe-bench/apps/frappe/frappe/app.py", line 56, in application
    response = frappe.handler.handle()
  File "/home/frappe/frappe-bench/apps/frappe/frappe/handler.py", line 19, in handle
    execute_cmd(cmd)
  File "/home/frappe/frappe-bench/apps/frappe/frappe/handler.py", line 42, in execute_cmd
    ret = frappe.call(method, **frappe.form_dict)
  File "/home/frappe/frappe-bench/apps/frappe/frappe/__init__.py", line 903, in call
    return fn(*args, **newargs)
TypeError: get() takes exactly 1 argument (0 given)`
2017-03-30 12:12:18 +05:30
joezsweet
eba3c31510 Better handling for datepicker language fallback 2017-03-30 12:06:23 +05:30
joezsweet
49208ee0d9 Add datepicker locale-all.js
Loading datepicker locale-all.js localizations
2017-03-30 12:06:23 +05:30
joezsweet
1463f11b3e locale-all.js for datepicker 2017-03-30 12:06:23 +05:30
joezsweet
6e7893dbea hide chart area when mandatory filters are not set
using this.chart_area.hide() instead of this.chart_area.toggle(true);
2017-03-30 12:06:23 +05:30
Makarand Bauskar
f2cce63cfb Merge pull request #2967 from mbauskar/minor-fix
[minor] fixed reference error
2017-03-30 11:37:18 +05:30
mbauskar
75c7d59314 [minor] fixed reference error 2017-03-29 21:38:16 +05:30
mnatalia
54e0412dc8 Added bold option to the customize form and underscore for the translating possibility labels. 2017-03-29 18:43:49 +05:30
_ratskin_
83ba3ccc07 Updated the screenshots
Updated the "Login Screen" and "Desk" screenshots to more update ones.

This an update on my previous pull request #2914.
2017-03-29 18:42:19 +05:30
mbauskar
7f5d7f4d85 [patch] setup enable outgoing attribute in User Email table 2017-03-29 18:40:58 +05:30
mbauskar
88f122f253 [minor] only enable_outgoing email account can send the email from communication 2017-03-29 18:40:58 +05:30
mbauskar
c632e60441 [minor] imap as default email server for email account settings 2017-03-29 18:40:58 +05:30
mbauskar
4ec430c454 [minor] permission query conditions for communication/email 2017-03-29 18:40:58 +05:30
mbauskar
c8db0b292c [minor] removed the email inbox selector, deleted user from locals on create email account 2017-03-29 18:40:58 +05:30
mbauskar
d1857015db [minor] set email domain fields using route options 2017-03-29 18:40:58 +05:30
mbauskar
10715589f4 [minor] [minor] compose email on primary action & added padding top for inbox row 2017-03-29 18:40:58 +05:30
mbauskar
bb4e7ab128 [minor] fixes in select inbox and no_result template 2017-03-29 18:40:58 +05:30
mbauskar
0033d81193 [minor] add user emails on email account creation 2017-03-29 18:40:58 +05:30
Faris Ansari
4801f0debb [kanban] Fix more button action 2017-03-29 18:16:46 +05:30
Nabin Hait
16ef650441 Merge pull request #2948 from netchampfaris/ui-fixes
[fix] column ellipsis in list view
2017-03-29 18:15:01 +05:30
Nabin Hait
e846878740 Merge pull request #2954 from pratu16x7/search-fixes
Result description fix
2017-03-29 18:14:44 +05:30
pratu16x7
09bf08ca9b sanitize and trim search result description 2017-03-29 17:10:48 +05:30
Faris Ansari
566d36d5b3 [fix] column ellipsis in list view 2017-03-29 11:50:19 +05:30
Javier Wong
42d04337c2 [fix] Missing field declaration for hiding fields with report_hide set 2017-03-29 00:59:51 +08:00
Nabin Hait
7ed4bda46c Merge pull request #2938 from saurabh6790/backup-and-update-space-fix
[minor][fix] clean-up extra backups and calculate user space on hourly basis
2017-03-28 13:56:38 +05:30
Nabin Hait
13fa7c8a69 Merge pull request #2941 from netchampfaris/summernote-fixes
Summernote fixes
2017-03-28 13:56:08 +05:30
Faris Ansari
a6b2655563 fix summernote drag drop image 2017-03-27 18:08:48 +05:30
Faris Ansari
d777cb4830 prettifyHtml in code view 2017-03-27 16:53:17 +05:30
Faris Ansari
5d2dd18ddd [summernote] Trigger change event in code view 2017-03-27 16:47:33 +05:30
Rushabh Mehta
cd4fd8363c Revert "[fix] Customize Form - Report Hide" (#2940)
* Revert "[fix] Doctype List in User Permissions (#2785)"

This reverts commit 156393c9fc.

* Revert "[minor]  translation related: Address document autoname and Search box placeholder (#2918)"

This reverts commit 9e8896d3c1.

* Revert "Fix total sum report (#2921)"

This reverts commit 344e87db83.

* Revert "[fix] Allow Print and Cancel during a Workflow (#2935)"

This reverts commit d57612bbe8.

* Revert "[enhancement] Email Alert - Allow email_by_document_field to have multiple emails separated by comma (#2936)"

This reverts commit f7ffcbf423.

* Revert "[fix] Customize Form - Report Hide (#2937)"

This reverts commit e50e5f15ef.
2017-03-27 15:42:44 +05:30
akshay83
156393c9fc [fix] Doctype List in User Permissions (#2785)
* [fix] Doctype List in User Permissions

* [fix] Problem in Fetching Default Link Values

* Sorted Doctypes

* Update create_new.js

Problem fetching some Default Values
2017-03-27 15:29:59 +05:30
Robert
9e8896d3c1 [minor] translation related: Address document autoname and Search box placeholder (#2918)
* strings in templates translatable

* [minor] placeholder in search box is translatable now

* Address autoname creates new name from translated address_type
2017-03-27 15:24:06 +05:30
paurosello
344e87db83 Fix total sum report (#2921)
* Fix total sum

Removes last item if it is a Totals Row before loading more items

* Update listing.js
2017-03-27 15:20:34 +05:30
Javier Wong
d57612bbe8 [fix] Allow Print and Cancel during a Workflow (#2935) 2017-03-27 15:15:32 +05:30
Javier Wong
f7ffcbf423 [enhancement] Email Alert - Allow email_by_document_field to have multiple emails separated by comma (#2936) 2017-03-27 15:11:12 +05:30
Javier Wong
e50e5f15ef [fix] Customize Form - Report Hide (#2937)
- Hide fields from report builder selection if report hide is selected
- Remove field from being shown in the report builder if report hide is selected
2017-03-27 15:05:47 +05:30
Makarand Bauskar
9f24dc98e4 [minor] ignore feedback trigger if document is deleted or not found (#2925) 2017-03-27 15:02:31 +05:30