Commit graph

14692 commits

Author SHA1 Message Date
Rushabh Mehta
10076fc53f Merge branch 'hotfix' 2017-09-29 16:12:36 +05:30
Rushabh Mehta
8682f87594 Merge branch 'master' into develop 2017-09-29 16:12:36 +05:30
Rushabh Mehta
6027fe67bc bumped to version 9.0.7 2017-09-29 16:42:36 +06:00
Rushabh Mehta
c06fda8de8 Merge pull request #4215 from rmehta/scroll-fix
[fix] for scrolling https://github.com/frappe/erpnext/issues/9088
2017-09-29 16:10:15 +05:30
Rushabh Mehta
5541c9e549 [fix] for scrolling https://github.com/frappe/erpnext/issues/9088 2017-09-29 15:33:58 +05:30
Rushabh Mehta
9728e62fa6 Merge pull request #4156 from OmarJaber/patch-1
RTL direction of chart reports
2017-09-29 15:14:55 +05:30
Rushabh Mehta
2248dbc819 Merge pull request #4165 from achillesrasquinha/develop
[MAJOR] WebCamera attachments, Desktop Wiggling, bench command, minor UX, better dev workflow, MariaDB@10.2 fix
2017-09-29 15:09:41 +05:30
Rushabh Mehta
2f1cf0f5ad Merge pull request #4188 from schilgod/addressfix
Add Email option to Address email_id field, so that Email is validated
2017-09-29 15:04:03 +05:30
Rushabh Mehta
cca0899bad Merge pull request #4214 from rmehta/validate-fix
[fix] validate links before calling controller triggers
2017-09-29 15:03:45 +05:30
Rushabh Mehta
09dcc1a8cb Merge pull request #4211 from rmehta/remove-filter-fix
[fix] remove filter
2017-09-29 15:03:37 +05:30
Rushabh Mehta
be4cbc1f4e Merge pull request #4210 from rmehta/defaut-title-in-email
[fix] default email subject should be title
2017-09-29 15:03:27 +05:30
Achilles Rasquinha
e2d87e7887 fix for mariadb@10.2 2017-09-29 13:35:35 +05:30
Nabin Hait
97037ce3f3 Fixes in test_runner (#4213) 2017-09-29 13:14:14 +05:30
Rushabh Mehta
267395f2a8 [fix] validate links before calling controller triggers 2017-09-29 13:07:16 +05:30
Rushabh Mehta
847714b64d [fix] filter bug for refresh 2017-09-29 12:20:45 +05:30
Rushabh Mehta
3cdebb9790 Merge pull request #4162 from rmehta/make-domain-on-import
[minor] automatically add restrict to domain if not added
2017-09-29 12:11:54 +05:30
Rushabh Mehta
630d30d89a [fix] remove filter 2017-09-29 12:10:34 +05:30
Achilles Rasquinha
0aa0e79aa7 [fix] wiggling 2017-09-29 11:07:42 +05:30
Nabin Hait
17c6383a29 Don't remove name while appending row 2017-09-29 10:53:37 +05:30
Rushabh Mehta
0a6b637681 [fix] default email subject should be title 2017-09-29 10:05:47 +05:30
Nabin Hait
5882fbd48b Create test records only if not exists in db 2017-09-28 18:58:15 +05:30
Nabin Hait
1e6916646a Remove name while appending row in child table 2017-09-28 18:58:15 +05:30
mbauskar
9c63471c56 Merge branch 'develop' into staging 2017-09-28 16:31:50 +05:30
Achilles Rasquinha
aeb00b7afa fixed codacy 2017-09-28 12:58:39 +05:30
Achilles Rasquinha
da76dd5f7a added this.wiggling for scope call 2017-09-28 12:42:45 +05:30
Achilles Rasquinha
0e775469c2 Merge branch 'develop' of github.com:achillesrasquinha/frappe into develop 2017-09-28 12:39:47 +05:30
Achilles Rasquinha
ae3099bfe4 removed whitespace 2017-09-28 12:38:41 +05:30
Achilles Rasquinha
ea030bcb9e added setup_wiggle function 2017-09-28 12:37:16 +05:30
Achilles Rasquinha
a33512aa38 added node_modules, working on webpack 2017-09-28 12:35:52 +05:30
Nabin Hait
e41e857257 Merge branch 'hotfix' 2017-09-28 12:26:51 +05:30
Nabin Hait
425606607d Merge branch 'master' into develop 2017-09-28 12:26:51 +05:30
Nabin Hait
4a6277cf05 bumped to version 9.0.6 2017-09-28 12:56:50 +06:00
Makarand Bauskar
780df0be60 [hotfix] pull emails from all incoming email accounts instead of enqueue single email account (#4199) 2017-09-28 12:14:00 +05:30
Makarand Bauskar
d0fd1482c4 [hotfix] ignore the disabled reports in sidebar Reports section (#4200) 2017-09-28 12:12:16 +05:30
Rushabh Mehta
935680d160 [minor] command to rebuild global search frappe/erpnext#10951 (#4205) 2017-09-28 12:11:25 +05:30
Rushabh Mehta
55a0dc2c07 Merge pull request #4207 from rmehta/totals-fix
[fix] totals in reportview.js
2017-09-28 12:08:26 +05:30
Rushabh Mehta
397444842e [fix] totals in reportview.js 2017-09-28 12:02:14 +05:30
Achilles Rasquinha
65a1cede89 Fixed mysqclient dependency 2017-09-28 11:49:29 +05:30
Rushabh Mehta
6c0c381e1a Merge pull request #4206 from frappe/revert-4186-report-builder
Revert "[ Fix ] Totals row not popped before appending more data"
2017-09-28 11:39:39 +05:30
Rushabh Mehta
140177391b Revert "[ Fix ] Totals row not popped before appending more data" 2017-09-28 11:39:27 +05:30
Rushabh Mehta
df196660d3 Merge pull request #4186 from Zlash65/report-builder
[ Fix ] Totals row not popped before appending more data
2017-09-28 11:25:56 +05:30
Achilles Rasquinha
5ac84f9683 Update requirements.txt 2017-09-27 23:30:00 +05:30
Nabin Hait
5cd8d4e8a0 Merge branch 'hotfix' 2017-09-27 18:25:14 +05:30
Nabin Hait
e9126dfce0 Merge branch 'master' into develop 2017-09-27 18:25:14 +05:30
Nabin Hait
0180b05a8b bumped to version 9.0.5 2017-09-27 18:55:14 +06:00
Rushabh Mehta
3b6ed442af [fix] frappe/erpnext#10939 2017-09-27 18:20:20 +05:30
Nabin Hait
da5bdcf513 Merge branch 'master' into develop 2017-09-27 17:27:04 +05:30
Nabin Hait
e689cb0230 Merge branch 'hotfix' 2017-09-27 17:27:03 +05:30
Nabin Hait
1dfce98096 bumped to version 9.0.4 2017-09-27 17:57:03 +06:00
Rushabh Mehta
32d87a92c3 [fix] revert to fallback if socketio does not start the first time (#4198) 2017-09-27 17:23:12 +05:30