Commit graph

17740 commits

Author SHA1 Message Date
N. Emre Özbakır
feded55c4b
fix: Typo of TR-Turkish
fixed wrong typo of Turkish in respected language.
2019-04-05 22:08:45 +03:00
Saurabh
fb4ef2e3d2 Merge branch 'hotfix' 2019-04-05 16:39:04 +05:30
Saurabh
1972ff2375 bumped to version 11.1.19 2019-04-05 17:09:04 +06:00
Suraj Shetty
25282d471e fix: Export parent fields while exporting fixtures (#7199)
To allow the export of doctypes like "Custom DocPerm" which needs parent fields.
2019-04-05 11:28:53 +05:30
Suraj Shetty
d22206a992 fix: Fix export customisation (#7198)
convert `sync_on_migrate` and `with_permissions` from string to Int
2019-04-04 14:49:52 +05:30
Suraj Shetty
fc29318c0b fix: use .get to avoid key error (#7184) 2019-04-04 12:01:35 +05:30
Suraj Shetty
8911ecba47
Merge pull request #7176 from netchampfaris/preserve-state-query-report
fix: Preserve state in query report
2019-04-04 11:52:08 +05:30
Aditya Hase
52da1476e3 fix: Raise exception if apps are on incompatible branches (#7177) 2019-04-04 10:38:06 +05:30
Suraj Shetty
1da87a5108
Merge pull request #7169 from pipech/master
fix(workflow): fixed workflow action btn doesn't setup properly
2019-04-04 09:20:01 +05:30
Suraj Shetty
ee8cfa9d65
Merge pull request #7194 from netchampfaris/datatable-not-equals-filter
feat(DataTable): Add not equals (!=) filter
2019-04-04 08:46:14 +05:30
Faris Ansari
55ba40a71e feat(DataTable): Add not equals (!=) filter 2019-04-03 23:19:59 +05:30
rohitwaghchaure
3d0573988d
Merge pull request #7190 from rohitwaghchaure/ignore_user_permissions_not_working_hotfix
fix: user ignore permissions not working at server side
2019-04-03 12:28:23 +05:30
Suraj Shetty
3dd85b56ab
Merge pull request #7167 from adityahase/xss-fix-hotfix
fix(blog): Fix possible reflected XSS attack vector
2019-04-02 19:12:17 +05:30
Rohit Waghchaure
0fa1b9cab4 fix: user ignore permissions not working at server side 2019-04-02 18:57:13 +05:30
Deepesh Garg
117bb6398d
Merge pull request #7182 from netchampfaris/user-activity-update
fix: Update user activity using ORM
2019-04-01 17:08:03 +05:30
Faris Ansari
b963868f61 fix: Update user activity using ORM 2019-04-01 16:14:17 +05:30
Suraj Shetty
e00578e1b3
Merge pull request #7170 from netchampfaris/datatable-column-resize
fix: Datatable fixes
2019-04-01 11:06:48 +05:30
Faris Ansari
9f7aea9a99 fix: Preserve state in query report
After navigating back to a query report, the filters were setup again,
we can skip that and do nothing to preserve state.
2019-04-01 10:54:58 +05:30
Faris Ansari
406c829c51 fix: Add fast-deep-equal as a dependency 2019-04-01 10:37:53 +05:30
Faris Ansari
b7c273f548
fix: Over usage of space was not handled (#7123)
- Show a message to buy space if space is overused
2019-03-30 23:39:47 +05:30
Faris Ansari
1bc8e53d01 fix: Disable linting on deep_equal util 2019-03-30 23:30:25 +05:30
Faris Ansari
b23347d0d3 fix: Save column widths in Custom Reports 2019-03-30 23:16:28 +05:30
Faris Ansari
da9ae10946 fix: Datatable fixes
- Remove minWidth limit
- Double click to resize to perfect width
2019-03-30 18:37:50 +05:30
pipeCh
4ebaf098ee fix(workflow): fixed workflow btn doesn't setup properly 2019-03-30 16:59:20 +07:00
Saurabh
68655daf24 Merge branch 'hotfix' 2019-03-30 14:59:37 +05:30
Saurabh
fac0ddf62f bumped to version 11.1.18 2019-03-30 15:29:37 +06:00
Aditya Hase
2fa19c2506 fix(blog): Fix possible reflected XSS attack vector 2019-03-30 12:01:08 +05:30
Himanshu
4a5536c12f fix: 'wrapper for __onload' (#7160) 2019-03-29 20:21:40 +05:30
Faris Ansari
bca0573373
fix: Handle row which can be dict while printing (#7161) 2019-03-29 20:13:56 +05:30
Kenneth Sequeira
80b78c576f feat: View Password On Login Page (#7148) 2019-03-29 19:23:39 +05:30
Rushabh Mehta
d3a2122ef9
Merge pull request #7152 from netchampfaris/unescape-traceback-hotfix
fix: Dont escape tracebacks in errprint
2019-03-28 17:49:57 +05:30
Faris Ansari
70246946b2 fix: Dont escape tracebacks in errprint 2019-03-28 15:05:23 +05:30
Rushabh Mehta
26fd184a9b
Merge pull request #7151 from netchampfaris/socketio-local-hotfix
fix: Use local copy of socketio
2019-03-28 14:05:56 +05:30
Sahil Khan
c2b4d28246 Merge branch 'hotfix' 2019-03-28 13:22:14 +05:30
Sahil Khan
bfb96d7639 bumped to version 11.1.17 2019-03-28 13:42:14 +05:50
Suraj Shetty
73c1f531e8 fix: Set default only if the dependent field is set (#7130)
Client side fix
https://github.com/frappe/frappe/pull/7004
2019-03-28 11:46:51 +05:30
Kenneth Sequeira
664bc680bd fix: Add Currency Yemeni Rial (#7131)
Closes issue https://github.com/frappe/erpnext/issues/16956
2019-03-28 11:44:19 +05:30
Faris Ansari
3a60bc79ce fix: Use local copy of socketio 2019-03-28 11:38:33 +05:30
Prateeksha Singh
4c73590294
Merge pull request #7146 from pratu16x7/hotfix-set-chart
fix(set_chart): Don't truncate null labels
2019-03-27 18:34:09 +05:30
Prateeksha Singh
e49cb8f9f3 fix(set_chart): Don't truncate null labels 2019-03-27 18:32:12 +05:30
rohitwaghchaure
698b0011b1 fix: exported data of report showing blank in the excel file (#7141) 2019-03-27 15:11:12 +05:30
Rushabh Mehta
64b2d38d6a fix(style): setup wizard 2019-03-27 09:15:14 +05:30
Suraj Shetty
aea425d13d fix: convert name of docs to string (#7127)
- filter used to skip docs with numerical names
2019-03-25 20:18:35 +05:30
Deepesh Garg
bd03fd5e16 fix: Formatting issue in print_grid template (#7122)
Before:
![Screenshot 2019-03-25 at 2 32 27 PM](https://user-images.githubusercontent.com/42651287/54908358-b288f500-4f0d-11e9-9271-1ef0baffcb9e.png)

After:
![Screenshot 2019-03-25 at 2 42 51 PM](https://user-images.githubusercontent.com/42651287/54908369-bc125d00-4f0d-11e9-82ff-f2b5f575a5a5.png)
2019-03-25 15:52:06 +05:30
Himanshu
7dc1fec27c feat(Naming Series): Option to Add field_value in Naming Series (#7027)
To use field_value in naming_series, just add field_name in curly braces instead of the old naming convention which was kinda confusing and not easily understandable.
eg: {field_name}.-.YYYY.-.MM.-.DD.-.####
2019-03-25 11:43:08 +05:30
Frappe Bot
b7b061105f Merge branch 'hotfix' 2019-03-23 07:21:22 +00:00
Frappe Bot
30bc0f95ad bumped to version 11.1.16 2019-03-23 07:21:22 +00:00
Rushabh Mehta
aae2c0e4e7
Merge pull request #7110 from khadijazaki/master
fix: indentation error in validate_email_address
2019-03-23 11:54:16 +05:30
khadijazaki
946cea700a fixed indentation error 2019-03-22 17:38:35 +05:00
Chinmay Pai
3c6b6dfcdf
Merge pull request #7104 from sahil28297/fix_email
fix: proxied 'validate_email_add'
2019-03-22 15:46:02 +05:30