Commit graph

789 commits

Author SHA1 Message Date
Nabin Hait
e3d4e8b108 Merge pull request #2699 from rohitwaghchaure/role_based_reports
[Enhancement] Provision to add roles in the report
2017-03-06 18:34:39 +05:30
Nabin Hait
b9d79fbb82 Minor fix 2017-03-06 17:33:49 +05:30
Rohit Waghchaure
e996fd0c55 Changed tabUserRoel to tabHas Role 2017-03-06 14:42:14 +05:30
Rohit Waghchaure
8a2c83918b changed user_roles to roles 2017-03-06 14:42:13 +05:30
Rohit Waghchaure
e57e9f170b [Enhancement] Provision to add roles in the report 2017-03-06 14:38:54 +05:30
Rushabh Mehta
6962962211 [fix] contact us to create communication and blog list 2017-03-02 13:06:45 +05:30
Nabin Hait
2e0ef33647 Merge branch 'master' into develop 2017-02-28 18:42:07 +05:30
Rushabh Mehta
488cff68bc [minor] update mixpanel analytics 2017-02-28 18:41:16 +05:30
Rushabh Mehta
75855de5bb [minor] fixes to web form, listview, add portal items via hooks 2017-02-28 17:49:45 +05:30
Prateeksha Singh
e9f2aadd38 Search fixes (#2746)
* GS in awesome bar, UI fixes: scroll nav,lists

* awesome bar specificity

* Add fuzzy search in awesome bar

* Add fuzzy specific boldening

* List subtype buttons

* Update global_search.py
2017-02-22 11:08:36 +05:30
Nabin Hait
6601710465 Fixed merge conflict 2017-02-20 14:50:28 +05:30
mbauskar
6d9eab7f6e [minor] added method get_timestamp from date 2017-02-16 16:40:50 +05:30
Manas Solanki
a9d5715f8a Fix for opening the file in mac and some styling in excel file 2017-02-14 18:34:35 +05:30
Manas Solanki
8bcd479831 Add binary mime type in response.py 2017-02-14 18:34:35 +05:30
Rushabh Mehta
86ceb21005 [feature] Global Search (again) (#2710)
* [start] global search frappe/erpnext#6674

* [fix] setup before running test

* [start] global search frappe/erpnext#6674

* Display result as rudimentary list, rebuild old doctypes

* Media view, child tables, delete document updates, searchable fields

* More results UI

* Code clean up

* remove msgprint from document.py to resolve merge conflict

* Modularization stage 1, get show more to work with it

* Dedicated modal Search bar works, some clean up needed

* Can't data-dismiss on links, Bootstrap issue, use hashchange

* Accomodate missing field content syndrome

* Search in boolean mode, make GS default in awesome bar, fix double modal bug and cleanup

* Add in Meta

* Add in customize form

* Modularise Global Search

* Search object

* Commonify Search UI: Stage I

* II: save list state, UI, default condensed view, refactor

* Fix SQL bug, Refactor awesome bar, Fix unicode bug, add nav results

* Refactor using separate search objects, some async issues

* Fix async flow

* Fix preceding more list bug

* UI additions

* another async fix, back link

* Help: Stage I

* Help: Stage II

* Background jobs, fix route options bug

* Fix GS syncing on install

* Add GS options in awesome bar: test

* Input now remembers search type state

* More UI updates

* Add description for GS results in awesome bar

* Fix help modal bug

* Fix: not commit during install

* Test cases, some fixes

* Update in_test flag in enqueue

* Disable GS sync when not install_db

* Add flag check

* Disable field in child tables

* Cleanups

* Create table fix

* Fix redis exception, remove commit enqueue, add gs in migrate

* Fix tests

* Single enqueue

* cleanups

* Fix tests

* Fix event test

* Fix duplication, search as first option

* Add show name in global search

* fix event tests and desk.less

* Fix communication.json

* [fixes] wip

* [fix] tests

* [minor] for tests

* [minor] for tests

* [minor] for tests

* [minor] for tests
2017-02-13 14:50:54 +05:30
Rushabh Mehta
0af6de61bf [fix] email validate 2017-02-07 15:02:04 +05:30
Rushabh Mehta
53f12a8b75 [fix] email validate 2017-02-07 14:31:41 +05:30
Rushabh Mehta
5bc3473184 [minor] cleanups, allow comma in email validation 2017-02-07 14:01:18 +05:30
Rushabh Mehta
33d8db6d88 [fix] minor fixes 2017-02-03 16:42:23 +05:30
Makarand Bauskar
e422e16953 [WIP] Feedback Triggers (#2643)
* [wip] feedback

* [WIP] Feedback Trigger, Feedback Request, Feedback & Rating Timeline and Form Sidebar

* [minor] minor fixes in feedback trigger

* [Test Cases] Test Cases for Feedback Trigger

* [minor] replaced sql_list by get_all changed the button label

* [minor] removed whitespaces, fixed spelling mistakes
2017-02-02 15:15:23 +05:30
Rushabh Mehta
3add8e8a39 [minor] pass now in enqueue 2017-02-02 11:24:54 +05:30
krnkris
dc527f12cd Update __init.py__ to master (#2641)
It is stable now only issue is the emoji use
2017-01-30 15:20:49 +05:30
schilgod
f228d462d2 Add or_filters filter for export_fixtures, to filter by doctype or fieldnames (#2616)
Eg:
fixtures = [
        {
        "doctype": "Custom Field",
        "or_filters": {
            "dt": ["in", [
                "Process Payroll",
                "Journal Entry Account"
            ]],
            "name": ["in", [
                "Print Settings-compact_item_print",
                "Account-account_id",
                "Account-some_bank_name"
            ]]
        }
    }
]
2017-01-24 11:01:41 +05:30
Rushabh Mehta
e223c5b740 Merge branch 'develop' into custom-perms-1 2017-01-13 19:04:49 +05:30
robert schouten
48dc91a59f Email inbox (#2485)
* Communication_reconciliation

* Email inbox

* added collapsed timeline for communication

* new email prefill from when only one address

* timeline duplication and notifcation and stability fixs

* add subject to timeline

* email system v7 fixes

* added password required validation

* use proper email datetime

* email inbox v7.1 fixes

* email inbox communication_date used instead of created

* email inbox communication data cleanup

* remove old patch

* email inbox permit unlinking

* [fix] duplication queue and rename domain to email domain

* fix rename domain

* email inbox index optimisation

* email inbox relink doctype query usability fix

* email_inbox Set attachment variable for forwards and replies based on whether it exists or not

* uidnext fixes and cleanup

* email inbox fix tests

* fix rebase timeline issue

* email inbox threading and cleanup

* email inbox cleanup

* bring inbox into frappe and cleanup

* fix missed path

* inbox cleanup

* email-inbox move service back to account

* separate to erpnext contact match

* email inbox cleanup and move relink and timeline fix

* relink optimisation

* inbox fix footer

* keep email drafts on pages not just forms

* email inbox add sent items

* email inbox allow not save list settings on query

* email inbox cleanup and remove communications recon

* add suspend sending button in email queue

* fix rebase error

* email inbox assorted fixes

* email inbox fixes and relink option only when linked otherwise link;

* email inbox fix sender fullname as administrator

* create user email to custom button

* email inbox sent no match and seen

* email inbox fix unicode issues with subject recipient and sender
2017-01-13 14:45:11 +05:30
Rushabh Mehta
636c662048 [patch] added patch for migration 2017-01-12 15:48:49 +05:30
Rushabh Mehta
3f91c9455f [enhance] custom perms 2017-01-11 17:34:55 +05:30
Rushabh Mehta
349c321f14 [fix] boilerplate for new app 2017-01-11 12:14:42 +05:30
Rushabh Mehta
c3561b504b [fix] boilerplate for new app 2017-01-11 11:16:19 +05:30
Rushabh Mehta
0618b98c92 [minor] cleanup to comment update and maintenance mode page 2017-01-10 17:50:36 +05:30
Valmik
1d2a91c393 Added docs to boilerplate for hooks (#2561) 2017-01-10 14:39:38 +05:30
KanchanChauhan
9fe9536f58 Added method to get report URL (#2549)
* Added method to get report URL

* Update auto_email_report.py
2017-01-05 17:18:23 +05:30
KanchanChauhan
c0a685aa24 Email ID renamed to Email Address (#2541) 2017-01-05 14:55:51 +05:30
Rushabh Mehta
cfe44f28d5 [fix] patch + some updates to bot 2016-12-31 11:27:12 +05:30
Rushabh Mehta
d989a95472 [feature] document versioning #2469 (#2523)
* [feature] document versioning #2469

* [minor] remove on_update from WebsiteGenerator

* [fix] delete shares when deleting user

* [test] don't run delete in background if test

* [fix] test_db

* [added] Deleted Document

* [fix] added track_changes in all documents

* [fix] add to deleted only if exists

* [fix] in_install flag in deleted documents

* [minor] name will always be reset
2016-12-29 18:01:42 +05:30
Nabin Hait
3bb9af2801 Merge pull request #2511 from rmehta/auto-email-fixes
[fix] formatting and modified filters for auto email report, fixes frappe/erpnext#7081 and frappe/erpnext#7147
2016-12-29 13:11:49 +05:30
Rushabh Mehta
b765f38acc [fix] gravatar md5 encoding, frappe/erpnext#7145 2016-12-28 17:55:09 +05:30
Nabin Hait
1447ee7e3c Merge branch 'master' into develop 2016-12-28 12:18:30 +05:30
Nabin Hait
ec42dcd4f7 minor fix for function import 2016-12-28 12:17:32 +05:30
Nabin Hait
7b570af50d Merge branch 'master' into develop 2016-12-28 11:08:12 +05:30
Saurabh
f246cc3810 [fix] reset simultaneous sessions after disabling users 2016-12-27 19:20:17 +05:30
Rushabh Mehta
05268603cf [fix] delete attachments last, fixes #978 2016-12-27 15:34:42 +05:30
Rushabh Mehta
4fcd372921 [minor] [hot] bad import 2016-12-27 13:00:52 +05:30
Rushabh Mehta
67de814f26 [fix] missing translations #2494 2016-12-27 12:58:58 +05:30
Rushabh Mehta
eabceaec56 [fix] formatting and modified filters for auto email report, fixes frappe/erpnext#7081 and frappe/erpnext#7147 2016-12-26 13:03:57 +05:30
Nabin Hait
f2bc961e1b Fixed merge conflict 2016-12-23 17:35:38 +05:30
Nabin Hait
b9b5a0246d Merge branch 'master' into develop 2016-12-21 17:37:36 +05:30
Saurabh
0577fcff3b [fix] exclude one user with system manger role while pulling active users list 2016-12-21 13:31:37 +05:30
Rushabh Mehta
17d78e2bbb [fix] email validation 2016-12-21 12:41:51 +05:30
Saurabh
b627342a9b [fix] testcase fix for deactivating additional users after limit set 2016-12-21 12:34:28 +05:30