Faris Ansari
e617dfbf98
Don't show submit, cancel, amend buttons for non submittable doctypes ( #4448 )
2017-11-10 14:21:06 +05:30
Saurabh
9615619710
[fix] merge-conflicts
2017-11-10 13:12:09 +05:30
Saurabh
b9855e82d3
Merge branch 'hotfix'
2017-11-10 13:09:42 +05:30
Saurabh
84cfd7c682
bumped to version 9.2.10
2017-11-10 13:39:42 +06:00
ci2014
9d608d7178
Optimize regex to find parent of mail ( #4440 )
...
Made the Regex case insensitive and changed the regex to show only the lowercase (which will save some space). Added the aw and wg for german answer and forwarding.
I will add more languages based on this list https://en.wikipedia.org/wiki/List_of_email_subject_abbreviations after more research.
2017-11-10 12:37:17 +05:30
ci2014
0ff005fcc5
More flexible close / reopen button for ToDo ( #4433 )
...
Make the close and reopen button for flexible for multiple status and custom status, like here:
https://github.com/frappe/erpnext/pull/11381
2017-11-10 12:24:20 +05:30
Manas Solanki
3c7683e6a1
option to logout from all devices while changing password ( #4419 )
2017-11-10 12:11:22 +05:30
Yaqin Shurrab
e8f4c16c7c
[hotfix] bring throttling limit from site_config rather than a fixed "60" ( #4400 )
...
* bring throttling limit from site_config rather than from a fixed 60
* update key
2017-11-10 12:00:26 +05:30
Nabin Hait
4ef61f3f30
Merge branch 'develop' into staging
2017-11-10 11:47:26 +05:30
Prateeksha Singh
192037842d
[hotfix] Dynamic Link in list filters ( #4455 )
...
* fix dynamic link in list filters
* search parent in cur_page if not in cur_list
2017-11-10 11:33:10 +05:30
Nabin Hait
e7beaacc9e
Nestedset model fixes for changing parent and renaming ( #4436 )
...
* Nestedset model fixes for changing parent
* Rename function of File
2017-11-10 11:11:59 +05:30
Faris Ansari
20dd8de0c1
[fix] Unlimited refresh in user form ( #4457 )
2017-11-09 17:44:26 +05:30
Prateeksha Singh
748bc1156b
Merge pull request #4452 from pratu16x7/hotfix
...
[minor][hotfix] initialize script property in page.py
2017-11-08 18:04:28 +05:30
pratu16x7
0685a56a53
[minor][hotfix] initialize script property in page.py
2017-11-08 18:01:45 +05:30
Saurabh
715d335bf2
Merge branch 'hotfix'
2017-11-08 15:10:28 +05:30
Saurabh
d1db1ec5ab
Merge branch 'master' into develop
2017-11-08 15:10:28 +05:30
Saurabh
46e0566a56
bumped to version 9.2.9
2017-11-08 15:40:28 +06:00
Saurabh
6e7bdba8a6
[fix] catch Link Validation exception ( #4446 )
2017-11-08 14:57:37 +05:30
Saurabh
408be48a15
Merge branch 'staging'
2017-11-08 12:08:34 +05:30
Saurabh
ea2442c402
Merge branch 'master' into develop
2017-11-08 12:08:34 +05:30
Saurabh
7150c7b997
bumped to version 9.2.8
2017-11-08 12:38:34 +06:00
Saurabh
d66ef8fab5
Merge branch 'master' into staging
2017-11-08 12:03:44 +05:30
Saurabh
517f62fc23
Merge branch 'hotfix'
2017-11-08 12:03:43 +05:30
Saurabh
8f07515b45
Merge branch 'master' into develop
2017-11-08 12:03:43 +05:30
Saurabh
8ef42b4ed6
bumped to version 9.2.7
2017-11-08 12:33:43 +06:00
ci2014
254043171e
Add no_letterhead to form_dict ( #4444 )
...
no_letterhead in form_dict was missing
2017-11-08 11:37:56 +05:30
Faris Ansari
61277ad734
[fix] Render count in list, translate string ( #4445 )
2017-11-08 11:37:37 +05:30
Achilles Rasquinha
3343153365
Remove psutil ( #4437 )
2017-11-06 18:38:05 +05:30
Saurabh
bdc87d437a
[fix] set skip_errors params from data import tool ( #4438 )
2017-11-06 17:26:29 +05:30
Achilles Rasquinha
b8825ca116
Pure Python MySQL instead mysqlclient (with Python C API) ( #4280 )
...
* added PyMYSQL instead mysqlclient-python
* added pymysql import
* fixed db module import
* foxed self._conn wrapper
* updated cursor migration
* removed existent converters
* some more fixes towards API port
* modified travis
* updated doctype and revereted yml
* modified travis
* refreshed logging
* raw fix
* moved from hard coded constants to declarable instances
* moved from hard coded constants to declarable instances
* refactoring and logging
* moved to global import declaration
* fixed codacy
* unfixed codacy
* minor fix
* binary_type has a single
* deprecated alternative
* merged with latest
* fixed merge conflicts
* using deprecated alternative
* raw fix
* stupid fix
* using StringTypes instead
* brutal hack
* log
* tundebazy to the rescue
* fixed content_hash error
* frappe/database.py
* frappe/database.py
* updated database.py
* updated requirements
* updated requirements
* fixed codacy
* fixed codacy
* moved from DatabaseOperationalError to pymysql.InternalError
* moved from DatabaseOperationalError to pymysql.InternalError
* fixed codacy
* empty commit
* fixed codacy
* fixed codacy
2017-11-06 16:42:01 +05:30
Prateeksha Singh
a29a46d2ed
Merge pull request #4427 from rohitwaghchaure/illegal_char_issue_export
...
[fix] Not able to export general ledger report's data if data has illegal characters
2017-11-06 16:35:18 +05:30
Prateeksha Singh
50d55c93cf
Merge pull request #4432 from pratu16x7/hotfix1
...
[hotfix] setup complete state colors
2017-11-06 10:12:29 +05:30
pratu16x7
e9209151cf
[fix] setup complete state colors
2017-11-06 10:10:01 +05:30
Prateeksha Singh
f583f33093
Merge pull request #4431 from frappe/revert-4430-hotfix
...
Revert "[hotfix] setup complete state colors"
2017-11-06 10:07:22 +05:30
Prateeksha Singh
5d0c7c9e6b
Revert "[hotfix] setup complete state colors"
2017-11-06 10:05:39 +05:30
Prateeksha Singh
909bab0bad
Merge pull request #4430 from pratu16x7/hotfix
...
[hotfix] setup complete state colors
2017-11-06 10:03:22 +05:30
pratu16x7
e90abdfc58
[fix] setup complete state colors
2017-11-06 09:58:05 +05:30
Saurabh
3d4fadb3fa
Merge branch 'master' into staging
2017-11-03 17:01:07 +05:30
Saurabh
c2e5e76992
Merge branch 'hotfix'
2017-11-03 17:01:07 +05:30
Saurabh
9a6424bfdb
Merge branch 'master' into develop
2017-11-03 17:01:07 +05:30
Saurabh
e8efebf1c4
bumped to version 9.2.6
2017-11-03 17:31:07 +06:00
Nabin Hait
010a32d95a
[fix] Header for sms send request ( #4417 )
2017-11-03 16:20:53 +05:30
Rohit Waghchaure
f8928dc999
[fix] Not able to export general ledger report's data if data has illegal characters
2017-11-03 15:01:42 +05:30
Faris Ansari
ab8de1d83f
New Control: MultiSelect ( #4425 )
...
* New Control: MultiSelect
* fix codacy
2017-11-03 14:57:56 +05:30
Prateeksha Singh
9046041971
Merge pull request #4411 from shreyashah115/heatmap_fix
...
[Fix] HeatMap on Activity page
2017-11-03 14:15:18 +05:30
Zarrar
d29e280d14
[Fix] Workflow ui test dependency ( #4421 )
...
* timer increased, role selection removed
* used return promise instead of timeout
2017-11-03 13:37:48 +05:30
rohitwaghchaure
de7c6be9ed
[hotfix] User not able to modify modules in the user form ( #4415 )
2017-11-03 12:53:38 +05:30
Ameya Shenoy
c27dc5a68b
Added the colors white and black ( #4402 )
...
* Added the colors, `white` and `black`
* Update colors.js
2017-11-03 12:52:42 +05:30
ci2014
81d683bae2
Fix filters dismiss button ( #4412 )
...
Keep the dismiss button near to the filter
2017-11-03 12:14:50 +05:30
Saurabh
62b771494a
Merge branch 'master' into staging
2017-11-03 11:52:59 +05:30
