Commit graph

11671 commits

Author SHA1 Message Date
Nabin Hait
26c007b5ce Merge pull request #2780 from KanchanChauhan/image-in-data-import
[Fix] Image not allowed in Data Import Tool
2017-02-28 15:23:32 +05:30
Kanchan Chauhan
a81721ef91 [Fix] Image not allowed in Data Import Tool 2017-02-28 13:27:06 +05:30
Rushabh Mehta
38b0046fb3 [fix] web_form.py 2017-02-28 12:34:25 +05:30
Rushabh Mehta
8ac3a9a7ca [web-forms] added text-editor and using div in summernote instead of p 2017-02-28 12:13:36 +05:30
Nabin Hait
8f49b40d7b Merge pull request #2773 from pratu16x7/clear-all-filters
Clear all filters button
2017-02-28 10:47:26 +05:30
Nabin Hait
db4113753d Merge pull request #2775 from netchampfaris/summernote-fixes
summernote fixes
2017-02-28 10:46:35 +05:30
Nabin Hait
b1e258c45b Merge pull request #2774 from pratu16x7/search-categories
Redefining search categories
2017-02-28 10:46:12 +05:30
Faris Ansari
23efb00249 [summernote] fix <p> on enter 2017-02-27 21:33:31 +05:30
Faris Ansari
d6d68ad924 [summernote] hide buttons in modal 2017-02-27 21:05:52 +05:30
pratu16x7
c5899afea2 [minor] yet another term change 2017-02-27 18:59:58 +05:30
pratu16x7
fa4a7bd209 [minor] term fix 2017-02-27 18:33:32 +05:30
Nabin Hait
fd932fb775 [translations] 2017-02-27 17:51:38 +05:30
pratu16x7
7c1f7b0610 hide button when no filters 2017-02-27 17:30:11 +05:30
pratu16x7
831391cbc4 [minor] redefine tools and settings categories 2017-02-27 16:41:48 +05:30
pratu16x7
a4a85b59df remove-all-filters button 2017-02-27 15:42:15 +05:30
Nabin Hait
9f7ae751e2 Merge pull request #2771 from pratu16x7/link-field-string-condition
[minor] link field autocomplete
2017-02-27 14:44:50 +05:30
Nabin Hait
78447337d7 Merge branch 'master' into develop 2017-02-27 14:30:21 +05:30
Nabin Hait
3b10f61541 Merge branch 'hotfix' 2017-02-27 14:30:21 +05:30
Nabin Hait
a0e18061d5 bumped to version 7.2.20 2017-02-27 15:00:20 +06:00
pratu16x7
8095da2114 fix string compare condition 2017-02-27 14:19:04 +05:30
Nabin Hait
41d6ad0e53 Merge pull request #2768 from pratu16x7/awesome-bar-new-option
[fix] awesomebar new option with/without new keyword
2017-02-27 13:07:08 +05:30
Nabin Hait
c91871ba04 Merge pull request #2769 from mbauskar/feedback
[patch] reload document before running patch && remove whitespaces
2017-02-27 13:01:53 +05:30
mbauskar
a52f8c2453 [patch] reload document before running patch && remove whitespaces 2017-02-27 12:54:37 +05:30
Nabin Hait
6f9db9eb70 Merge pull request #2762 from mbauskar/feedback
[minor] feedback ratings document type filters
2017-02-27 12:25:52 +05:30
pratu16x7
aee1ab9cf9 [fix] awesomebar new option with/without new keyword 2017-02-27 12:22:38 +05:30
robert schouten
2b3f5db9da [hotfix] comply with imap and pop auth failed response (#2712)
* [hotfix] comply with imap and pop auth failed response

* simplified hotfix for imap and pop auth response
2017-02-27 12:09:46 +05:30
Faris Ansari
b373753c6a [fix] ControlDate set_input (#2767) 2017-02-27 11:15:22 +05:30
mbauskar
803e311f3a [minor] feedback request url 2017-02-27 11:03:15 +05:30
mbauskar
a29423bae2 [minor] feedback ratings document type filters 2017-02-27 10:54:16 +05:30
Nabin Hait
f2ef73bd3a Merge pull request #2760 from pratu16x7/search-fixes
Search fixes
2017-02-24 19:08:46 +05:30
pratu16x7
03083b3087 Keyboard nav: more link 2017-02-24 18:51:19 +05:30
pratu16x7
0a361dfd95 Keyboard nav: tab roll on results 2017-02-24 18:20:16 +05:30
pratu16x7
16c6c4003d Keyboard nav: sidebar and input focus 2017-02-24 18:02:05 +05:30
Rushabh Mehta
b005662d0d [fix] tests and show in website 2017-02-24 16:19:38 +05:30
Rushabh Mehta
c0ef741ce8 [hot] fix socket js 2017-02-24 16:01:30 +05:30
pratu16x7
db4a083a33 sidebar fixes 2017-02-24 15:10:56 +05:30
Rushabh Mehta
155cdff99b [fix] socket io limit doc_open and other minor fixes 2017-02-24 14:46:34 +05:30
Makarand Bauskar
b2aeaf222f Merge pull request #2727 from RobertSchouten/composer
communication composer recipient lookup improvements
2017-02-24 12:19:15 +05:30
Nabin Hait
173e776381 Merge pull request #2718 from mbauskar/feedback
[minor] Feedback Request fixes
2017-02-24 11:47:04 +05:30
Nabin Hait
9aad1c52c4 Merge pull request #2757 from rmehta/new-buttons
[enhance] add new buttons on form dashboards
2017-02-24 11:42:24 +05:30
Nabin Hait
31990abdef Merge pull request #2751 from rmehta/desktop-help
[enhance] add help messages in desktop
2017-02-24 11:30:29 +05:30
Nabin Hait
cdc168586a Update desktop.py 2017-02-24 11:30:03 +05:30
Nabin Hait
19fbb26131 Merge pull request #2722 from pratu16x7/minor-search-presets
Preset doctypes fields to Search
2017-02-24 11:29:07 +05:30
Nabin Hait
b10d8cfb0b Merge branch 'develop' into minor-search-presets 2017-02-24 11:28:51 +05:30
Nabin Hait
5a5f6e9b23 Merge pull request #2752 from mbauskar/develop
[minor] fixes for unbound local variable issue
2017-02-24 11:27:33 +05:30
Makarand Bauskar
d86c5e9f6f minor fixes for address and contact list rendering (#2759)
* [minor] check if contact_list & addr_list is available before rendering contact and address list

* [minor] hide new button if create permission is not available
2017-02-24 11:26:54 +05:30
pratu16x7
80f7c0079c languagify strings 2017-02-24 11:23:07 +05:30
Nabin Hait
89673b17f0 Merge pull request #2758 from mbauskar/custom-field-fix
[fixes] update db schema while updating the customizations
2017-02-24 11:08:18 +05:30
Nabin Hait
1472b572cf Merge pull request #2753 from KanchanChauhan/reference-doctype-editable
[Minor] Reference Doctype editable in Portal Menu
2017-02-24 11:07:04 +05:30
Nabin Hait
fcf12c424b Merge pull request #2754 from KanchanChauhan/documentation-fixes
[Fix] Documentation Fixes
2017-02-24 11:06:22 +05:30