Commit graph

9085 commits

Author SHA1 Message Date
Saurabh
874154a0ab [enhance] cart button; merge custom buttons under group 2016-01-12 15:15:42 +05:30
Rushabh Mehta
911026811a Merge branch 'develop' 2016-01-12 12:22:30 +05:30
Rushabh Mehta
6780e8f92b bumped to version 6.18.1 2016-01-12 12:52:30 +06:00
Rushabh Mehta
86e2569be5 Merge pull request #1514 from nabinhait/report_fix
[fix] Hidden columns in report
2016-01-12 12:22:07 +05:30
Rushabh Mehta
6377bc7930 Merge pull request #1513 from nabinhait/import_fix
Don't overwrite name while overwriting data from data-import-tool
2016-01-12 12:14:42 +05:30
Rushabh Mehta
fb07057768 Merge branch 'develop' 2016-01-12 12:14:27 +05:30
Rushabh Mehta
5e76f6a002 bumped to version 6.18.0 2016-01-12 12:44:27 +06:00
Rushabh Mehta
efa5d5c2f1 [translations] update 2016-01-12 12:02:33 +05:30
Rushabh Mehta
831e71db32 [fix] print hide in print format builder should take preceedence 2016-01-12 12:02:32 +05:30
Nabin Hait
cdd93ff7dc [fix] Hidden columns in report 2016-01-12 11:53:22 +05:30
Nabin Hait
d3ec4c4bbc Don't overwrite name while overwriting data from data-import-tool 2016-01-12 11:35:56 +05:30
Rushabh Mehta
20bc80071b Merge pull request #1511 from agusputra/patch-3
Update index.md
2016-01-12 11:12:15 +05:30
Rushabh Mehta
02e8c15ce8 [minor] [fix] default english in setup wizard 2016-01-12 10:34:44 +05:30
Rushabh Mehta
a8d718a629 Merge pull request #1509 from agusputra/patch-1
Update controllers.md
2016-01-12 10:28:34 +05:30
Rushabh Mehta
3ffed6b430 Merge pull request #1507 from frappe/v5.x.x
Fix for Error "ValueError: No JSON object could be decoded"
2016-01-12 10:28:21 +05:30
Rushabh Mehta
9033926d29 Merge pull request #1505 from rmehta/standard-roles
[fix] standard roles cannot be edited
2016-01-12 10:27:17 +05:30
Rushabh Mehta
d27c66f60b Merge pull request #1480 from mbauskar/develop
get_base_url fix
2016-01-12 10:26:37 +05:30
Agus Syahputra
69af4f4d3b Update before.md 2016-01-12 08:20:59 +07:00
Agus Syahputra
3b86c5ff33 Update index.md 2016-01-12 08:18:15 +07:00
Agus Syahputra
7df8260256 Update controllers.md 2016-01-12 08:10:08 +07:00
mbauskar
b33347d0f9 [minor fix] fixed the module access issue 2016-01-11 19:19:48 +05:30
mbauskar
007b8fb6b9 Merge branch 'develop' of http://github.com/frappe/frappe into develop 2016-01-11 19:06:34 +05:30
Rushabh Mehta
e4a70cb5cb [fix] is_single in doctype as set_only_once 2016-01-11 12:26:12 +05:30
Rushabh Mehta
cdf0a22b6b [fix] standard roles cannot be edited 2016-01-08 16:58:53 +05:30
Anand Doshi
9060e50c3e Merge branch 'develop' 2016-01-08 16:13:01 +05:30
Anand Doshi
db1d7e9645 bumped to version 6.17.6 2016-01-08 16:43:00 +06:00
Anand Doshi
71e0ecb8b3 [hotfix] bring back editor.min.js 2016-01-08 16:10:47 +05:30
Anand Doshi
d315e089f3 [minor] allow Event in Customize Form 2016-01-08 15:26:54 +05:30
Anand Doshi
f73d30de62 [minor] Import permission to System Manager for User and Event 2016-01-08 15:22:19 +05:30
Anand Doshi
f1dee283c6 [revert] allow someone to like their own document, as like also works as a bookmark 2016-01-08 11:54:47 +05:30
Anand Doshi
2f47f75331 [fix] comment when share with everyone. Fixes frappe/erpnext#4592 2016-01-08 11:54:46 +05:30
Anand Doshi
acc6e7a4f1 [fix] typo in window.onbeforeunload. Fixes #1491 2016-01-08 11:54:46 +05:30
Rushabh Mehta
e3f1b23aeb [fix] notifications should not be hilighted if there are no notifications 2016-01-08 10:33:53 +05:30
Rushabh Mehta
67010c17b1 [fix] changed blue in Draft indicator to Red, blue seems wrong 2016-01-08 10:31:32 +05:30
Anand Doshi
6dbd1544e1 Merge branch 'develop' 2016-01-07 18:25:22 +05:30
Anand Doshi
2c50180180 bumped to version 6.17.5 2016-01-07 18:55:22 +06:00
Anand Doshi
23b27f8239 Merge pull request #1500 from bohlian/develop
Increase max_file_size to 5 for Editor
2016-01-07 18:15:03 +05:30
Anand Doshi
08b515f482 Merge pull request #1503 from rmehta/dialog-in-website
[enhancement] dialog in website via dialog.min.js and some re-org of js code
2016-01-07 18:14:42 +05:30
Anand Doshi
d385fdef05 Merge pull request #1502 from rmehta/reload-on-version-change
[enhancement] prompt user to reload on migration
2016-01-07 17:59:55 +05:30
Rushabh Mehta
1a3c70cccb [enhancement] dialog in website via dialog.min.js and some re-org of js code 2016-01-07 16:55:02 +05:30
Rushabh Mehta
6caf6fb6f1 [enhancement] prompt user to reload on migration 2016-01-07 15:35:17 +05:30
bohlian
289b474b77 Changed max_file_size to 5
Allow 5MB for image upload in editor.
2016-01-07 13:27:09 +08:00
bohlian
9dbf46714d Merge pull request #1 from frappe/develop
07/01/2016 Merge
2016-01-07 13:25:59 +08:00
Anand Doshi
473d1e4181 Merge branch 'develop' 2016-01-06 18:54:17 +05:30
Anand Doshi
5931d5f34c bumped to version 6.17.4 2016-01-06 19:24:17 +06:00
Anand Doshi
0ab3705605 Merge pull request #1499 from anandpdoshi/fix/default-is-user-permission-key
[fix] is_a_user_permission_key: also check if key contains ':'
2016-01-06 16:33:30 +05:30
Rushabh Mehta
d62e1aec56 [minor] [style] fixes to web-form after template reorg 2016-01-06 15:21:20 +05:30
Anand Doshi
c29089f3f9 [minor] catch like exception 2016-01-06 14:12:38 +05:30
Anand Doshi
a60248964f [docs] fetch a field value from a document into a transaction 2016-01-06 13:24:32 +05:30
Anand Doshi
c35c1aacaa [fix] is_a_user_permission_key: also check if key contains ':' 2016-01-06 12:23:10 +05:30