Rushabh Mehta
|
33caea5e21
|
Merge pull request #4023 from schilgod/develop
Bypass 2FA if user login from restricted IP Address
|
2017-09-14 11:23:16 +05:30 |
|
Rushabh Mehta
|
0642343940
|
[tests] test_runner.js show full js stack
|
2017-09-13 14:04:04 +05:30 |
|
Nabin Hait
|
7266e673ac
|
Merge branch 'master' into develop
|
2017-09-12 16:09:19 +05:30 |
|
Nabin Hait
|
bd5d7717e7
|
Disable custom checkbox for doctype if not administrator or in developer mode (#4092)
|
2017-09-12 15:46:41 +05:30 |
|
Sunny
|
df343aec64
|
merge with upstream/frappe
|
2017-09-07 16:04:55 +08:00 |
|
Sunny
|
a99216482d
|
merge with upstream/frappe
|
2017-09-07 15:56:05 +08:00 |
|
Sunny
|
cfd35d414b
|
correct field name and field value
|
2017-09-07 15:17:35 +08:00 |
|
Sunny
|
d902975080
|
Bypass 2FA if user login from restricted IP Address
|
2017-09-07 15:17:35 +08:00 |
|
mbauskar
|
cf3ba70e3e
|
Merge branch 'master' into develop
|
2017-09-07 11:49:20 +05:30 |
|
Makarand Bauskar
|
5a30cca165
|
[hotfix] fixed attachement issue on CommunicationComposer while reply from Communication (#4078)
|
2017-09-07 11:47:09 +05:30 |
|
Makarand Bauskar
|
6e6fb684ec
|
[hotfix] dont Patch Log, Module Def in Permission Manager (#4070)
|
2017-09-06 16:15:37 +05:30 |
|
Rushabh Mehta
|
44a7db75ca
|
Merge pull request #4056 from mbauskar/boilerplate
[minor] create the test_doctype_name.py for single doctype
|
2017-09-06 10:46:59 +05:30 |
|
Rushabh Mehta
|
df3fbd082a
|
Merge pull request #4057 from netchampfaris/file-thumbnail-crop
Add crop option to make_thumbnail
|
2017-09-06 10:46:34 +05:30 |
|
Rushabh Mehta
|
46eee356ff
|
Merge pull request #4058 from pratu16x7/setup-fixes
[setup] suppress post-setup messages
|
2017-09-05 12:20:50 +05:30 |
|
pratu16x7
|
276f5b5631
|
[setup] suppress post-setup messages
|
2017-09-05 12:15:43 +05:30 |
|
Faris Ansari
|
bb981536dc
|
Add crop option to make_thumbnail
|
2017-09-05 12:12:20 +05:30 |
|
mbauskar
|
046a294ef9
|
[minor] create the test_doctype_name.py for single doctype
|
2017-09-05 11:03:44 +05:30 |
|
Aditya Hase
|
f7b7387b46
|
Explicitly convert filter to list wherever necessary
|
2017-09-04 16:05:58 +05:30 |
|
mbauskar
|
ad704aaa2a
|
Merge branch 'master' into staging
|
2017-09-04 14:49:25 +05:30 |
|
mbauskar
|
eb6c04fca1
|
Merge branch 'master' into develop
|
2017-09-04 14:49:24 +05:30 |
|
mbauskar
|
cb87bb5b58
|
[hotfix] delete attachment first before deleting parent doc
|
2017-09-04 14:41:12 +05:30 |
|
Rushabh Mehta
|
a8a10a9d72
|
Merge pull request #3882 from pratu16x7/user-progress
User Progress dialog
|
2017-09-04 11:13:35 +05:30 |
|
mbauskar
|
bc733beaf3
|
Merge branch 'master' into staging
|
2017-08-31 15:31:04 +05:30 |
|
mbauskar
|
677abfb57e
|
Merge branch 'master' into develop
|
2017-08-31 15:31:04 +05:30 |
|
pratu16x7
|
7d2c96b2d4
|
[progress] add is_first_startup flag to show dialog
|
2017-08-31 14:57:14 +05:30 |
|
mbauskar
|
3e3b20d646
|
[hotfix] only display allow_after_submit property if doctype is submittable
|
2017-08-30 01:04:09 +05:30 |
|
Manas Solanki
|
899fe860d1
|
sorted the select in permission manager as per translated string
|
2017-08-28 11:38:46 +05:30 |
|
Rushabh Mehta
|
9d51c42c7a
|
Merge pull request #3984 from adityahase/install3
Python 3 compatibility fixes
|
2017-08-24 18:31:05 +05:30 |
|
Rushabh Mehta
|
fdb8e7d7b3
|
Merge pull request #3976 from rmehta/domain-restrict-fix
[fix] restrict domains, fixes frappe/erpnext#9813, frappe/erpnext#10235
|
2017-08-24 18:30:40 +05:30 |
|
Rushabh Mehta
|
efe88591c2
|
Merge branch 'master' into staging
|
2017-08-24 16:51:28 +05:30 |
|
Rushabh Mehta
|
2377434d39
|
Merge branch 'master' into develop
|
2017-08-24 16:51:27 +05:30 |
|
Rushabh Mehta
|
b6a17de4a9
|
Merge pull request #3993 from rmehta/file-delete-message
[fix] show better message for permission to delete file
|
2017-08-24 16:50:47 +05:30 |
|
Aditya Hase
|
cfc97ba3b6
|
Convert filter to list before checking length
|
2017-08-24 16:34:44 +05:30 |
|
Rushabh Mehta
|
e8c7b046ee
|
[fix] show better message for permission to delete file
|
2017-08-24 16:21:39 +05:30 |
|
Rushabh Mehta
|
4e456b4e42
|
[fix] importer.py, allow for truncated rows due to xls import
|
2017-08-24 15:49:47 +05:30 |
|
Rushabh Mehta
|
6b45f8a988
|
[minor] send me a copy is sticky, fixes frappe/erpnext#2367 (#3974)
|
2017-08-23 18:19:20 +05:30 |
|
Rushabh Mehta
|
146247c17d
|
[fix] notification filters, fixes frappe/erpnext#9982 (#3977)
|
2017-08-23 18:06:03 +05:30 |
|
Rushabh Mehta
|
09a31f5ec0
|
[fix] tests
|
2017-08-23 15:37:08 +05:30 |
|
mbauskar
|
7efd470c0d
|
Merge branch 'master' into develop
|
2017-08-23 13:05:20 +05:30 |
|
Nabin Hait
|
ebaee98ecb
|
Don't show single and child table doctype in User Permission's allowed doctypes (#3973)
|
2017-08-23 11:22:33 +05:30 |
|
ci2014
|
341e71ae86
|
Update file.py
There were problems with Image links from Facebook for example, because they have and need ?parameter1=abc¶meter2=def in their address.
|
2017-08-18 15:39:38 +02:00 |
|
mbauskar
|
612afbfdb0
|
resolved merge conflicts
|
2017-08-16 18:25:35 +05:30 |
|
mbauskar
|
bc603de8be
|
resolved conflicts
|
2017-08-16 18:24:21 +05:30 |
|
Robert Kirschner
|
67668684ab
|
[minor] fix of translatable terms
|
2017-08-14 13:12:30 +02:00 |
|
Rushabh Mehta
|
ccdf8e846d
|
Merge pull request #3925 from ci2014/patch-9
Update file.py
|
2017-08-14 11:03:01 +05:30 |
|
mbauskar
|
7870c3225e
|
Merge branch 'master' into staging
|
2017-08-14 09:29:43 +05:30 |
|
mbauskar
|
66bef9e1da
|
Merge branch 'master' into develop
|
2017-08-14 09:29:42 +05:30 |
|
ci2014
|
e0b30b1f53
|
Update file.py
Give developers the ability to generate several sizes of thumbnails.
|
2017-08-11 19:25:19 +02:00 |
|
mbauskar
|
5c8bd63a7c
|
[hotfix] don't allow no value fields in the search fields
|
2017-08-11 11:44:11 +05:30 |
|
Aditya Hase
|
769338f136
|
Replaced all instances of basestring with six.string_types
|
2017-08-11 00:10:11 +05:30 |
|