Commit graph

11577 commits

Author SHA1 Message Date
Faris Ansari
df7c52b366 [fix] summernote onenter frappe/erpnext#7684 2017-02-20 13:10:00 +05:30
Nabin Hait
5c3bbe8ef4 Get parent node for tree view 2017-02-17 15:49:23 +05:30
Rushabh Mehta
979ddb14fa [fixes] 403 in request, grid tabbing and global search in install 2017-02-17 14:20:04 +05:30
Nabin Hait
814c235efd Merge branch 'master' into develop 2017-02-16 15:59:16 +05:30
Nabin Hait
3b8a8c4983 Merge branch 'hotfix' 2017-02-16 15:59:16 +05:30
Nabin Hait
8b3de0d999 bumped to version 7.2.17 2017-02-16 16:29:16 +06:00
Nabin Hait
b9528c6106 Merge pull request #2729 from saurabh6790/regx_hotfix
[urgent][fix] keep origional regx
2017-02-16 15:58:23 +05:30
Saurabh
19feb398cf [urgent][fix] keep origional regx 2017-02-16 15:55:48 +05:30
Nabin Hait
d23c369fc0 Merge pull request #2687 from manassolanki/report
Report Export
2017-02-16 14:46:29 +05:30
Nabin Hait
20668995ec Fixed merge conflict 2017-02-16 14:34:27 +05:30
Nabin Hait
604b0dcab5 Merge branch 'hotfix' 2017-02-16 14:24:10 +05:30
Nabin Hait
bf3df0196b bumped to version 7.2.16 2017-02-16 14:54:10 +06:00
Rushabh Mehta
944739d2d4 [minor] hide gmail replies 2017-02-16 12:07:32 +05:30
Saurabh
0be79e6fe3 [fix] add indicator parameter to redirect_to_message (#2717) 2017-02-16 11:54:18 +05:30
Elliot Schep
a824576bce Changed a link in README.md (#2720)
*[Built for ERPNext](https://erpnext.com)
This link does not describe stuff built for ERPNext it is actually the website of ERPNext and so the link was changed to
Built for [ERPNext](https://erpnext.com)
2017-02-15 14:51:01 +05:30
Saurabh
f2b41d7d43 [fix] LDAP Settings and script update to be more generic #2666 (#2679) 2017-02-15 14:50:16 +05:30
Makarand Bauskar
4834bfa946 [minor] added flags, docstatus in restricted fieldname (#2709)
* [minor] added flags, docstatus in restricted fieldname

* [minor] excluded Attach Image from In List View
2017-02-15 14:48:38 +05:30
Manas Solanki
a9d5715f8a Fix for opening the file in mac and some styling in excel file 2017-02-14 18:34:35 +05:30
Manas Solanki
8bcd479831 Add binary mime type in response.py 2017-02-14 18:34:35 +05:30
Manas Solanki
59917bc2af Query Report export in excel file format 2017-02-14 18:34:35 +05:30
Manas Solanki
001e2d18e9 Add openpyxl in requirements 2017-02-14 18:34:35 +05:30
Manas Solanki
6cdf8ec86c Export Reports in Excel file format 2017-02-14 18:34:35 +05:30
Nabin Hait
e620d5e177 Hide doctype form permission manager 2017-02-14 18:24:16 +05:30
Nabin Hait
7a9ccc538f Merge pull request #2711 from netchampfaris/ui-fixes
[ui-fixes] frappe/erpnext#7694
2017-02-13 18:30:11 +05:30
Nabin Hait
7999e0893d Merge pull request #2714 from mbauskar/feedback
[minor] fixes in feedback request url message
2017-02-13 18:29:12 +05:30
mbauskar
17f025707f [minor] fixes in feedback request url message 2017-02-13 18:11:08 +05:30
Nabin Hait
b293f12822 Merge pull request #2713 from KanchanChauhan/primary-on-top
[Fix] Primary Contact on top of list
2017-02-13 16:10:45 +05:30
Kanchan Chauhan
e9a0997169 [Fix] Primary Contact on top of list 2017-02-13 15:58:49 +05:30
Rushabh Mehta
86ceb21005 [feature] Global Search (again) (#2710)
* [start] global search frappe/erpnext#6674

* [fix] setup before running test

* [start] global search frappe/erpnext#6674

* Display result as rudimentary list, rebuild old doctypes

* Media view, child tables, delete document updates, searchable fields

* More results UI

* Code clean up

* remove msgprint from document.py to resolve merge conflict

* Modularization stage 1, get show more to work with it

* Dedicated modal Search bar works, some clean up needed

* Can't data-dismiss on links, Bootstrap issue, use hashchange

* Accomodate missing field content syndrome

* Search in boolean mode, make GS default in awesome bar, fix double modal bug and cleanup

* Add in Meta

* Add in customize form

* Modularise Global Search

* Search object

* Commonify Search UI: Stage I

* II: save list state, UI, default condensed view, refactor

* Fix SQL bug, Refactor awesome bar, Fix unicode bug, add nav results

* Refactor using separate search objects, some async issues

* Fix async flow

* Fix preceding more list bug

* UI additions

* another async fix, back link

* Help: Stage I

* Help: Stage II

* Background jobs, fix route options bug

* Fix GS syncing on install

* Add GS options in awesome bar: test

* Input now remembers search type state

* More UI updates

* Add description for GS results in awesome bar

* Fix help modal bug

* Fix: not commit during install

* Test cases, some fixes

* Update in_test flag in enqueue

* Disable GS sync when not install_db

* Add flag check

* Disable field in child tables

* Cleanups

* Create table fix

* Fix redis exception, remove commit enqueue, add gs in migrate

* Fix tests

* Single enqueue

* cleanups

* Fix tests

* Fix event test

* Fix duplication, search as first option

* Add show name in global search

* fix event tests and desk.less

* Fix communication.json

* [fixes] wip

* [fix] tests

* [minor] for tests

* [minor] for tests

* [minor] for tests

* [minor] for tests
2017-02-13 14:50:54 +05:30
Faris Ansari
832e5ee92d [ui-fixes] frappe/erpnext#7694 2017-02-13 13:20:39 +05:30
Rushabh Mehta
1f58e36d37 [fix] email validation 2017-02-11 21:19:11 +05:30
Nabin Hait
383b0ec691 Merge pull request #2690 from rohitwaghchaure/strip_currecny_issue
[Fix] Strip currency symbol issue for EGP currency
2017-02-10 17:52:52 +05:30
Nabin Hait
5db881b6de Merge pull request #2702 from mbauskar/feedback
[minor] checked the unsaved condition for feedback for toolbar.js
2017-02-10 12:52:04 +05:30
mbauskar
74a5dbd0e5 [minor] checked the unsaved condition for feedback for toolbar.js 2017-02-10 11:43:18 +05:30
Nabin Hait
391057f48c Merge pull request #2698 from saurabh6790/email_validation_fix
[typo][fix] remove double quotes from regx
2017-02-10 10:54:30 +05:30
Nabin Hait
5b1ca7f2eb Merge pull request #2700 from mntechnique/text-editor-fix
Text editor fix
2017-02-10 10:52:45 +05:30
Gaurav Naik
e4acc66163 Merge branch 'master' of https://github.com/frappe/frappe into text-editor-fix 2017-02-09 20:31:14 +05:30
Gaurav Naik
d7ee55b754 [Fix] Text Editor: Icons and sequence for indent-outdent icons 2017-02-09 20:30:52 +05:30
Rushabh Mehta
79f2ee67b2 [minor] added grid.get_selected_chilren() 2017-02-09 17:46:15 +05:30
Rushabh Mehta
772adf4199 [style] style fixes for setup wizard and charts 2017-02-09 17:46:15 +05:30
Saurabh
e795c08367 [typo][fix] remove double quotes from regx 2017-02-09 16:55:39 +05:30
Nabin Hait
80dc881de9 Merge pull request #2633 from RobertSchouten/compact_dev
[fix] compact print format not longer ignores format builder
2017-02-09 16:15:06 +05:30
Felipe Morato
087864965f [docs] Fix tutorial web views (#2670)
* [docs] Add images to web views tutorial. fixes #1464

* [docs] Fixes web views row overriding. #2669
2017-02-09 12:56:18 +05:30
Rushabh Mehta
76a9b3665d Update number_format.js 2017-02-09 12:54:37 +05:30
Faris Ansari
0490efd1af [minor] Kanban permission, Calendar route (#2692)
* [fix] Calendar route in desk, notification frappe/erpnext#7670

* [kanban] set permission rule to All
2017-02-09 12:52:01 +05:30
Rohit Waghchaure
bd7ed3dc3d [Fix] Strip currency symbol issue for EGP currency 2017-02-09 12:10:27 +05:30
Rushabh Mehta
97764984e1 [style] use text color for summernote editor 2017-02-09 11:52:59 +05:30
Makarand Bauskar
99d97530b1 [enhancement] Feedback Feature (#2683) 2017-02-09 11:30:54 +05:30
robert schouten
f54efe0aa8 [fix] show action after duplicate having no action (#2681) 2017-02-08 16:18:21 +05:30
Nabin Hait
b784138436 Fixed merge conflict 2017-02-08 11:31:58 +05:30