Nabin Hait
1de3b597ac
Merge branch 'master' into develop
2017-01-13 14:33:23 +05:30
Nabin Hait
e0c2163aaf
bumped to version 7.2.9
2017-01-13 15:03:23 +06:00
Rushabh Mehta
3f91c9455f
[enhance] custom perms
2017-01-11 17:34:55 +05:30
Nabin Hait
3a2642e3f7
Merge branch 'master' into develop
2017-01-10 18:00:52 +05:30
Nabin Hait
0c3760c439
bumped to version 7.2.8
2017-01-10 18:30:51 +06:00
Rushabh Mehta
0618b98c92
[minor] cleanup to comment update and maintenance mode page
2017-01-10 17:50:36 +05:30
Rushabh Mehta
042e2b09cb
[design] Redesign, cleanup Login, Message pages ( #2564 )
...
* [cleanup] login, message pages
* [style] cleanups
* [cleanup]
* [cleanup] update password
* [fix] name for web form (fixes edit-profile)
2017-01-10 14:44:42 +05:30
Nabin Hait
f67b5e3b32
Merge branch 'master' into develop
2017-01-10 12:23:35 +05:30
Nabin Hait
625565db5c
bumped to version 7.2.7
2017-01-10 12:53:34 +06:00
Nabin Hait
f928d7e708
fixed conflict
2017-01-09 16:55:40 +05:30
Nabin Hait
02cc23cf89
bumped to version 7.2.6
2017-01-09 16:34:32 +06:00
Nabin Hait
4112407391
Reload in_standard_filter property
2017-01-06 12:56:04 +05:30
KanchanChauhan
c0a685aa24
Email ID renamed to Email Address ( #2541 )
2017-01-05 14:55:51 +05:30
Nabin Hait
f60a808074
Merge branch 'master' into develop
2016-12-30 14:45:58 +05:30
Nabin Hait
15d08e611b
bumped to version 7.2.5
2016-12-30 15:15:57 +06:00
Rushabh Mehta
d989a95472
[feature] document versioning #2469 ( #2523 )
...
* [feature] document versioning #2469
* [minor] remove on_update from WebsiteGenerator
* [fix] delete shares when deleting user
* [test] don't run delete in background if test
* [fix] test_db
* [added] Deleted Document
* [fix] added track_changes in all documents
* [fix] add to deleted only if exists
* [fix] in_install flag in deleted documents
* [minor] name will always be reset
2016-12-29 18:01:42 +05:30
Nabin Hait
3bb9af2801
Merge pull request #2511 from rmehta/auto-email-fixes
...
[fix] formatting and modified filters for auto email report, fixes frappe/erpnext#7081 and frappe/erpnext#7147
2016-12-29 13:11:49 +05:30
Nabin Hait
2d7c6ffa81
bumped to version 7.2.4
2016-12-28 12:48:30 +06:00
Nabin Hait
82448297c7
bumped to version 7.2.3
2016-12-28 11:38:12 +06:00
Nabin Hait
46229be379
bumped to version 7.2.2
2016-12-27 14:55:59 +06:00
Rushabh Mehta
eabceaec56
[fix] formatting and modified filters for auto email report, fixes frappe/erpnext#7081 and frappe/erpnext#7147
2016-12-26 13:03:57 +05:30
Nabin Hait
37277b2a1e
bumped to version 7.2.1
2016-12-24 15:27:07 +06:00
Nabin Hait
f2bc961e1b
Fixed merge conflict
2016-12-23 17:35:38 +05:30
Nabin Hait
4b23110806
bumped to version 7.2.0
2016-12-23 18:05:03 +06:00
Nabin Hait
26507591d9
Update __init__.py
2016-12-23 16:59:42 +05:30
Nabin Hait
b9b5a0246d
Merge branch 'master' into develop
2016-12-21 17:37:36 +05:30
Nabin Hait
930e0bba9c
bumped to version 7.1.29
2016-12-21 18:07:35 +06:00
Nabin Hait
5330158d65
Merge branch 'master' into develop
2016-12-21 11:40:53 +05:30
Nabin Hait
865ecde1cb
bumped to version 7.1.28
2016-12-21 12:10:52 +06:00
Rushabh Mehta
451faeeef5
Merge branch 'v7.2.0-beta' into develop
2016-12-21 11:27:11 +05:30
Rushabh Mehta
a6d5cec95c
[minor] unicode fix for frappe/erpnext#7070 ( #2478 )
2016-12-20 16:21:50 +05:30
Rushabh Mehta
e858797290
Merge branch 'v7.2.0-beta' into develop
2016-12-20 12:36:25 +05:30
Rushabh Mehta
5d7eb494a0
[minor] frappe.as_unicode
2016-12-20 12:35:59 +05:30
Nabin Hait
a3cd960eed
fixed version conflict
2016-12-20 11:35:28 +05:30
Nabin Hait
b5e6589710
bumped to version 7.1.27
2016-12-20 12:04:42 +06:00
Nabin Hait
21e3f671d0
changed version to beta
2016-12-15 19:33:49 +05:30
Nabin Hait
dbc122f223
Merge branch 'master' into develop
2016-12-15 16:36:45 +05:30
Nabin Hait
f1633408f0
bumped to version 7.1.26
2016-12-15 17:06:44 +06:00
robert schouten
c044c476a8
move message_id threading to communication to work with inbox ( #2458 )
...
* move message_id threading to communication to work with inbox
* move message_id threading fix
* rebase fix
* reset threading to email queue but keep in communications
2016-12-15 14:50:52 +05:30
robert schouten
efa86c6e31
Email cc in headers if expose recipients ( #2441 )
...
* move email cc to header
* [test fixes] move email cc to header
* email cc additional tests
* email cc cleanup and unsubsribe link test
* email cc permit footer based cc with expose_recipient and tests + ui
2016-12-15 09:49:54 +05:30
Saurabh
7656d8b821
[fix][minor] dpctype as kargs to has_permissions
2016-12-13 19:36:09 +05:30
Nabin Hait
a70925926f
Merge branch 'master' into develop
2016-12-13 14:21:19 +05:30
Nabin Hait
29025bf917
bumped to version 7.1.25
2016-12-13 14:51:18 +06:00
Nabin Hait
958d8ea6c0
Merge branch 'master' into develop
2016-12-08 12:32:20 +05:30
Nabin Hait
203ca857db
bumped to version 7.1.24
2016-12-08 13:02:19 +06:00
Nabin Hait
f73e8d0404
Merge branch 'master' into develop
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
c52dc83256
Fixed merge conflict
2016-12-06 16:12:32 +05:30
Nabin Hait
d48f6f433e
bumped to version 7.1.22
2016-12-06 16:39:07 +06:00
Nabin Hait
47ecf4c513
Merge branch 'master' into develop
2016-11-30 12:13:56 +05:30
