Commit graph

11593 commits

Author SHA1 Message Date
KanchanChauhan
93528ffc81 [Fix] Documentation Broken Images (#2737) 2017-02-22 14:55:36 +05:30
khatrijitendra
114c18c581 [Fix] Add Print Format Name Translation (#2742) 2017-02-22 14:55:00 +05:30
Faris Ansari
e763bc7af7 fix double link (#2749) 2017-02-22 14:54:05 +05:30
Rushabh Mehta
6d6a6b6fbb [fix] sortable for firefox, fixes frappe/erpnext#7813 2017-02-22 12:34:14 +05:30
Prateeksha Singh
e9f2aadd38 Search fixes (#2746)
* GS in awesome bar, UI fixes: scroll nav,lists

* awesome bar specificity

* Add fuzzy search in awesome bar

* Add fuzzy specific boldening

* List subtype buttons

* Update global_search.py
2017-02-22 11:08:36 +05:30
Faris Ansari
82e64d2cbf added image, video in summernote (#2741)
* added image, video in summernote

* added link, table
2017-02-21 17:49:17 +05:30
Nabin Hait
412530126c Merge pull request #2736 from nabinhait/in_global_search
Added fields in global search
2017-02-20 15:05:16 +05:30
Nabin Hait
6601710465 Fixed merge conflict 2017-02-20 14:50:28 +05:30
Nabin Hait
5ce9cb20c4 Merge branch 'hotfix' 2017-02-20 14:44:19 +05:30
Nabin Hait
fc6edabbbc bumped to version 7.2.18 2017-02-20 15:14:19 +06:00
Nabin Hait
ac0feb6337 Merge pull request #2735 from netchampfaris/summernote-fixes
[fix] summernote onenter frappe/erpnext#7684
2017-02-20 14:30:47 +05:30
Nabin Hait
2e02267e88 Added fields in global search 2017-02-20 13:39:21 +05:30
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
Nabin Hait
8bdc6e2d6f Merge pull request #2732 from mbauskar/hotfix
[minor] added method get_timestamp from date
2017-02-17 15:17:13 +05:30
Rushabh Mehta
a9da206cc2 [minor] control icon 2017-02-17 14:56:17 +05:30
Rushabh Mehta
979ddb14fa [fixes] 403 in request, grid tabbing and global search in install 2017-02-17 14:20:04 +05:30
Revant Nandgaonkar
496c1d293e [Add] OAuth 2 Implicit Grant flow (#2728) 2017-02-16 17:18:57 +05:30
mbauskar
6d9eab7f6e [minor] added method get_timestamp from date 2017-02-16 16:40:50 +05:30
Nabin Hait
3b8a8c4983 Merge branch 'hotfix' 2017-02-16 15:59:16 +05:30
Nabin Hait
814c235efd Merge branch 'master' into develop 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