Commit graph

11550 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Nabin Hait
b784138436 Fixed merge conflict 2017-02-08 11:31:58 +05:30
Nabin Hait
7a007a2cb4 Merge branch 'hotfix' 2017-02-08 11:26:38 +05:30
Nabin Hait
e4e26720e9 bumped to version 7.2.15 2017-02-08 11:56:37 +06:00
Rushabh Mehta
0af6de61bf [fix] email validate 2017-02-07 15:02:04 +05:30
Rushabh Mehta
53f12a8b75 [fix] email validate 2017-02-07 14:31:41 +05:30
Rushabh Mehta
5bc3473184 [minor] cleanups, allow comma in email validation 2017-02-07 14:01:18 +05:30
Makarand Bauskar
75550515d9 [minor] minor fixes in update-password.html (#2676)
* [minor] minor fixes in update-password.html

* [minor] minor permissions manager fixes
2017-02-06 12:58:09 +05:30
Rushabh Mehta
33d8db6d88 [fix] minor fixes 2017-02-03 16:42:23 +05:30
robert schouten
268e7ad644 [hotfix] stop frappe sending automatic responses from non user generated emails (#2674) 2017-02-03 14:29:21 +05:30
Rushabh Mehta
7b7152a5cb Update email_body.py 2017-02-03 12:14:10 +05:30
Rushabh Mehta
3848c657ca [fix] hotkeys 2017-02-03 10:13:25 +05:30
Faris Ansari
54b2a613d9 [fix] default actions in ControlLink, set date in datepicker (#2668) 2017-02-03 09:37:08 +05:30
Rushabh Mehta
35d7bc2d3e [minor] remove references from email, leads to conversation for all messages 2017-02-02 18:11:56 +05:30
Rushabh Mehta
2b191e81ed [minor] allow grid for modal 2017-02-02 17:40:40 +05:30
Faris Ansari
0a57b9ce77 [fix] date text in week mode frappe/erpnext#7635 (#2667) 2017-02-02 17:36:42 +05:30
Faris Ansari
d0bf9ae3d3 Summernote editor (#2665)
* [summernote] working commit

* fix set_input method, esc key fix

* styling fixes

* removed old texteditor
2017-02-02 15:15:51 +05:30
Makarand Bauskar
e422e16953 [WIP] Feedback Triggers (#2643)
* [wip] feedback

* [WIP] Feedback Trigger, Feedback Request, Feedback & Rating Timeline and Form Sidebar

* [minor] minor fixes in feedback trigger

* [Test Cases] Test Cases for Feedback Trigger

* [minor] replaced sql_list by get_all changed the button label

* [minor] removed whitespaces, fixed spelling mistakes
2017-02-02 15:15:23 +05:30
Rushabh Mehta
3add8e8a39 [minor] pass now in enqueue 2017-02-02 11:24:54 +05:30
Makarand Bauskar
2119e9aed2 [minor] minor fixes breadcrumbs & clear auth log (#2663) 2017-02-02 11:14:37 +05:30
Faris Ansari
562b37cd47 [gantt] fix multiple task updates (#2655) 2017-02-02 11:00:39 +05:30
Makarand Bauskar
5e4860b4e6 [minor] set contact query minor fixes (#2662) 2017-02-02 10:57:28 +05:30
Rushabh Mehta
a93294ce75 [minor] fixes to tag delete, added viewer in tree and other cleanups 2017-02-01 18:15:01 +05:30
Saurabh
b32cb3d203 [minor][fix] validate email using regex (#2656) 2017-01-31 17:57:03 +05:30
Saurabh
59775f2f48 [fix] consider route options only if report filters not exists (#2652) 2017-01-31 17:56:11 +05:30
Rushabh Mehta
e4cba51275 [fix] address_and_contacts hooks 2017-01-31 14:16:53 +05:30
Rushabh Mehta
039a241a56 [fix] address_and_contacts hooks 2017-01-31 14:11:40 +05:30
Rushabh Mehta
deecec5b15 [minor] fix for get_version_comment 2017-01-31 12:13:29 +05:30
Rushabh Mehta
52e85d83b1 [fix] patch for dropping in_filter 2017-01-31 11:06:45 +05:30