Commit graph

8007 commits

Author SHA1 Message Date
Rushabh Mehta
62d53ce213 [minor] Added collapsible to customize form view. 2015-09-04 22:07:01 +05:30
Rushabh Mehta
c2becc8fe3 [minor] fix comment names 2015-09-03 12:49:32 +05:30
Anand Doshi
50d9ca9a34 Merge branch 'develop' 2015-09-03 12:34:40 +05:30
Anand Doshi
eaeffe97bd bumped to version 6.1.2 2015-09-03 13:04:40 +06:00
Anand Doshi
3de0a8acf0 [hotfix] layout collapse 2015-09-03 12:03:31 +05:30
Anand Doshi
e7d5c5bd49 [hotfix] layout collapse 2015-09-03 11:54:58 +05:30
Anand Doshi
5e445476f3 [fix] show doctype, fieldname in unique validation 2015-09-03 11:42:19 +05:30
Anand Doshi
7a2b8f91b2 Merge branch 'develop' 2015-09-02 21:52:24 +05:30
Anand Doshi
d8c41b969e bumped to version 6.1.1 2015-09-02 22:22:23 +06:00
Anand Doshi
6644f4120e [fix] data import tool error callback 2015-09-02 21:51:35 +05:30
Anand Doshi
3184806298 Merge branch 'develop' 2015-09-02 16:01:52 +05:30
Anand Doshi
81a13164e6 bumped to version 6.1.0 2015-09-02 16:31:52 +06:00
Anand Doshi
9b90c45782 [change-log] 2015-09-02 15:34:00 +05:30
Anand Doshi
7b1bf1d60c [minor] added comment 2015-09-02 15:05:10 +05:30
Anand Doshi
66f93373e2 Merge pull request #1284 from rmehta/gantt-calendar-fixes
[enhancement] fixes to style and commonified conditions for calendar and style
2015-09-02 14:49:04 +05:30
Anand Doshi
1f3cd8759d Merge pull request #1289 from nabinhait/develop
[fix] Hour format in format_datetime function
2015-09-02 14:48:37 +05:30
Anand Doshi
7076295638 Merge pull request #1288 from anandpdoshi/permission-fixes
permissions.get_role_permissions: resolving conflict between Apply User Permissions and If Owner
2015-09-02 14:48:22 +05:30
Nabin Hait
45a2666d44 [fix] Hour format in format_datetime function 2015-09-02 14:08:58 +05:30
Rushabh Mehta
5a5a6181d8 [enhancement] fixes to style and commonified conditions for calendar and style 2015-09-02 13:56:06 +05:30
Anand Doshi
d3fe6e57fb Merge pull request #1287 from rmehta/tree-fix
[mobile] css for tree views
2015-09-02 13:40:28 +05:30
Anand Doshi
b09a398143 Merge pull request #1286 from rmehta/progress-in-import
[enhancement] Added progress bar in data import tool
2015-09-02 13:40:10 +05:30
Anand Doshi
ef961a091f permissions.get_role_permissions: resolving conflict between Apply User Permissions and If Owner
Case 1:
If atleast one record having both Apply User Permission and If Owner unchecked is found, don't match for those rights

Case 2:
If one row has only "Apply User Permissions" checked and another has only "If Owner" checked,
set Apply User Permissions as checked
2015-09-02 13:31:37 +05:30
Rushabh Mehta
537c0de1e4 [mobile] css for tree views 2015-09-02 12:17:15 +05:30
Rushabh Mehta
c600a302bb [enhancement] Added progress bar in data import tool
async.py: in `publish_realtime`, `event` is now optional, if called from within task
importer.py: send record count being updated using `frappe.publish_realtime`
ui/messages.js: added new tool `frappe.get_progress(title, count, total)` that will show progress bar realtime
2015-09-02 11:51:41 +05:30
Anand Doshi
8db2f79db4 Merge pull request #1285 from hernad/develop
Bosnia and Herzegovina Currency, Time zone
2015-09-01 23:06:04 +05:30
Ernad Husremovic
5365c4398d Bosnia and Herzegovina Currency, time zone 2015-09-01 14:23:19 +00:00
Rushabh Mehta
5d5c308a4e [minor] fix cess for set_intro 2015-08-31 18:24:36 +05:30
Rushabh Mehta
6d248948e1 [minor] fix cess for set_intro 2015-08-31 18:20:24 +05:30
Rushabh Mehta
daaa3ff587 [minor] fix cess for set_intro 2015-08-31 18:19:48 +05:30
Anand Doshi
e248b627a2 Merge pull request #1281 from rmehta/mobile-style-fix
[style] use thin fonts for mobile, tablets and other cleanups
2015-08-31 12:30:12 +05:30
Anand Doshi
4faa10a23b [fix] reportview column picker 2015-08-31 12:09:20 +05:30
Anand Doshi
b370c4631a [fix] restore async stdout and stderr on task completion 2015-08-31 10:55:41 +05:30
Rushabh Mehta
875ef3bfec [style] use thin fonts for mobile, tablets and other cleanups 2015-08-28 18:31:23 +05:30
Anand Doshi
b5a662b192 [fix] load_lang 2015-08-27 20:16:06 +05:30
Anand Doshi
216adb4e36 [fix] load_lang 2015-08-27 20:14:25 +05:30
Anand Doshi
a33eb2df49 Merge pull request #1280 from rmehta/communication-notify
[minor] notify realtime for parent in communication (that may come via email)
2015-08-27 16:59:01 +05:30
Anand Doshi
dce31d8e5c [css] added border-bottom to each section for better separation 2015-08-27 16:54:19 +05:30
Anand Doshi
ad9c500863 Exported all doctypes 2015-08-27 16:45:45 +05:30
Rushabh Mehta
ad27d219bc [minor] notify realtime for parent in communication (that may come via email) 2015-08-27 16:31:48 +05:30
Anand Doshi
e07b5df451 Merge pull request #1279 from rmehta/custom-field-example
[help] fixed custom field examples showing frappe.ui.form.on
2015-08-27 16:12:23 +05:30
Rushabh Mehta
647d632b9a [help] fixed custom field examples showing frappe.ui.form.on 2015-08-27 16:07:19 +05:30
Anand Doshi
70cb7e76de [fix] use print format file html if found 2015-08-27 15:52:16 +05:30
Anand Doshi
141e7d9057 [fix] use print format file html if found 2015-08-27 15:51:53 +05:30
Anand Doshi
c1ac1428e5 [minor] Website Settings - changed Misc to More Information 2015-08-27 15:51:10 +05:30
Rushabh Mehta
77101716b5 [change-log] added for collapsible sections, title, bold-field 2015-08-27 11:45:22 +05:30
Rushabh Mehta
d334a39e79 [fix] set default title field only if 'title' 2015-08-27 11:39:36 +05:30
Anand Doshi
b14fc160fd [hotfix] show head html as blank if None 2015-08-27 11:12:29 +05:30
Anand Doshi
ad09ce6dbe [hotfix] show head html as blank if None 2015-08-27 11:10:08 +05:30
Rushabh Mehta
c59aaf01e4 Merge branch 'bold-field' into develop
Conflicts:
	frappe/model/base_document.py
2015-08-27 10:59:38 +05:30
Rushabh Mehta
33c097b97c [enhancement] editable title field 2015-08-26 20:56:28 +05:30