Chinmay Pai
|
ce3bc8e133
|
chore: add missing return statement (#8339)
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
|
2019-09-04 20:37:37 +05:30 |
|
Sahil Khan
|
1da536a3fd
|
Merge branch 'develop' into version-12
|
2019-09-03 22:44:19 +05:30 |
|
Sahil Khan
|
92b5dd9361
|
bumped to version 12.0.10
|
2019-09-03 23:04:19 +05:50 |
|
sahil28297
|
2f233d849a
|
Merge pull request #8333 from frappe/sahil28297-patch-1
fix(nestedset): check if meta has nsm_parent_field
|
2019-09-03 22:39:10 +05:30 |
|
sahil28297
|
ac1c8c7c3f
|
fix(nestedset): check if meta has nsm_parent_field
|
2019-09-03 22:15:59 +05:30 |
|
stephen
|
1233cf0b6e
|
fix: Make sure we also display rooms that have been opened (#8331)
|
2019-09-03 17:13:02 +05:30 |
|
Sahil Khan
|
574605f00b
|
Merge branch 'develop' into version-12
|
2019-09-03 16:31:18 +05:30 |
|
Sahil Khan
|
71d406a0b0
|
bumped to version 12.0.9
|
2019-09-03 16:51:17 +05:50 |
|
Saurabh
|
2f83e1783c
|
fix: check if field is_tree exists (#8328)
|
2019-09-03 15:06:51 +05:30 |
|
mergify[bot]
|
6939d54fb2
|
Merge pull request #8297 from marination/translation-fix
fix: Update user translations on booting
|
2019-09-03 09:02:09 +00:00 |
|
sahil28297
|
08725d27d6
|
fix: update web_page.json modified time
|
2019-09-03 13:59:26 +05:30 |
|
Suraj Shetty
|
9210da5aed
|
Revert "fix(patch): Reload doctype" (#8326)
|
2019-09-03 13:01:02 +05:30 |
|
mergify[bot]
|
3d8ceaea27
|
Merge pull request #8323 from ruchamahabal/workflow-fix
fix: submit and cancel actions in bulk update when workflow is setup
|
2019-09-03 06:52:54 +00:00 |
|
mergify[bot]
|
7b15fc429a
|
Merge pull request #8317 from netchampfaris/reportview-export-fix-d
fix: Show report_name in Print, Excel, CSV
|
2019-09-03 06:34:17 +00:00 |
|
mergify[bot]
|
f7eac203ca
|
Merge pull request #8322 from netchampfaris/reload-doctype-is-tree
fix(patch): Reload doctype
|
2019-09-03 06:28:41 +00:00 |
|
Rucha Mahabal
|
6b3e6bf4ff
|
fix: submit and cancel actions in bulk update when workflow is setup
|
2019-09-03 11:49:18 +05:30 |
|
Faris Ansari
|
3ff9b0478f
|
fix(patch): Reload doctype
To reload the new docfield `is_tree` introduced via #8312
|
2019-09-03 11:44:05 +05:30 |
|
mergify[bot]
|
52504d73cb
|
Merge pull request #8319 from surajshetty3416/fix-events
fix: Load doc before save in db_set as well
|
2019-09-03 05:38:43 +00:00 |
|
Suraj Shetty
|
9068c17c61
|
Merge pull request #8162 from govindsmenokee/patch-6
fix: 2FA qrcode generation error
|
2019-09-03 10:56:24 +05:30 |
|
Suraj Shetty
|
bbfc4a9069
|
fix: Load doc before save in db_set as well
- Because db_set internally triggers on_change event
and on_change handlers might expect doc_before_save.
|
2019-09-03 08:37:11 +05:30 |
|
Faris Ansari
|
cdc5b2e752
|
fix: Ending div tag in footer_items.html
|
2019-09-02 23:41:13 +05:30 |
|
lasalesi
|
2ccf743ae9
|
fix: Markup when using links in footer items (#8293)
|
2019-09-02 23:37:51 +05:30 |
|
Saurabh
|
99671a4604
|
fix: handle data too long exception (#8292)
|
2019-09-02 23:30:10 +05:30 |
|
mergify[bot]
|
a9848ce333
|
Merge pull request #8316 from hrwX/patch-contacts-fix
fix(patch): use meta instead of version
|
2019-09-02 17:59:35 +00:00 |
|
Himanshu
|
5b1938afdd
|
feat(Comments): add images in comments (#8283)
* feat: add images in comments
* fix: use extract images
|
2019-09-02 23:28:05 +05:30 |
|
Faris Ansari
|
06349a8116
|
fix: Show report_name in Print, Excel, CSV
|
2019-09-02 23:24:51 +05:30 |
|
Himanshu Warekar
|
d96b08d9c8
|
fix: use meta instead of version
|
2019-09-02 21:53:00 +05:30 |
|
Himanshu
|
2bb7b69e8a
|
Merge pull request #8315 from hrwX/webpage-xss-ignore-html
fix: ignore-xss in webpage for html editor
|
2019-09-02 21:36:38 +05:30 |
|
Himanshu Warekar
|
eef2492646
|
fix: ignore-xss in webpage for html editor
|
2019-09-02 21:35:26 +05:30 |
|
mergify[bot]
|
317f64675f
|
Merge pull request #8269 from ernestoruiz89/patch-5
fix: Add translation function to string (develop)
|
2019-09-02 12:48:05 +00:00 |
|
mergify[bot]
|
d2c4090069
|
Merge pull request #8312 from netchampfaris/nested-set-doctype-configuration
feat: Create NestedSet doctypes via configuration
|
2019-09-02 12:42:24 +00:00 |
|
mergify[bot]
|
c8ee0c6815
|
Merge pull request #8239 from scmmishra/upload-guest-fix
refactor: allow guests to upload files
|
2019-09-02 12:20:15 +00:00 |
|
Shivam Mishra
|
82cb2d0cbb
|
refactor: improved permission logic
|
2019-09-02 17:33:42 +05:30 |
|
mergify[bot]
|
a929705684
|
Merge pull request #8275 from deepeshgarg007/email_template
fix: Email template's subject not getting set on selection of email template
|
2019-09-02 12:01:53 +00:00 |
|
Faris Ansari
|
51be324411
|
fix: Add depends_on
|
2019-09-02 17:25:13 +05:30 |
|
Shivam Mishra
|
652483c225
|
Merge branch 'upload-guest-fix' of github.com:scmmishra/frappe into upload-guest-fix
|
2019-09-02 16:33:03 +05:30 |
|
Shivam Mishra
|
72228946e5
|
refactor: explicitly set ignore_permissions for file upload
|
2019-09-02 16:32:38 +05:30 |
|
Suraj Shetty
|
19dae7c3b3
|
fix(UX): Hide Amend button if the document has been already ame… (#8306)
* fix: Hide Amend button if the document has been already amended
* chore: Remove unused code to avoid confusion
* style: Remove unused variable
* refactor: Rename method
|
2019-09-02 16:18:56 +05:30 |
|
Faris Ansari
|
9cbd2b3c30
|
fix: Add column in framework.sql
|
2019-09-02 16:09:18 +05:30 |
|
Faris Ansari
|
bff94703cf
|
feat: Create NestedSet doctypes via configuration
|
2019-09-02 15:58:52 +05:30 |
|
Suraj Shetty
|
e2b3c56902
|
Merge pull request #8311 from surajshetty3416/fix-failing-patch
fix: Fix patch by reloading contact email and contact phone
|
2019-09-02 15:45:03 +05:30 |
|
Suraj Shetty
|
7f618f6541
|
fix: Reload contact email and contact phone
Only reload contact email and contact phone if
version is greater than 11.
|
2019-09-02 15:25:57 +05:30 |
|
Deepesh Garg
|
6bb1350dfd
|
fix: Do not throw error while reloading doctypes (#8290)
* fix: Do not throw error while reloading doctypes
* fix: Syntax error
* fix: Ignore doctype reload_exceptions from other apps
|
2019-09-02 12:12:53 +05:30 |
|
Shivam Mishra
|
6c3b84a6b5
|
Merge branch 'develop' of https://github.com/frappe/frappe into upload-guest-fix
|
2019-09-02 11:35:54 +05:30 |
|
mergify[bot]
|
17b77870c8
|
Merge pull request #8302 from hrwX/algn-fix
fix(Desk): Alignment
|
2019-09-02 05:42:30 +00:00 |
|
mergify[bot]
|
30757644a1
|
Merge pull request #8232 from barredterra/patch-1
fix(API): allow creation from request data (develop)
|
2019-09-02 05:03:41 +00:00 |
|
Suraj Shetty
|
3ac39f8ddc
|
Merge pull request #8308 from surajshetty3416/fix--Make-user-field-mandatory-in-review-dialog
fix(UX): Make User field mandatory in review dialog
|
2019-09-02 10:03:52 +05:30 |
|
Suraj Shetty
|
1a9d7e25cc
|
fix(UX): Make User field mandatory in review dialog
|
2019-09-02 08:26:47 +05:30 |
|
mergify[bot]
|
99c73bfae1
|
Merge pull request #8243 from hrwX/contacts-ref
feat(Contacts): Multiple emails and phones in a contact
|
2019-08-31 18:08:58 +00:00 |
|
mergify[bot]
|
5eba2c0b2c
|
Merge pull request #8299 from surajshetty3416/skip-extra-list-in-menu
fix: Remove extra 'List' in the awesome bar option
|
2019-08-30 10:53:41 +00:00 |
|