Commit graph

12021 commits

Author SHA1 Message Date
Nabin Hait
e5f9b2f3ea Merge pull request #2939 from rohitwaghchaure/minor_fix_report_page_role
Cleanup the code
2017-03-27 13:21:54 +05:30
Rohit Waghchaure
ab077e99e9 Cleanup the code 2017-03-27 13:13:41 +05:30
Nabin Hait
c8e1001572 Fixed merge conflict 2017-03-27 12:33:13 +05:30
Nabin Hait
7777b3a920 Merge branch 'hotfix' 2017-03-27 12:30:57 +05:30
Nabin Hait
a35cf79a36 bumped to version 7.2.31 2017-03-27 13:00:57 +06:00
Valmik
145fa3196b [fix] only show help for installed apps (#2924) 2017-03-27 11:08:54 +05:30
robert schouten
79620ab716 remove quotes from from header for unicode parse (#2888) 2017-03-24 15:49:26 +05:30
Faris Ansari
6588cf4e71 Create ISSUE_TEMPLATE.md (#2864)
* Create ISSUE_TEMPLATE.md

* Update ISSUE_TEMPLATE.md
2017-03-23 16:26:54 +05:30
KanchanChauhan
e572768fb8 [Minor] Default label Pay in web form (#2911) 2017-03-23 16:25:30 +05:30
Faris Ansari
cf2211328b show banner image in blog post list (#2905) 2017-03-23 15:01:11 +05:30
Makarand Bauskar
ec1f8e445e [minor] added frappe.utils in email alerts (#2903) 2017-03-23 14:59:26 +05:30
KanchanChauhan
5c8c6e2b8d Hide report menu from sidebar if not permitted (#2902)
* Hide report menu from sidebar if not permitted

* Update list_sidebar.html
2017-03-23 14:58:50 +05:30
Makarand Bauskar
2cf165c07b [minor] chat page listview fixes (#2901) 2017-03-23 14:56:39 +05:30
KanchanChauhan
7c38c2155b [Fix] Address web view fixed (#2899) 2017-03-23 14:55:40 +05:30
Sagar Vora
5633b448a0 Update sites.md (#2896)
Fixed broken link.
2017-03-23 14:55:18 +05:30
Sagar Vora
5521d290d6 Update bench-commands-cheatsheet.md (#2895)
Added bench set-config command and description under Development section of file.
2017-03-23 14:54:59 +05:30
robulik
d0a35cd7da [Minor] fix of translatable strings ("No Tags", "Profile") (#2892)
* Slovak translations

* New strings pulled

* Slovak translations for Desktop terms

* Slovak translations'

* Slovak translations

* Slovak translations

* Slovak translations

* Slovak translations

* Quick entry window now with translatable footer notes

* Slovak translation waits for bulk pull request

* Slovak translations

* Slovak translations

* Slovak translations

* Slovak translations

* Button Make a new {0} in list view - which is already translated string

* Translatable strings 'No Tags' and 'Profile'

* Minor fix of translatable strings (No Tags, Profile)

* [fix] translations for strings in templates
2017-03-23 14:52:18 +05:30
KanchanChauhan
37574d67d1 Export selected items in Report Builder (#2890) 2017-03-23 14:51:11 +05:30
Makarand Bauskar
087dd43083 [minor] fixes in activity page rendering, ignored emails from activity (#2887) 2017-03-23 14:48:24 +05:30
Nabin Hait
395d7b9756 Merge pull request #2916 from rohitwaghchaure/setup_wizard_unpickle_issue
[fix] Setup wizard, UnpickleError issue
2017-03-23 14:47:17 +05:30
Manas Solanki
20bb54592b [Fix] Export Query Report (#2883)
* [Fix] Export Query Report

* Update query_report.py
2017-03-23 14:42:34 +05:30
Rohit Waghchaure
5c58ebe948 [fix] Setup wizard, UnpickleError issue 2017-03-23 14:36:47 +05:30
RicardoJohann
010663f856 Added collapsable charts (#2881)
* Added collapse/expand button to charts

* [minor] Removed the chevron

Icon not required if the button text is explanatory.
2017-03-23 14:34:07 +05:30
paurosello
a21db81a28 Disable SignUp (#2878)
* Disable SignUp

Disabled signup from setting only hides signup link but users can signup anyway. Disables the sign_up function.

* Fix translate String
2017-03-23 14:29:02 +05:30
Charles-Henri Decultot
12d30c87c2 Corrections of the document generation guide (#2870)
* Corrections of the document generation guide

* Update generating-docs.md
2017-03-23 14:28:30 +05:30
Faris Ansari
489ba56045 [kanban] private boards in ToDo (#2879)
* [kanban] private boards in ToDo

* remove console.log
2017-03-22 15:56:29 +05:30
Faris Ansari
323a64f95f Merge pull request #2909 from netchampfaris/listview-fixes
Fix breadcrumbs in List view
2017-03-22 15:48:52 +05:30
Faris Ansari
1791eac479 Merge pull request #2900 from netchampfaris/webformfix
[webform] Fix readonly texteditor
2017-03-22 15:46:24 +05:30
Faris Ansari
6bd91580b8 ui fixes (#2880)
* [ui] msgprint text overflow fix

* fix render tags in list view

* remove notify.js, tag-it.min.js from build.json
2017-03-22 15:44:31 +05:30
Faris Ansari
adac40a90a Fix breadcrumbs in List view 2017-03-22 12:38:07 +05:30
Nabin Hait
fefdfd6fdc Merge pull request #2907 from rmehta/refactor-naming
[minor] refactor naming.py
2017-03-21 19:21:25 +01:00
Rushabh Mehta
c79055c40f [minor] refactor naming.py 2017-03-21 17:44:22 +01:00
Rushabh Mehta
0f94846f3f [fix] translation for Sr column 2017-03-21 10:54:22 +01:00
rohitwaghchaure
231658366b Merge pull request #2898 from KanchanChauhan/sidebar-reports-fixed
Sidebar reports fixed
2017-03-21 11:54:30 +05:30
Faris Ansari
75eecb500c [webform] fix readonly texteditor 2017-03-20 17:52:11 +05:30
Kanchan Chauhan
4a5875bda5 Sidebar reports fixed 2017-03-20 14:43:13 +05:30
rohitwaghchaure
21214e8b53 Merge pull request #2885 from rohitwaghchaure/fix_patch_for_v8
[fix] Patch rename_page_role_to_has_role
2017-03-16 18:35:17 +05:30
Rohit Waghchaure
ca82c70be3 [fix] Patch rename_page_role_to_has_role 2017-03-16 18:26:35 +05:30
Nabin Hait
9b6362577e Merge pull request #2876 from netchampfaris/ui-fixes
[ui] ellipsis in list view column frappe/erpnext#8004
2017-03-15 19:39:21 +05:30
Nabin Hait
7733c1cff2 Merge pull request #2875 from pratu16x7/search-fixes
[minor] recents priority
2017-03-15 19:39:01 +05:30
Nabin Hait
d33fbeaebb Merge pull request #2877 from mbauskar/develop
Email Account js cleanups
2017-03-15 19:38:27 +05:30
mbauskar
8454b195e3 [minor] fixed test_password test case 2017-03-15 18:32:03 +05:30
pratu16x7
b9c3023a67 fix report view from awesome bar bug frappe/erpnext#8022 2017-03-15 18:07:23 +05:30
mbauskar
8c1a788331 [minor] fixes in email account update domain trigger 2017-03-15 16:28:50 +05:30
Faris Ansari
de97c4ebfa [ui] ellipsis in list view column frappe/erpnext#8004 2017-03-15 15:38:20 +05:30
Rushabh Mehta
ba289eaa62 [minor] remove print 2017-03-15 15:31:16 +05:30
mbauskar
c20d5b9a57 [minor] fixed email seen/unseen status condition 2017-03-15 15:27:46 +05:30
Rushabh Mehta
d453dea055 [minor] catch tag count exception for filters that include child tables 2017-03-15 15:02:08 +05:30
pratu16x7
84f14dc77d fix recent priority 2017-03-15 14:18:17 +05:30
Nabin Hait
1fb92d3555 Merge pull request #2873 from mbauskar/develop
[minor] fixes in email read / unread flags
2017-03-15 14:13:52 +05:30