Aditya Duggal
873a85ca0e
Auto Email report limit can be set in site_config ( #4935 )
...
- Resolves #4934
- Set max_reports_per_user in site_config to an integer
2018-01-31 10:54:16 +05:30
Achilles Rasquinha
473d3eb6be
Fixes for Python 3 ( #4940 )
...
* Fixed dict_keys and lists
* [FIX] config.get keys must be list
* [FIX] pickle all objects
* [FIX] get versions in unicode
* [FIX] get log versions
* debugging
* Fixed commit ID reference
* Fixed branch reference
* Fixed doc keys to list
* [LOG] test log
* [LOG] test log
* Convert iterators to list
* removed logs
* [FIX] Trial to load templates
* Fixed codacy
2018-01-31 10:51:13 +05:30
Nabin Hait
0a8664c3b7
Merge branch 'master' into develop
2018-01-30 19:02:36 +05:30
Nabin Hait
8b59ccadaa
Merge branch 'hotfix'
2018-01-30 19:02:34 +05:30
Nabin Hait
1bac7fa2a7
bumped to version 10.0.18
2018-01-30 19:32:34 +06:00
Nabin Hait
63fbff77ae
Escape value for using in mysql regexp
2018-01-30 19:01:34 +05:30
Nabin Hait
428d1d7a6e
Fixed merge conflict
2018-01-30 18:18:46 +05:30
Nabin Hait
8f34968ae7
Merge branch 'hotfix'
2018-01-30 18:17:20 +05:30
Nabin Hait
5fba05d3f3
bumped to version 10.0.17
2018-01-30 18:47:20 +06:00
Nabin Hait
c328c27f85
minor fix
2018-01-30 15:35:25 +05:30
Nabin Hait
19e4126175
Removed ui-tests from travis
2018-01-30 15:10:31 +05:30
Nabin Hait
ae950bfff4
Removed ui-tests from travis
2018-01-30 15:02:50 +05:30
Nabin Hait
3ee048e40b
Removed ui-tests from travis
2018-01-30 14:57:20 +05:30
tundebabzy
f9870937ea
add columns property to render_grid argument ( #4930 )
2018-01-30 14:47:51 +05:30
Saurabh
8498bf8ea2
resolved merged conflicts
2018-01-29 16:15:56 +05:30
Saurabh
787cd86478
Merge branch 'hotfix'
2018-01-29 16:11:19 +05:30
Saurabh
2308f01988
bumped to version 10.0.16
2018-01-29 16:41:19 +06:00
Achilles Rasquinha
6a40f8c24c
Merge pull request #4932 from raghukamath/chat-background
...
Add new chat background
2018-01-29 14:56:39 +05:30
Raghavendra Kamath
5f3d7f7778
Add new chat background
2018-01-29 14:27:52 +05:30
Achilles Rasquinha
9ed77be84f
Merge pull request #4925 from achillesrasquinha/frappe.get_version
...
frappe.get_version
2018-01-26 18:40:45 +05:30
Achilles Rasquinha
8bae34eb2f
frappe.get_version
2018-01-26 18:16:01 +05:30
Rushabh Mehta
8f0465f57e
[fix] socketio.js for firefox
2018-01-25 17:46:38 +05:30
Achilles Rasquinha
dc6737b12a
Merge pull request #4922 from achillesrasquinha/chat-fixes
...
Fixed Vertical Spacing
2018-01-25 15:11:34 +05:30
tundebabzy
f33af55263
Filtering Sales Invoice against Sales Order lists Sales Invoice's items in ROW #12265 ( #4763 )
...
* add group by information
* extra documentation
* add list_renderer.group_by
* jsdocs
* jsdocs
2018-01-25 15:07:24 +05:30
Achilles Rasquinha
4604e20c60
Fixed vertical spacing
2018-01-25 14:57:08 +05:30
Achilles Rasquinha
6ed2cd44bb
Merge pull request #4920 from achillesrasquinha/chat-fixes
...
Fix Typing Toggling
2018-01-25 11:07:40 +05:30
Achilles Rasquinha
a4c0d6dfbb
chat fixes
2018-01-25 10:33:51 +05:30
Achilles Rasquinha
b07b8d5580
Merge pull request #4918 from achillesrasquinha/auto-mysql
...
[bench mysql autocomplete] fallback to mysql if not exists.
2018-01-24 22:41:24 +05:30
Achilles Rasquinha
2d5276e7ee
Minor, fallback to mysql if not exists
2018-01-24 22:29:07 +05:30
Achilles Rasquinha
789e3749d6
Merge pull request #4917 from achillesrasquinha/chat-fixes
...
Added Push notifications, spaces-to-tabs, fixed textarea issue for Firefox.
2018-01-24 20:02:07 +05:30
Achilles Rasquinha
4443dfc75c
Added Push notifications, spaces-to-tabs, fixed textarea issue
2018-01-24 19:38:31 +05:30
Saurabh
8342095c1d
Merge branch 'master' into develop
2018-01-24 19:35:02 +05:30
Saurabh
9ee8678bcb
Merge branch 'hotfix'
2018-01-24 19:35:01 +05:30
Saurabh
cb6342a565
bumped to version 10.0.15
2018-01-24 20:05:01 +06:00
Saurabh
dd19556619
Merge pull request #4916 from saurabh6790/custom_button_fix
...
[fix] check for exact label match to avoid duplication
2018-01-24 19:34:19 +05:30
Saurabh
2876d05cb5
Merge pull request #4915 from saurabh6790/custom_button_fix
...
[fix] check for exact label match to avoid duplication
2018-01-24 19:31:18 +05:30
Saurabh
7fbeb0afee
[fix] check for exact label match to avoid duplication
2018-01-24 19:25:42 +05:30
Achilles Rasquinha
95e21b6ab2
Merge pull request #4912 from achillesrasquinha/auto-mysql
...
bench mysql autocompletion
2018-01-24 19:15:43 +05:30
Achilles Rasquinha
80fcc8a51d
Merge pull request #4911 from achillesrasquinha/chat-fixes
...
Fixed positioning issue for Firefox
2018-01-24 17:42:01 +05:30
Achilles Rasquinha
8d43417a29
Added mysql auto completion
2018-01-24 17:20:10 +05:30
Achilles Rasquinha
7add0b32a8
Fixed Padding Issue
2018-01-24 16:54:27 +05:30
Achilles Rasquinha
7225b28b54
Fixed positioning issue for Firefox
2018-01-24 16:47:03 +05:30
Faris Ansari
1569a22ec5
[fix] Apply filters for child table in list view ( #4907 )
2018-01-24 15:29:56 +05:30
Rushabh Mehta
68f4a9ed4b
[fix] ascii only
2018-01-24 14:44:05 +05:30
Prateeksha Singh
557c9442b0
Merge pull request #4906 from netchampfaris/eslint-brace-style
...
[eslint] Enforce brace style
2018-01-24 12:45:18 +05:30
Faris Ansari
663bdcb955
[eslint] Enforce brace style
2018-01-24 12:19:23 +05:30
Achilles Rasquinha
928573616f
Allman to 1TBS (Brace Styling). ( #4899 )
...
* Allman to Stroustrup
* Fixed Parser
* enforced stroustrup
* Revert "Fixed Parser"
This reverts commit a731063c039ad198719464ff573ab59cf1ba8e06.
* reverted to 1tbs
* Fixed Style
2018-01-24 12:01:06 +05:30
Faris Ansari
1b0fb0bd9f
[fix] Results height in search dialog ( #4903 )
2018-01-24 11:31:15 +05:30
Saurabh
2e994bd300
Merge branch 'master' into develop
2018-01-24 11:17:24 +05:30
Saurabh
ad57b47136
Merge branch 'hotfix'
2018-01-24 11:17:23 +05:30
