Rushabh Mehta
636c662048
[patch] added patch for migration
2017-01-12 15:48:49 +05:30
Rushabh Mehta
3f91c9455f
[enhance] custom perms
2017-01-11 17:34:55 +05:30
Rushabh Mehta
349c321f14
[fix] boilerplate for new app
2017-01-11 12:14:42 +05:30
Rushabh Mehta
c3561b504b
[fix] boilerplate for new app
2017-01-11 11:16:19 +05:30
Rushabh Mehta
0618b98c92
[minor] cleanup to comment update and maintenance mode page
2017-01-10 17:50:36 +05:30
Valmik
1d2a91c393
Added docs to boilerplate for hooks ( #2561 )
2017-01-10 14:39:38 +05:30
KanchanChauhan
9fe9536f58
Added method to get report URL ( #2549 )
...
* Added method to get report URL
* Update auto_email_report.py
2017-01-05 17:18:23 +05:30
KanchanChauhan
c0a685aa24
Email ID renamed to Email Address ( #2541 )
2017-01-05 14:55:51 +05:30
Rushabh Mehta
cfe44f28d5
[fix] patch + some updates to bot
2016-12-31 11:27:12 +05:30
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
Rushabh Mehta
b765f38acc
[fix] gravatar md5 encoding, frappe/erpnext#7145
2016-12-28 17:55:09 +05:30
Nabin Hait
1447ee7e3c
Merge branch 'master' into develop
2016-12-28 12:18:30 +05:30
Nabin Hait
ec42dcd4f7
minor fix for function import
2016-12-28 12:17:32 +05:30
Nabin Hait
7b570af50d
Merge branch 'master' into develop
2016-12-28 11:08:12 +05:30
Saurabh
f246cc3810
[fix] reset simultaneous sessions after disabling users
2016-12-27 19:20:17 +05:30
Rushabh Mehta
05268603cf
[fix] delete attachments last, fixes #978
2016-12-27 15:34:42 +05:30
Rushabh Mehta
4fcd372921
[minor] [hot] bad import
2016-12-27 13:00:52 +05:30
Rushabh Mehta
67de814f26
[fix] missing translations #2494
2016-12-27 12:58:58 +05:30
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
f2bc961e1b
Fixed merge conflict
2016-12-23 17:35:38 +05:30
Nabin Hait
b9b5a0246d
Merge branch 'master' into develop
2016-12-21 17:37:36 +05:30
Saurabh
0577fcff3b
[fix] exclude one user with system manger role while pulling active users list
2016-12-21 13:31:37 +05:30
Rushabh Mehta
17d78e2bbb
[fix] email validation
2016-12-21 12:41:51 +05:30
Saurabh
b627342a9b
[fix] testcase fix for deactivating additional users after limit set
2016-12-21 12:34:28 +05:30
Saurabh
86ebaf22aa
[fix] dissable additiona users by creation date
2016-12-21 12:34:28 +05:30
Rushabh Mehta
1f8f1ef2dc
[fix] filter can_import with can_create, fixes frappe/erpnext#6966
2016-12-21 11:39:05 +05:30
Rushabh Mehta
a6d5cec95c
[minor] unicode fix for frappe/erpnext#7070 ( #2478 )
2016-12-20 16:21:50 +05:30
Rushabh Mehta
5d7eb494a0
[minor] frappe.as_unicode
2016-12-20 12:35:59 +05:30
Rushabh Mehta
db25d89d00
[fix] password strength (via error snapshot)
2016-12-20 11:38:19 +05:30
Rushabh Mehta
ac69247325
[feature] checkboxes in grid #2451
2016-12-15 14:48:43 +05:30
Rushabh Mehta
ca97204bdb
[fix] tests + add google analytics id in docs
2016-12-09 16:39:38 +05:30
Nabin Hait
958d8ea6c0
Merge branch 'master' into develop
2016-12-08 12:32:20 +05:30
robert schouten
acfb0996cf
hide disabled reports ( #2427 )
...
* hide disabled reports
* Update moduleview.py
2016-12-07 14:40:39 +05:30
KanchanChauhan
054d0f663f
Invalid language error on creation of Language ( #2390 )
2016-12-05 18:20:36 +05:30
Rushabh Mehta
c67d3bfe01
Add attachment from email and copy attachments to Communication Record ( #2412 )
...
* Carry over file attachments in email communications
* [fix] style
2016-12-05 14:59:00 +05:30
Rushabh Mehta
7bc7e3bc63
Upgrade Font Awesome ( #2410 )
...
* Font-Awesome V3.x to V4.x
Font-Awesome V3.x to V4.x
* Font Tidy
Font Tidy
* FA4 Upgrade - Html Js & Json
FA4 Upgrade - Html Js & Json
* Minor
Minor
2016-12-05 13:07:03 +05:30
Nabin Hait
4cf123bd8f
Fixed merge conflict
2016-11-28 14:25:11 +05:30
Rushabh Mehta
4bd2285159
File Based Locking at Document Level ( #2374 )
...
* [redesign] improved locking in documents and redesigned recent documents
* [minor] patch to update doctype in existing documents
2016-11-25 16:14:00 +05:30
rohitwaghchaure
e03d56adb6
[Fix] Multiple letter head printing issue on print format ( #2365 )
2016-11-25 16:10:42 +05:30
Faris Ansari
81ef23ab0b
pdf prompt for orientation ( #2358 )
2016-11-25 16:01:00 +05:30
Saurabh
6b3bf22462
[enhance] set last active time to user
2016-11-22 12:12:34 +05:30
Rushabh Mehta
7c8652fbf2
[docs] added some style and some fixes ( #2352 )
2016-11-22 10:55:32 +05:30
Rushabh Mehta
a099690e8f
Revert "[optimize] remove count(*) from queries" ( #2353 )
2016-11-22 10:55:13 +05:30
Rushabh Mehta
3c7c17215d
[fix] fix toc for docs, url for local and other fixes #2293 ( #2346 )
2016-11-21 16:43:16 +05:30
Rushabh Mehta
0ff140fa2b
[optimize] remove count(*) from queries
2016-11-21 14:58:18 +05:30
Rushabh Mehta
a256e029b6
[minor] UI fixes ( #2345 )
2016-11-21 13:29:36 +05:30
Rushabh Mehta
fac7f1e31b
[fix] [hot] hset bug
2016-11-19 17:16:49 +05:30
Rushabh Mehta
ddbf3d2662
[fix] always save site encoded keys in local and redis
2016-11-18 18:37:15 +05:30
robert schouten
5ede870700
daterangepicker now as control for filtering ( #2324 )
...
* daterangepicker now as control for filtering
* rename daterange picker options
* cleanup name reference
* allow greater control of daterangepicker options
* Update data.py
comma + space
2016-11-18 14:03:56 +05:30