Commit graph

11021 commits

Author SHA1 Message Date
Nabin Hait
8443debfdf Merge branch 'hotfix' 2016-12-21 11:40:52 +05:30
Nabin Hait
865ecde1cb bumped to version 7.1.28 2016-12-21 12:10:52 +06:00
Nabin Hait
065b514be3 Merge pull request #2481 from rmehta/security-fixes
[security] fixed
2016-12-21 11:34:20 +05:30
Rushabh Mehta
68e14d40c2 [security] fixed 2016-12-21 11:17:24 +05:30
Nabin Hait
7dbe38e37a Merge branch 'hotfix' 2016-12-20 11:34:42 +05:30
Nabin Hait
b5e6589710 bumped to version 7.1.27 2016-12-20 12:04:42 +06:00
Nabin Hait
38e5e2aad8 Merge pull request #2476 from rmehta/fix-dropbox-for-site-config
[fix] dropbox access for site_config
2016-12-19 16:20:38 +05:30
Rushabh Mehta
a74a9d1afe [fix] dropbox access for site_config 2016-12-19 12:59:27 +05:30
Saurabh
d976ea5e65 [fix] clear custom buttons on service change #7229 (#2468) 2016-12-16 12:41:23 +05:30
Nabin Hait
fcc9ccbafc Merge branch 'hotfix' 2016-12-15 16:36:44 +05:30
Nabin Hait
f1633408f0 bumped to version 7.1.26 2016-12-15 17:06:44 +06:00
Nabin Hait
b32c1806c3 Merge pull request #2459 from saurabh6790/tree_click_fix
[fix] anchor click fix for tree
2016-12-15 11:13:30 +05:30
Saurabh
8f60e0dd8e [fix] anchor click fix for tree 2016-12-14 17:23:04 +05:30
Nabin Hait
efff206af2 Merge pull request #2455 from saurabh6790/website_permissions
[fix][minor] dpctype as kargs to has_permissions
2016-12-14 13:10:50 +05:30
Saurabh
7656d8b821 [fix][minor] dpctype as kargs to has_permissions 2016-12-13 19:36:09 +05:30
Nabin Hait
5ed01b6331 Merge branch 'hotfix' 2016-12-13 14:21:18 +05:30
Nabin Hait
29025bf917 bumped to version 7.1.25 2016-12-13 14:51:18 +06:00
Nabin Hait
04ad313eab Remove web forms on uninstalling app (#2446) 2016-12-13 13:00:08 +05:30
Nabin Hait
1bc35a6926 Merge branch 'hotfix' 2016-12-08 12:32:19 +05:30
Nabin Hait
203ca857db bumped to version 7.1.24 2016-12-08 13:02:19 +06:00
Nabin Hait
8d947dfc4c Merge pull request #2426 from rmehta/print-format-custom-fix
[fix] render from custom template if custom_html is set in print format
2016-12-08 12:21:45 +05:30
Nabin Hait
5c3213ffa8 Update report.py 2016-12-08 12:18:04 +05:30
robert schouten
acfb0996cf hide disabled reports (#2427)
* hide disabled reports

* Update moduleview.py
2016-12-07 14:40:39 +05:30
Saurabh
cff4af8323 [fix] schduler call fix (#2423) 2016-12-07 11:31:32 +05:30
robert schouten
bfadc9f81f move email group with newsletter (#2416) 2016-12-07 11:27:41 +05:30
Rushabh Mehta
e26619bf26 [minor] js fix 2016-12-06 19:16:08 +05:30
Rushabh Mehta
d0175628ce [fix] render from custom template if custom_html is set in print format 2016-12-06 19:09:00 +05:30
Nabin Hait
dd53ed0f75 Merge branch 'hotfix' 2016-12-06 16:53:54 +05:30
Nabin Hait
efd35845e3 bumped to version 7.1.23 2016-12-06 17:23:54 +06:00
Nabin Hait
1d5b903a4d Merge pull request #2424 from nabinhait/hotfix
Fixed patch
2016-12-06 16:52:35 +05:30
Nabin Hait
03e7957cd6 Fixed patch 2016-12-06 16:52:03 +05:30
Nabin Hait
c99179746d Merge branch 'hotfix' 2016-12-06 16:09:08 +05:30
Nabin Hait
d48f6f433e bumped to version 7.1.22 2016-12-06 16:39:07 +06:00
Nabin Hait
2f2e80b0a1 Merge pull request #2421 from nabinhait/hotfix
Hotfix
2016-12-06 16:06:51 +05:30
Nabin Hait
961071b311 removed print statements 2016-12-06 16:05:26 +05:30
Rohit Waghchaure
82ac63e5ac [Fix] Total row not working in the report for the report builder type 2016-12-06 16:05:26 +05:30
Nabin Hait
cd0f5e76c6 [fix] Set filter values as default only if no_copy is not marked (#2413) 2016-12-05 18:24:03 +05:30
robert schouten
4996c94e75 [fix] error log dont update modified on seen (#2411) 2016-12-05 14:54:02 +05:30
robert schouten
cfba598717 [fix] communication doc patch minimise dataset returned to prevent memory overflow (#2403) 2016-12-05 14:53:33 +05:30
rohitwaghchaure
2850830fc0 Language field missing in the translation doctype (#2406) 2016-12-05 14:52:31 +05:30
Shreyas Patil
4b31d0cdd5 [Minor] Updated condition to validate allowed email report per user (#2386)
* [Fix] Updated condition to allow only 3 reports per user

* [fix] different conditions for insert and update
2016-12-05 14:17:55 +05:30
Nabin Hait
4593e1e6f3 Merge pull request #2397 from RobertSchouten/cancelmessage
improved error messages for canceled links
2016-12-01 16:11:32 +05:30
robert schouten
9c8edaed04 improved error messages for canceled links 2016-12-01 11:26:57 +08:00
Nabin Hait
72968424ef Merge pull request #2396 from rohitwaghchaure/rename_optimization
Optimize rename doc query
2016-11-30 16:40:16 +05:30
Rohit Waghchaure
516adec87d rename optimization 2016-11-30 15:26:37 +05:30
Nabin Hait
2f8fc3e969 Merge branch 'hotfix' 2016-11-30 12:13:56 +05:30
Nabin Hait
63f803e7b9 bumped to version 7.1.21 2016-11-30 12:43:56 +06:00
Nabin Hait
579713e901 Merge pull request #2387 from shreyasp/set-only-once-issue
[Minor] convert date type to string when field is set as 'set_only_once' or constant
2016-11-30 12:10:06 +05:30
Nabin Hait
8ce6717201 Merge pull request #2391 from mmoksh/fix-db-deadlock
Delete child table rows without causing database deadlock
2016-11-30 12:07:22 +05:30
Nabin Hait
f84d843424 Merge pull request #2393 from nabinhait/hotfix
[URGENT] Prevent accessing sensitive files in client.get_js
2016-11-30 12:04:13 +05:30