Commit graph

11698 commits

Author SHA1 Message Date
Nabin Hait
2f024ddbb2 Merge pull request #2792 from KanchanChauhan/webpage-title
[Fix] Webpage title fix
2017-03-02 12:39:42 +05:30
Nabin Hait
df1a596b44 Merge branch 'master' into develop 2017-03-02 12:37:37 +05:30
Nabin Hait
76dea9c4aa Merge branch 'hotfix' 2017-03-02 12:37:36 +05:30
Nabin Hait
cf0b897a5e bumped to version 7.2.24 2017-03-02 13:07:36 +06:00
Kanchan Chauhan
8f58649905 [Fix] Webpage title fix 2017-03-02 12:35:56 +05:30
Rushabh Mehta
96dd947111 [minor] add progress in desktop help message 2017-03-02 11:12:55 +05:30
Nabin Hait
29d771d0c0 Merge branch 'master' into develop 2017-03-01 15:08:28 +05:30
Nabin Hait
494f39de78 Merge branch 'hotfix' 2017-03-01 15:08:27 +05:30
Nabin Hait
4f9676b221 bumped to version 7.2.23 2017-03-01 15:38:27 +06:00
Nabin Hait
299a998cf7 Update control.js 2017-03-01 15:07:20 +05:30
Nabin Hait
2e0ef33647 Merge branch 'master' into develop 2017-02-28 18:42:07 +05:30
Nabin Hait
d1e573dba8 Merge branch 'hotfix' 2017-02-28 18:42:06 +05:30
Nabin Hait
c567869136 bumped to version 7.2.22 2017-02-28 19:12:06 +06:00
Rushabh Mehta
488cff68bc [minor] update mixpanel analytics 2017-02-28 18:41:16 +05:30
Nabin Hait
181ca977b5 Merge branch 'master' into develop 2017-02-28 18:07:01 +05:30
Nabin Hait
c0d96ba0d7 Merge branch 'hotfix' 2017-02-28 18:07:01 +05:30
Nabin Hait
f997ea68c3 bumped to version 7.2.21 2017-02-28 18:37:01 +06:00
Rushabh Mehta
ef9bd517e2 [minor] add app analytics 2017-02-28 18:05:10 +05:30
Rushabh Mehta
5aadce54be [minor] add app analytics 2017-02-28 17:58:50 +05:30
Rushabh Mehta
75855de5bb [minor] fixes to web form, listview, add portal items via hooks 2017-02-28 17:49:45 +05:30
Revant Nandgaonkar
6ca4984907 Merge pull request #2781 from mntechnique/oauth-refresh-token-user-fix
[Fix] set user from refresh token if not found
2017-02-28 16:24:54 +05:30
Revant Nandgaonkar
511a7e2dde [Fix] set user from refresh token if not found
Use frappe.db.get_value instead of frappe.get_doc
to fetch value of user from bearer/refresh_token
2017-02-28 15:51:23 +05:30
Nabin Hait
403a4d5d57 Merge pull request #2779 from mbauskar/hotfix
[minor] filter missing fixes in Report View
2017-02-28 15:40:24 +05:30
Nabin Hait
2704c7cbab Merge pull request #2782 from nabinhait/develop
Show indicator only if save enabled
2017-02-28 15:24:00 +05:30
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
Nabin Hait
ffd30d6c93 Show indicator only if save enabled 2017-02-28 15:14:48 +05:30
Revant Nandgaonkar
94d9f2c48e [Fix] set user from refresh token if not found 2017-02-28 13:58:29 +05:30
Kanchan Chauhan
a81721ef91 [Fix] Image not allowed in Data Import Tool 2017-02-28 13:27:06 +05:30
mbauskar
1619a63b08 [minor] filter missing fixes in Report View 2017-02-28 12:55:23 +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
3b10f61541 Merge branch 'hotfix' 2017-02-27 14:30:21 +05:30
Nabin Hait
78447337d7 Merge branch 'master' into develop 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