Anand Doshi
|
687f424ccf
|
[minor] remove gevent-socketio requirement
|
10 years ago |
Anand Doshi
|
bd4c3aec06
|
Merge branch 'v6-wip' into develop
|
10 years ago |
Anand Doshi
|
c9782e23e4
|
Merge remote-tracking branch 'frappe/develop' into v6-wip
Conflicts:
frappe/__version__.py
frappe/core/doctype/communication/communication.json
frappe/hooks.py
frappe/model/document.py
frappe/public/css/form.css
frappe/public/less/form.less
requirements.txt
setup.py
|
10 years ago |
Anand Doshi
|
8dee19e87c
|
Merge branch 'develop'
|
10 years ago |
Anand Doshi
|
8c7e164c9b
|
bumped to version 5.4.2
|
10 years ago |
Anand Doshi
|
1c40823da8
|
Merge pull request #1255 from JesusTinoco/patch-1
Watchdog version updated
|
10 years ago |
Jesus Tinoco
|
f76fd58698
|
Watchdog version updated
Executing the 'bench init frappe-bench' command in OSX the latest version of watchdog fails. Using watchdog 0.8.0 it works properly.
|
10 years ago |
Rushabh Mehta
|
9dbd96af27
|
[travis] use bench start & with cache
|
10 years ago |
Rushabh Mehta
|
74bc524416
|
[test] fix test_async
|
10 years ago |
Rushabh Mehta
|
438d4caee2
|
Merge pull request #1254 from pdvyas/v6-wip
[v6] fix data import test case
|
10 years ago |
Rushabh Mehta
|
21d5aaa47c
|
[added] alternate desktop (listified) for ios app
|
10 years ago |
Anand Doshi
|
13a98656ca
|
Merge branch 'develop'
|
10 years ago |
Anand Doshi
|
464050bfbf
|
bumped to version 5.4.1
|
10 years ago |
Anand Doshi
|
ac2312e9ab
|
[fix] dynamic link checking during cancel
|
10 years ago |
Rushabh Mehta
|
748cac0d99
|
[enhancement] added 'assigned by me' in todo list
|
10 years ago |
Pratik Vyas
|
c3229a5828
|
[v6] fix data import test case
|
10 years ago |
Anand Doshi
|
a56b892539
|
Merge branch 'develop'
|
10 years ago |
Anand Doshi
|
0da2710c63
|
bumped to version 5.4.0
|
10 years ago |
Anand Doshi
|
a5914cc55b
|
[change-log]
|
10 years ago |
Rushabh Mehta
|
5cbfecc299
|
[minor] added currency for Ghana, fixes frappe/erpnext#3795
|
10 years ago |
Anand Doshi
|
37e699e67e
|
[fix] get the first ip address in X-Forwarded-For
|
10 years ago |
Anand Doshi
|
fdc29441e1
|
[css] don't use rtl hack for ID, as it has some unpredictable behaviour
|
10 years ago |
Rushabh Mehta
|
7e290587ef
|
[minor] fixes #1238
|
10 years ago |
Anand Doshi
|
a1ea29a5b7
|
Merge pull request #1249 from neilLasrado/develop
Multiple fixes
|
10 years ago |
Rushabh Mehta
|
028114ad83
|
[enhancement] assign to myself, #1241
|
10 years ago |
Rushabh Mehta
|
04ccac6df3
|
[minor] abs url #1247, fix for form message
|
10 years ago |
Neil Trini Lasrado
|
3c6d22f9b6
|
Fixed issues with toggle display
|
10 years ago |
Neil Trini Lasrado
|
35606178f7
|
Added set value to dialog
|
10 years ago |
Anand Doshi
|
dc89aee13f
|
[fix] In Web Form, if logged in and no record found, set new=1
|
10 years ago |
Anand Doshi
|
1120382987
|
Merge pull request #1248 from anandpdoshi/dropping-unique-via-customize
[fix] Add/Drop unique based on property setter
|
10 years ago |
Anand Doshi
|
f525520788
|
[fix] Add/Drop unique based on property setter
|
10 years ago |
Anand Doshi
|
3afd9209e6
|
Merge pull request #1246 from anandpdoshi/hash-cache-fix
[fix] missing hash cache clearing and breadcrumbs fix
|
10 years ago |
Anand Doshi
|
ab2ac94d10
|
[minor] removed pyopenssl from requirements
|
10 years ago |
Anand Doshi
|
154bdd82e7
|
[minor] website permissions
|
10 years ago |
Anand Doshi
|
755c7be7fa
|
[fix] missing hash cache clearing and breadcrumbs fix
|
10 years ago |
Rushabh Mehta
|
78b390eb47
|
[fix] check dynamic links before cancel
|
10 years ago |
Rushabh Mehta
|
0e2f85357f
|
[fix] check dynamic links before cancel
|
10 years ago |
Rushabh Mehta
|
8c97be9e2e
|
[minor] return btn for frm.add_custom_button
|
10 years ago |
Rushabh Mehta
|
50366d5302
|
[minor] return btn for frm.add_custom_button
|
10 years ago |
Anand Doshi
|
1afe32bfb3
|
Merge pull request #1219 from anandpdoshi/mandrill-integration
Mandrill integration edits
|
10 years ago |
Anand Doshi
|
c079e27d3f
|
Moved Backup Manager and Social Login keys to the new Integrations Module, prepared frappe for Mandrill Integration
|
10 years ago |
Rushabh Mehta
|
a7bd640b24
|
[merge] 5.3.1
|
10 years ago |
Rushabh Mehta
|
4441a69b97
|
[minor] allow selects in dynamic links
|
10 years ago |
Rushabh Mehta
|
c36accbc60
|
[minor] avoid adding standard reply twice
|
10 years ago |
Rushabh Mehta
|
341e268a22
|
[minor] related to pull #1207
|
10 years ago |
Rushabh Mehta
|
cee86fc03f
|
Merge pull request #1240 from dottenbr/about-footer-change
Changed footer date in About to 2015 from 2014
|
10 years ago |
Rushabh Mehta
|
20ffbd4dbb
|
Merge pull request #1239 from dottenbr/formatter_fix
formatter fix for '<table' recognition
|
10 years ago |
Rushabh Mehta
|
8d55cad71b
|
Merge pull request #1236 from nabinhait/develop
Set workflow state on cancellation
|
10 years ago |
Dominik
|
eb9b52a5a5
|
Changed footer date in About to 2015 from 2014
|
10 years ago |
Dominik
|
90c7e96552
|
formatter fix for '<table' recognition
|
10 years ago |