Aditya Hase
f7b7387b46
Explicitly convert filter to list wherever necessary
2017-09-04 16:05:58 +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
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
mbauskar
9d4767ae3f
Merge branch 'master' into develop
2017-08-09 16:01:42 +05:30
rohitwaghchaure
8e362dfe56
[Fix] User not able to delete if it's linked with the communication ( #3884 )
2017-08-09 15:33:15 +05:30
Rushabh Mehta
925e5922eb
[minor] cleaned code from user.js
2017-08-08 14:35:07 +05:30
Rushabh Mehta
bc4d46a362
[fix] style and move setup to system settings
2017-08-08 14:29:22 +05:30
Rushabh Mehta
4e42ed65e1
Merge branch 'twofactor' of https://github.com/manqala/frappe into manqala-twofactor
2017-08-08 11:58:22 +05:30
Faris Ansari
44ee24aa75
Colors in Event Calendar using color picker ( #3857 )
...
* Add Color field to Event, show colored event in calendar
* [minor] handle edge cases
* Fix test boilerplate
* Add test for event
* fix codacy
* fix test
2017-08-07 13:36:27 +05:30
B H Boma
64048e14ac
Enable 2fa in sites config instead of system settings, also enabled for admin
2017-08-04 15:59:29 +01:00
Rushabh Mehta
4e95122918
[tests] dont show alert if in test
2017-08-03 17:17:48 +05:30
Rushabh Mehta
3af5d51a41
[style] cleanup tags
2017-08-03 15:34:02 +05:30
Aditya Hase
62bb03ef6e
Replaced Python 2 print syntax with Python 3 syntax ( #3838 )
...
* Replaced Python 2 print syntax with Python 3 syntax
* Update utils.py
2017-08-02 17:10:40 +05:30
Aditya Hase
16a9bdfd31
Replaced urllib.unquote imports with six.moves.urllib.parse.unquote ( #3836 )
2017-08-02 17:09:31 +05:30
Aditya Hase
ec9a01e3aa
Replaced 'except' clause syntax ( #3827 )
2017-08-02 16:58:24 +05:30
Aditya Hase
e6bd1e4995
Replaced all instances of 'unicode' with 'six.text_type' ( #3825 )
2017-08-02 16:57:39 +05:30
Aditya Hase
774c5fd2c6
Replaced mixed usage of tabs and spaces for indents with tabs only ( #3828 )
2017-08-01 11:53:58 +05:30
mbauskar
b1e70892d3
Merge branch 'master' into develop
2017-07-31 12:20:10 +05:30
Aditya Hase
d3395dfd28
Replaced StringIO and cStringIO imports with six.StringIO ( #3810 )
...
StringIO and cStringIO modules are replaced with io.StringIO in
Python 3. six.StringIO is an alias for StringIO.StringIO in
Python 2 and io.StringIO in Python 3
2017-07-31 10:54:17 +05:30
rohitwaghchaure
4396cbd0cc
[Fix] Getting an error datetime.datetime is not iterable during importing purchase invoice data ( #3818 )
2017-07-31 10:15:06 +05:30
ckosiegbu
08743b8100
Changes to OTP settings in System Settings
2017-07-31 02:06:23 +01:00
ckosiegbu
8265acfa1d
Correcting issue with System Settings json file
2017-07-31 01:16:40 +01:00
