Anand Doshi
|
f2ccbc864f
|
[fix] Allow appending to communication, don't pull sent email
|
2015-08-17 14:07:29 +05:30 |
|
Anand Doshi
|
687f424ccf
|
[minor] remove gevent-socketio requirement
|
2015-08-17 14:04:18 +05:30 |
|
Anand Doshi
|
bd4c3aec06
|
Merge branch 'v6-wip' into develop
|
2015-08-17 12:22:21 +05:30 |
|
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
|
2015-08-17 12:22:02 +05:30 |
|
Anand Doshi
|
8dee19e87c
|
Merge branch 'develop'
|
2015-08-14 17:53:09 +05:30 |
|
Anand Doshi
|
8c7e164c9b
|
bumped to version 5.4.2
|
2015-08-14 18:23:09 +06:00 |
|
Anand Doshi
|
1c40823da8
|
Merge pull request #1255 from JesusTinoco/patch-1
Watchdog version updated
|
2015-08-14 16:31:25 +05:30 |
|
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.
|
2015-08-14 12:29:45 +02:00 |
|
Rushabh Mehta
|
9dbd96af27
|
[travis] use bench start & with cache
|
2015-08-14 15:31:58 +05:30 |
|
Rushabh Mehta
|
74bc524416
|
[test] fix test_async
|
2015-08-14 15:08:40 +05:30 |
|
Rushabh Mehta
|
438d4caee2
|
Merge pull request #1254 from pdvyas/v6-wip
[v6] fix data import test case
|
2015-08-14 14:42:14 +05:30 |
|
Rushabh Mehta
|
21d5aaa47c
|
[added] alternate desktop (listified) for ios app
|
2015-08-14 14:22:18 +05:30 |
|
Anand Doshi
|
13a98656ca
|
Merge branch 'develop'
|
2015-08-14 12:57:41 +05:30 |
|
Anand Doshi
|
464050bfbf
|
bumped to version 5.4.1
|
2015-08-14 13:27:40 +06:00 |
|
Anand Doshi
|
ac2312e9ab
|
[fix] dynamic link checking during cancel
|
2015-08-14 12:48:55 +05:30 |
|
Rushabh Mehta
|
748cac0d99
|
[enhancement] added 'assigned by me' in todo list
|
2015-08-14 12:19:35 +05:30 |
|
Pratik Vyas
|
c3229a5828
|
[v6] fix data import test case
|
2015-08-13 23:03:35 -07:00 |
|
Anand Doshi
|
a56b892539
|
Merge branch 'develop'
|
2015-08-13 15:42:50 +05:30 |
|
Anand Doshi
|
0da2710c63
|
bumped to version 5.4.0
|
2015-08-13 16:12:50 +06:00 |
|
Anand Doshi
|
a5914cc55b
|
[change-log]
|
2015-08-13 15:14:39 +05:30 |
|
Rushabh Mehta
|
5cbfecc299
|
[minor] added currency for Ghana, fixes frappe/erpnext#3795
|
2015-08-13 13:01:50 +05:30 |
|
Anand Doshi
|
37e699e67e
|
[fix] get the first ip address in X-Forwarded-For
|
2015-08-13 12:43:09 +05:30 |
|
Anand Doshi
|
fdc29441e1
|
[css] don't use rtl hack for ID, as it has some unpredictable behaviour
|
2015-08-13 12:26:29 +05:30 |
|
Rushabh Mehta
|
7e290587ef
|
[minor] fixes #1238
|
2015-08-13 12:17:29 +05:30 |
|
Anand Doshi
|
a1ea29a5b7
|
Merge pull request #1249 from neilLasrado/develop
Multiple fixes
|
2015-08-13 12:14:30 +05:30 |
|
Rushabh Mehta
|
028114ad83
|
[enhancement] assign to myself, #1241
|
2015-08-13 12:08:25 +05:30 |
|
Rushabh Mehta
|
04ccac6df3
|
[minor] abs url #1247, fix for form message
|
2015-08-13 12:01:20 +05:30 |
|
Neil Trini Lasrado
|
3c6d22f9b6
|
Fixed issues with toggle display
|
2015-08-12 20:36:27 +05:30 |
|
Neil Trini Lasrado
|
35606178f7
|
Added set value to dialog
|
2015-08-12 19:47:53 +05:30 |
|
Anand Doshi
|
dc89aee13f
|
[fix] In Web Form, if logged in and no record found, set new=1
|
2015-08-12 19:23:49 +05:30 |
|
Anand Doshi
|
1120382987
|
Merge pull request #1248 from anandpdoshi/dropping-unique-via-customize
[fix] Add/Drop unique based on property setter
|
2015-08-12 15:05:17 +05:30 |
|
Anand Doshi
|
f525520788
|
[fix] Add/Drop unique based on property setter
|
2015-08-12 14:48:50 +05:30 |
|
Anand Doshi
|
3afd9209e6
|
Merge pull request #1246 from anandpdoshi/hash-cache-fix
[fix] missing hash cache clearing and breadcrumbs fix
|
2015-08-12 12:34:52 +05:30 |
|
Anand Doshi
|
ab2ac94d10
|
[minor] removed pyopenssl from requirements
|
2015-08-12 10:46:07 +05:30 |
|
Anand Doshi
|
154bdd82e7
|
[minor] website permissions
|
2015-08-11 16:47:59 +05:30 |
|
Anand Doshi
|
755c7be7fa
|
[fix] missing hash cache clearing and breadcrumbs fix
|
2015-08-11 16:19:42 +05:30 |
|
Rushabh Mehta
|
78b390eb47
|
[fix] check dynamic links before cancel
|
2015-08-11 15:10:55 +05:30 |
|
Rushabh Mehta
|
0e2f85357f
|
[fix] check dynamic links before cancel
|
2015-08-11 15:10:29 +05:30 |
|
Rushabh Mehta
|
8c97be9e2e
|
[minor] return btn for frm.add_custom_button
|
2015-08-11 14:47:37 +05:30 |
|
Rushabh Mehta
|
50366d5302
|
[minor] return btn for frm.add_custom_button
|
2015-08-11 14:47:19 +05:30 |
|
Anand Doshi
|
1afe32bfb3
|
Merge pull request #1219 from anandpdoshi/mandrill-integration
Mandrill integration edits
|
2015-08-11 12:25:45 +05:30 |
|
Anand Doshi
|
c079e27d3f
|
Moved Backup Manager and Social Login keys to the new Integrations Module, prepared frappe for Mandrill Integration
|
2015-08-11 12:03:13 +05:30 |
|
Rushabh Mehta
|
a7bd640b24
|
[merge] 5.3.1
|
2015-08-11 10:38:03 +05:30 |
|
Rushabh Mehta
|
4441a69b97
|
[minor] allow selects in dynamic links
|
2015-08-10 16:58:10 +05:30 |
|
Rushabh Mehta
|
c36accbc60
|
[minor] avoid adding standard reply twice
|
2015-08-10 13:15:13 +05:30 |
|
Rushabh Mehta
|
341e268a22
|
[minor] related to pull #1207
|
2015-08-10 11:31:18 +05:30 |
|
Rushabh Mehta
|
cee86fc03f
|
Merge pull request #1240 from dottenbr/about-footer-change
Changed footer date in About to 2015 from 2014
|
2015-08-10 11:27:20 +05:30 |
|
Rushabh Mehta
|
20ffbd4dbb
|
Merge pull request #1239 from dottenbr/formatter_fix
formatter fix for '<table' recognition
|
2015-08-10 11:26:35 +05:30 |
|
Rushabh Mehta
|
8d55cad71b
|
Merge pull request #1236 from nabinhait/develop
Set workflow state on cancellation
|
2015-08-10 11:26:23 +05:30 |
|
Dominik
|
eb9b52a5a5
|
Changed footer date in About to 2015 from 2014
|
2015-08-08 00:45:51 +05:30 |
|