Nabin Hait
d45f3baa55
Merge branch 'develop'
2015-12-29 14:14:16 +05:30
Nabin Hait
aec07d7802
bumped to version 6.16.3
2015-12-29 14:44:16 +06:00
Nabin Hait
8ba1ec7117
Merge pull request #1484 from nabinhait/fields_order
...
[patch] Fixed fields order
2015-12-29 14:12:34 +05:30
Nabin Hait
092f428b07
[patch] Fixed fields order
2015-12-29 13:39:53 +05:30
Rushabh Mehta
6019239bb9
[fix] patch
2015-12-29 12:52:58 +05:30
Rushabh Mehta
f77daaf7c1
[fix] reload error snapshot before resetting perms
2015-12-29 09:18:48 +05:30
Anand Doshi
b0a002ba76
[fix] catch authentication failed error in get server
2015-12-28 19:59:50 +05:30
Nabin Hait
7066a6ca97
Merge branch 'develop'
2015-12-28 18:34:54 +05:30
Nabin Hait
e4e87651e5
bumped to version 6.16.2
2015-12-28 19:04:54 +06:00
Nabin Hait
5439a392f0
[fix] user defaults based on user permissions
2015-12-28 18:34:00 +05:30
Nabin Hait
94061cd613
Merge branch 'develop'
2015-12-28 15:19:57 +05:30
Nabin Hait
5dcec879ab
bumped to version 6.16.1
2015-12-28 15:49:56 +06:00
Nabin Hait
767440650c
[change-log]
2015-12-28 15:19:05 +05:30
Nabin Hait
75161bd438
Merge branch 'develop'
2015-12-28 15:07:38 +05:30
Nabin Hait
b3d8e4b392
bumped to version 6.16.0
2015-12-28 15:37:38 +06:00
Nabin Hait
18e3b02389
[translations]
2015-12-28 14:37:30 +05:30
Nabin Hait
4246e1423c
docs updated
2015-12-28 14:25:12 +05:30
Nabin Hait
2c19a26f6c
Merge pull request #1479 from rmehta/error-snapshot-perms
...
[fix] [minor] Error Snapshot only for Administrator
2015-12-28 12:45:57 +05:30
Nabin Hait
aa73714dc7
Merge pull request #1478 from saurabh6790/installer_fixes
...
[fixes] Patch Fixes
2015-12-28 12:44:40 +05:30
Makarand Bauskar
dfc787a0b9
get_base_url fix
...
if url contains the 'desk' then the get_base_url function was removes the desk from url
e.g. if url is www.helpdesk.com/desk then get_base_url() returns <b>http://help </b> instead of
<b>http://www.helpdesk.com </b>
2015-12-28 12:40:56 +05:30
Rushabh Mehta
4b3a022226
[fix] [minor] Error Snapshot only for Administrator
2015-12-28 11:15:59 +05:30
Rushabh Mehta
6d54ab4bfb
[fix] set_input in reportview edit, fixes frappe/erpnext#4544
2015-12-28 10:55:30 +05:30
Rushabh Mehta
9a5d7794c5
[minor] add frappe.db.get_default to jinja
2015-12-28 10:41:17 +05:30
Saurabh
22a52f368e
[fixes] Patch Fixes
2015-12-27 11:10:58 +05:30
Anand Doshi
14d20d6360
[fix] fieldnames should be lowercase
2015-12-25 16:09:29 +05:30
Anand Doshi
71eb51367c
[hotfix] trigger language change on load
2015-12-25 15:10:39 +05:30
Anand Doshi
6388842866
[hotfix] defaults in create_new
2015-12-25 12:38:16 +05:30
Rushabh Mehta
ab8c1affa0
Merge pull request #1477 from anandpdoshi/fix/oauth-login
...
[fix] facebook oauth, login using token
2015-12-24 22:08:11 +05:30
Anand Doshi
293a8136cb
[fix] facebook oauth, login using token. Fixes frappe/erpnext#4166
2015-12-24 20:37:45 +05:30
Rushabh Mehta
2a24e01b78
Merge pull request #1475 from anandpdoshi/fix/bulk-expiry
...
[fix] only expire bulk emails that are Not Sent
2015-12-24 15:07:55 +05:30
Anand Doshi
f98b3c5b25
[fix] only expire bulk emails that are Not Sent
2015-12-24 15:01:39 +05:30
Rushabh Mehta
a5b180f54f
Merge pull request #1474 from nabinhait/user_defaults
...
[fix] Get user defaults based on fieldname in special cases
2015-12-24 14:05:55 +05:30
Nabin Hait
49b7457167
[fix] Get user defaults based on fieldname in special cases
2015-12-24 12:59:29 +05:30
Rushabh Mehta
258103b0a9
[fix] datetime in web form
2015-12-24 12:18:03 +05:30
Rushabh Mehta
93e3ac2770
[fix] patch
2015-12-24 12:08:59 +05:30
Rushabh Mehta
acd2f2da38
[fix] username for test
2015-12-24 11:59:24 +05:30
Rushabh Mehta
fbbd9c7951
[minor] fix, ignore admin an guest for mention and highlight in comment
2015-12-24 11:38:14 +05:30
Rushabh Mehta
600309cb1c
Merge branch 'anandpdoshi-feature/mentions-in-comments' into develop
2015-12-24 11:10:54 +05:30
Rushabh Mehta
85e9e61bf3
[merge] patches.txt
2015-12-24 11:10:44 +05:30
Rushabh Mehta
140cce235e
[fix] test case, reorg custom field form
2015-12-24 11:01:42 +05:30
Rushabh Mehta
b47d49311a
Merge pull request #1472 from nabinhait/defaults
...
[fix] Get defaults based on doctype or fieldname
2015-12-24 10:45:23 +05:30
Rushabh Mehta
198eb8161c
Merge pull request #1468 from nabinhait/idx_property_setter
...
Idx property setter
2015-12-24 10:44:12 +05:30
Anand Doshi
389219da70
[feature] mention users in comments. Fixes frappe/erpnext#3495
2015-12-23 20:14:46 +05:30
Nabin Hait
cd56b568b7
[fix] Removed logic based on previous_field property
2015-12-23 19:00:54 +05:30
Nabin Hait
e15a046438
[fix] Update proiperty setter for idx while renaming fields
2015-12-23 19:00:54 +05:30
Nabin Hait
270787f1b5
[fix] Create/update property setter for _idx from Custom Field
2015-12-23 19:00:54 +05:30
Rushabh Mehta
abd4cc77a4
Merge branch 'develop'
2015-12-23 16:43:55 +05:30
Rushabh Mehta
83b493ab85
bumped to version 6.15.4
2015-12-23 17:13:55 +06:00
Rushabh Mehta
a8d3e51a05
[minor] fix. Don't subscribe doc-open when new, via Error Snapshot
2015-12-23 16:43:03 +05:30
Nabin Hait
930cd7d78e
[fix] Get defaults based on doctype or fieldname
2015-12-23 16:34:43 +05:30
