Commit graph

11493 commits

Author SHA1 Message Date
Faris Ansari
ffdc5825dc [gantt] update lib and some fixes (#2645) 2017-01-30 15:29:50 +05:30
Faris Ansari
d17b5a0dce Calendar Redesign (#2639)
* wip

* added styling

* more styling

* and some more...

* first cut

* [fix] end date on events

* font awesome icons

* doclistview cleanups

* merged calendar_base into calendar
2017-01-30 15:27:05 +05:30
Felipe Orellana
0a2edc9ea7 [FIX] rss.xml broken on all instances of frappe (#2644)
rss.xml is broken on all frappe instances I've checked, including the frappe.io site. The culprit was a small column alias change a few months back. This fixes that change.
2017-01-30 15:22:13 +05:30
Rushabh Mehta
385da2b7b1 [check] use utf8mb4 as the connection charset 2017-01-30 14:15:44 +05:30
Rushabh Mehta
28a09ee972 [fix] email encoding issues, fixes frappe/erpnext#7145 2017-01-30 12:57:12 +05:30
Makarand Bauskar
6dabc55096 [minor] listview & permissions minor fixes (#2647) 2017-01-30 10:45:35 +05:30
KanchanChauhan
71200e4f9a Merge pull request #2642 from rohitwaghchaure/translation_minor
[Fix] removed language code from translation
2017-01-27 17:37:22 +05:30
Rohit Waghchaure
6ac6d8ab84 [Fix] removed language code from translation 2017-01-27 17:18:52 +05:30
Rushabh Mehta
73ff0dfb88 Merge branch 'master' into develop 2017-01-27 15:36:19 +05:30
Rushabh Mehta
830f22be93 Merge branch 'hotfix' 2017-01-27 15:36:19 +05:30
Rushabh Mehta
6487604ca7 bumped to version 7.2.14 2017-01-27 16:06:18 +06:00
KanchanChauhan
3249272852 [Fix]Linked with not found (#2635) 2017-01-27 11:25:46 +05:30
Faris Ansari
54d7b82b1a [fix] Kanban save_filters, set_title (#2637)
* [wip] save filters fix

* [fix] save_filters

* set_title on refresh
2017-01-27 11:24:38 +05:30
Rushabh Mehta
9a23f808ff [minor] allow all roles for permission manager 2017-01-26 20:37:41 +05:30
Rushabh Mehta
e1787124a1 [minor] allow all tables for Permission Manager 2017-01-26 20:34:33 +05:30
Rushabh Mehta
254ca3393a [merge] from master 2017-01-24 18:22:50 +05:30
Rushabh Mehta
073dd69ea9 Merge branch 'hotfix' 2017-01-24 18:21:31 +05:30
Rushabh Mehta
5aa4b20587 bumped to version 7.2.13 2017-01-24 18:51:31 +06:00
rohitwaghchaure
c02df70d13 Merge pull request #2631 from KanchanChauhan/unsubscribe-url-fix
[Fix] Unsubscribe url fix
2017-01-24 17:48:00 +05:30
rohitwaghchaure
4cd17a4c44 Merge pull request #2632 from KanchanChauhan/permission-fix
[Fix] Permission fix
2017-01-24 17:47:43 +05:30
Kanchan Chauhan
18708df454 [Fix] Permission manager fix 2017-01-24 17:31:41 +05:30
Kanchan Chauhan
07d33c5c8e [Fix] Unsubscribe url fix 2017-01-24 17:18:25 +05:30
Rushabh Mehta
5227ff1d39 [minor] fix owner for versions 2017-01-24 16:23:07 +05:30
Makarand Bauskar
dc59e978f7 [minor] fixes for Is Your Company Address validations (#2606)
* [WIP] Address & Contacts fixes

* [minor] included sales partner in Addresses and Contacts report

* [minor] filters in address and contact query

* [minor] address and contact utils
2017-01-24 14:38:33 +05:30
robert schouten
ac0c83c77d [fix] print format settings off by default to align with standard (#2627) 2017-01-24 14:36:59 +05:30
Prateeksha Singh
71daa7a485 Fix typo in socketio_client.js (#2629) 2017-01-24 14:36:21 +05:30
Makarand Bauskar
4c95e3e5ef [minor] auth log for login and logout feed (#2624)
* [minor] Authentication log for login & logout

* [minor] added test cases for authentication log
2017-01-24 14:35:52 +05:30
Javier Wong
0ec4c67781 [FIXED] Unable to progress through workflow if "Only Allow Edit For" is Selected (#2573)
* [FIXED] Unable to progress through workflow if "Only Allow Edit For" is Selected
This also fixes the problem where a user is unable to duplicate a document if it is part of a workflow.

* [UPDATED] Unable to progress through workflow if "Only Allow Edit For" is Selected.
2017-01-24 11:17:46 +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
paurosello
583100ac51 Set Only Once for Datetime (#2621)
The same problem that Date was facing appears with Datetime, otherwise it fails as it is comparing different types.
2017-01-24 10:58:33 +05:30
rohitwaghchaure
5b88228d0e [Fix] Email alert not sent to all recipients (#2623) 2017-01-24 10:57:29 +05:30
Faris Ansari
d60ddb67ab more kanban fixes (#2618)
* empty column_name fix

* [fix] card title_field
2017-01-24 10:55:47 +05:30
Rushabh Mehta
fd506d3c12 [minor] Change Google Analytics preference 2017-01-23 15:04:34 +05:30
Rushabh Mehta
1d8ab20bf4 [fix] dont notify to administrator 2017-01-20 17:15:53 +05:30
Rushabh Mehta
08a83f403f [cleanup] timeline sorting 2017-01-20 16:49:30 +05:30
Rushabh Mehta
1dc69da96f [cleanup] revert email fixes 2017-01-20 16:12:13 +05:30
Nabin Hait
94c3af5815 Merge branch 'hotfix' 2017-01-20 15:26:01 +05:30
Nabin Hait
80e97a535b Merge branch 'master' into develop 2017-01-20 15:26:01 +05:30
Nabin Hait
3fc6390e2a bumped to version 7.2.12 2017-01-20 15:56:01 +06:00
Nabin Hait
7e8106bff0 Merge pull request #2617 from vjFaLk/message-id-fix
[fix] add brackets to message-id
2017-01-20 14:59:36 +05:30
Rushabh Mehta
88120256ee [wip] [cleanup] fixes to kanban board and timeline 2017-01-20 14:49:35 +05:30
Valmik Jangla
d222f1140a [fix] add brackets to message-id 2017-01-20 00:12:59 -08:00
Saurabh
d294082122 [fix] remove dropbox backup from hooks, backup call is handled by integration service (#2572)
* [fix] remove dropbox backup from hooks, backup call is handled by integration service

* [fix] test case fix for Integration Service scheduler events
2017-01-20 12:28:47 +05:30
Faris Ansari
9ddecfb14b Kanban enhancements (#2609)
* quick kb, some styling

* card ordering fixed

* AssignTo code cleanup

* card ordering fixed

* Empty column_name validation

* filter autosave

* column ordering

* column indicator color

* KB based on custom field

* added add_custom_field method
2017-01-20 11:57:40 +05:30
Rushabh Mehta
20aeaf0e4c [minor] show queueing info for newsletter and commit 2017-01-19 16:56:29 +05:30
Rushabh Mehta
0a86d1941c [fix] boot.py 2017-01-19 15:23:29 +05:30
Rushabh Mehta
e1f1a411c8 [fix] email dialog 2017-01-19 15:05:51 +05:30
Rushabh Mehta
4777650474 [minor] remove user_email permissions 2017-01-19 14:26:40 +05:30
Rushabh Mehta
1110d23fb8 [minor] deduplicate dynamic links 2017-01-19 13:09:28 +05:30
Rushabh Mehta
d0ee7d3f0d [minor] deduplicate dynamic links 2017-01-19 13:08:23 +05:30