Commit graph

11604 commits

Author SHA1 Message Date
pratu16x7
dc22a6bb8f Nav results order fix, black links 2017-02-24 10:37:04 +05:30
pratu16x7
ca563331fa All results link in sidebar, remove scroll 2017-02-24 10:37:04 +05:30
pratu16x7
2c407a3d63 Placeholder graphics, nav results preference, json fields update 2017-02-24 10:37:04 +05:30
Nabin Hait
f00f2f6b52 minor fix in timeline 2017-02-23 11:35:11 +05:30
Nabin Hait
ca1f54cf6a minor fix in timeline 2017-02-23 11:29:36 +05:30
Nabin Hait
3dd5ebc37d Merge branch 'master' into develop 2017-02-22 15:04:40 +05:30
Nabin Hait
fecf3fbf62 Merge branch 'hotfix' 2017-02-22 15:04:39 +05:30
Nabin Hait
85245e9233 bumped to version 7.2.19 2017-02-22 15:34:39 +06:00
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
Revant Nandgaonkar
4897848615 [Fix] Oauth2 fix for handling multiple scopes (#2744)
Replaced "+" in scopes with space " " in case of Guest is redirected
2017-02-22 14:54:34 +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
9cb63430bb Merge pull request #2739 from mbauskar/hotfix
[validate] validate the auto report format on validate
2017-02-20 17:02:30 +05:30
mbauskar
12a58bfa39 [validate] validate the auto report format on validate 2017-02-20 16:33:37 +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