Commit graph

16842 commits

Author SHA1 Message Date
Ameya Shenoy
04d255bc5f fix(update message): multiple fixes (#6275)
- added GitPython as a dependency
- use git describe to find the branch version
- prevent version popup for prereleases
- check for update weekly instead of daily
- fixed bug in check for update which used to compare minor version even
if there was a mismatch in comparing major versions

Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
2018-10-18 12:33:00 +05:30
rohitwaghchaure
e45a3660d0 [Fix] Invalid date format message in quick entry for date field (#6274) 2018-10-18 12:32:36 +05:30
Rushabh Mehta
b76eb03a65 fix(web): fixed container_attributes 2018-10-17 16:31:51 +05:30
Ameya Shenoy
7fb04a86f8
Merge branch 'staging-fixes' into staging 2018-10-17 09:42:40 +00:00
Ameya Shenoy
1cb0815faf bumped to version 11.0.3-beta.11 2018-10-17 09:42:39 +00:00
Ameya Shenoy
b9db2a43b8
Merge branch 'master' into staging-fixes 2018-10-17 09:02:49 +00:00
Ameya Shenoy
5668e7742e
Merge branch 'hotfix' 2018-10-17 09:02:44 +00:00
Ameya Shenoy
9a24ce1814 bumped to version 10.1.53 2018-10-17 09:02:44 +00:00
Faris Ansari
226c017283
Report fixes v11 (#6269)
* fix(Report): Update datatable for multi column filters

* fix(Report): Show totals for child table columns
2018-10-16 16:14:46 +05:30
rohitwaghchaure
ecc6b0257c
Merge pull request #6267 from rohitwaghchaure/report_breaking_if_no_data_is_found
[Fix] Prepared report breaking if no data
2018-10-16 14:28:02 +05:30
Rohit Waghchaure
b434457648 [Fix] Prepared report breaking if no data 2018-10-16 14:27:07 +05:30
rohitwaghchaure
603017a327
Merge pull request #6265 from rohitwaghchaure/between_filter_is_not_working
[Fix] Date between filter is not working
2018-10-16 13:02:45 +05:30
Rohit Waghchaure
2ce830a0f0 [Fix] Date between filter is not working 2018-10-16 12:50:30 +05:30
Faris Ansari
18bfb6df5a
fix(formatter): Item Link formatter when input is disabled (#6263) 2018-10-16 10:14:35 +05:30
Nabin Hait
226788468f Merge branch 'staging-fixes' into staging 2018-10-15 15:48:12 +05:30
Nabin Hait
75df32afe1 bumped to version 11.0.3-beta.10 2018-10-15 16:18:12 +06:00
Nabin Hait
1022e46608 Merge branch 'master' into staging-fixes 2018-10-15 15:39:35 +05:30
Nabin Hait
5966faa468 Merge branch 'hotfix' 2018-10-15 15:39:34 +05:30
Nabin Hait
d215fcd537 bumped to version 10.1.52 2018-10-15 16:09:34 +06:00
Charles-Henri Decultot
06c8aec7d9 Event patch correction (#6238) 2018-10-15 14:53:25 +05:30
rohitwaghchaure
b49e67982e [Fix] Forgot password is not working (#6255) 2018-10-15 14:53:10 +05:30
Nabin Hait
b218a16dc3 fix(name): naming of workflow action based on hash 2018-10-15 14:21:40 +05:30
Faris Ansari
efe2b281cb
fix(Report): Column key for child columns must be doctype:name (#6256)
- Column key should be same as the key sent by server for child rows
2018-10-15 12:45:29 +05:30
Rushabh Mehta
1f1a1ec810 fix(formatdate): always replace mm by MM for babel.dates 2018-10-15 10:34:17 +05:30
Rushabh Mehta
c0ba708ee5 fix(query_report): dont execute same query twice on change 2018-10-15 10:30:09 +05:30
Faris Ansari
6de4453b23 feat(Text Editor): Add table support (#6226)
* feat(Text Editor): Add table support

* fix: Table styling
2018-10-15 09:27:37 +05:30
Charles-Henri Decultot
278dfe44f5 Improve checkout UX (#6248) 2018-10-15 09:27:08 +05:30
Alchez
c0ebdec392 fix(formatter): display zero amounts as formatted currency values (#6227) 2018-10-15 09:26:34 +05:30
Suraj Shetty
199000c074 Fix inbox read-unread UI (#6253)
* Fix inbox read-unread UI

* Remove redundant seen class
2018-10-12 16:36:48 +05:30
Aditya Hase
dc9b377115 feat(debugger): Allow VS Code python debugger to work (#6216) 2018-10-12 15:12:25 +05:30
Faris Ansari
7aafeaf541
fix(formatter): Item Link formatter when input is disabled (#6252) 2018-10-12 14:13:20 +05:30
Saurabh
4c01d63825
Merge pull request #6250 from saurabh6790/get_reset_password_url
[fix] if redirect uri exists then automatically redirect the user
2018-10-11 17:51:04 +05:30
Saurabh
4eedf52560 [fix] if redirect uri exists then automatically redirect the user 2018-10-11 17:49:37 +05:30
Ameya Shenoy
4eac464387
Merge branch 'staging-fixes' into staging 2018-10-11 10:10:33 +00:00
Ameya Shenoy
eab3900466 bumped to version 11.0.3-beta.9 2018-10-11 10:10:33 +00:00
Zarrar
57933ff3f9 Timeline date fix (#6222) 2018-10-11 15:38:43 +05:30
Ameya Shenoy
c717dcac72 fix: python3 unicode not defined (#6233)
python 2 had unicode and basestring, however python 3 only has string

Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
2018-10-11 15:36:29 +05:30
Nabin Hait
56be85c934 User permissions patch fixes for skip-for-doctypes (#6229)
* fix(patch): Fixed skip_for_doctypes in User Permissions

* fix(address): Made address_title non-mandatory, because it is set based on links
2018-10-11 15:29:03 +05:30
Suraj Shetty
9dea3f1684 Revert permission changes (#6249) 2018-10-11 15:26:47 +05:30
Ameya Shenoy
1dbdb50c55 fix(dropbox): upgraded dropbox to 9.1.0 (#6234)
- also makes it compatible with python 3

Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
2018-10-11 15:21:43 +05:30
Saurabh
b40a679695
Merge pull request #6247 from saurabh6790/get_reset_pwd_url
get link to reset password only if setup wizard is not completed
2018-10-11 14:45:07 +05:30
Saurabh
66a2d81df7 get link to reset password only if setup wizard is not completed 2018-10-11 14:43:37 +05:30
Saurabh
279a5d63e9
Merge pull request #6246 from saurabh6790/get_reset_password_url
get link to reset password only if setup wizard is not completed
2018-10-11 14:41:09 +05:30
Saurabh
cdc2e17cbf get link to reset password only if setup wizard is not completed 2018-10-11 14:39:52 +05:30
Suraj Shetty
e85589f46c HTML Editor control (#6237)
* Add HTML editor

* Add HTML editor map to db_schema.py

* Revert permission change
- ref #6218

* Fix typo

* Add HTML Editor entry to customize form field

* Update customize_form_field.json

* Update permissions.py

* Debounce preview generation

* Translate strings
2018-10-11 14:07:16 +05:30
Ameya Shenoy
f4230e7c0d
Merge branch 'staging-fixes' into staging 2018-10-11 08:04:38 +00:00
Ameya Shenoy
47d2b43351 bumped to version 11.0.3-beta.8 2018-10-11 08:04:38 +00:00
Faris Ansari
6b19f0437a
Merge pull request #6245 from netchampfaris/datatable-hyperlist
fix: Update datatable to use Hyperlist
2018-10-11 13:27:52 +05:30
Faris Ansari
9b52061bdd fix: Show filter row always 2018-10-11 13:27:11 +05:30
Faris Ansari
3551e894c6 fix: Update datatable
- New DataTable uses hyperlist instead of clusterize to render
large number of rows
2018-10-11 13:22:19 +05:30