Commit graph

11427 commits

Author SHA1 Message Date
Nabin Hait
985f1323ad Fixed merge conflict 2017-01-17 15:50:30 +05:30
Nabin Hait
c1cf48b994 Merge branch 'hotfix' 2017-01-17 15:42:50 +05:30
Nabin Hait
575a6ed478 bumped to version 7.2.11 2017-01-17 16:12:50 +06:00
Nabin Hait
36c4d42dfb Merge pull request #2589 from rohitwaghchaure/email_attachments
[Fix] Add attached documents in the attachments folder
2017-01-17 15:37:21 +05:30
Nabin Hait
9bbbbdfaac Merge pull request #2594 from mbauskar/master
[fixes] added logout feed
2017-01-17 15:36:37 +05:30
Nabin Hait
7b8dda7745 Update auth.py 2017-01-17 15:36:07 +05:30
robert schouten
fdfb6a9e28 email inbox fixes (#2592)
* email inbox fixes

* email inbox fix route flags

* email inbox fixes
2017-01-17 13:22:47 +05:30
mbauskar
8ce126fe66 [minor] checked if doc is new before update_fields_to_fetch 2017-01-16 18:52:36 +05:30
mbauskar
c4c7d507a8 [minor] logout feed for activity logs 2017-01-16 15:26:09 +05:30
Rushabh Mehta
1f949731a4 [typo] address docs 2017-01-16 13:05:51 +05:30
Nabin Hait
c1155eb6e6 Merge branch 'hotfix' 2017-01-16 13:00:59 +05:30
Nabin Hait
ed117d9ce7 Merge branch 'master' into develop 2017-01-16 13:00:59 +05:30
Nabin Hait
1824ad837b bumped to version 7.2.10 2017-01-16 13:30:59 +06:00
Rushabh Mehta
610e0f199c [minor] contact.get_link_name 2017-01-16 12:15:23 +05:30
Rushabh Mehta
7fff0908a4 [cleanup] simplify role setting for user 2017-01-13 23:28:02 +05:30
Rushabh Mehta
b72e72cd77 [fix] test records for address 2017-01-13 23:04:27 +05:30
Rushabh Mehta
445510860c [fix] test records for contact 2017-01-13 22:57:04 +05:30
Rushabh Mehta
19941e3999 [minor] remove debug 2017-01-13 19:07:08 +05:30
Rushabh Mehta
d6c3c9a8e7 [enhance] moved contact to frappe 💥 2017-01-13 18:52:41 +05:30
Rohit Waghchaure
853b98d3c3 [Fix] Add attached documents in the attachments folder 2017-01-13 18:16:02 +05:30
Nabin Hait
d4116f2262 Merge pull request #2588 from rohitwaghchaure/show_total_issue
[Fix] Show totals not working for custom report
2017-01-13 17:00:43 +05:30
Rohit Waghchaure
c5f1ecce01 [Fix] Show totals not working for custom report 2017-01-13 16:01:26 +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
Nabin Hait
6d9c1699c4 Merge branch 'hotfix' 2017-01-13 14:33:23 +05:30
Nabin Hait
1de3b597ac Merge branch 'master' into develop 2017-01-13 14:33:23 +05:30
Nabin Hait
e0c2163aaf bumped to version 7.2.9 2017-01-13 15:03:23 +06:00
Rushabh Mehta
4ac1863027 [fix] patch 2017-01-13 14:32:17 +05:30
Nabin Hait
c0707ad1f7 Merge pull request #2579 from KanchanChauhan/datepicker-fix
Date picker fixes for filter selection
2017-01-13 12:05:12 +05:30
Nabin Hait
ec6ab59fd2 Merge pull request #2586 from rohitwaghchaure/assignment_issue
[Fix] User not able to assign
2017-01-13 11:48:23 +05:30
Rohit Waghchaure
25349860bb [Fix] User not able to assign the transaction 2017-01-13 11:21:54 +05:30
Rushabh Mehta
ab3e845460 [fix] patch 2017-01-12 16:29:23 +05:30
Rushabh Mehta
f3923e34f2 [fix] totals for saved reports, fixes frappe/erpnext#7424 2017-01-12 15:57:04 +05:30
rohitwaghchaure
4dfd10b0e6 remove super from help article (#2585) 2017-01-12 14:37:45 +05:30
Faris Ansari
d3d957c10a [fix] AssignToDialog in ListView frappe/erpnext#7459 (#2584) 2017-01-12 13:06:47 +05:30
Kanchan Chauhan
4c6f483b06 Date picker fixes for filter selection 2017-01-12 13:03:19 +05:30
Saurabh
8c0a67cde8 [fix] make tree params which includs custom mandatory params (#2571) 2017-01-12 11:26:14 +05:30
Saurabh
76e41feac7 [minor][fix] #6875 (#2569) 2017-01-12 11:25:21 +05:30
Faris Ansari
31f978e4ed [Print Settings] Allow page break inside tables (#2565) 2017-01-12 11:24:24 +05:30
strixaluco
b9562b00ee [minor] login page typo fix (#2580) 2017-01-12 11:23:02 +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
OluyomiKay
2017502b3f Drag and drop multiple attachments (#2467)
* Drag and drop multiple attachments

* Drag and drop multiple attachments
2017-01-11 11:00:04 +05:30
Nabin Hait
3a2642e3f7 Merge branch 'master' into develop 2017-01-10 18:00:52 +05:30
Nabin Hait
e6383dcaa8 Merge branch 'hotfix' 2017-01-10 18:00:51 +05:30
Nabin Hait
0c3760c439 bumped to version 7.2.8 2017-01-10 18:30:51 +06:00
Nabin Hait
2065118755 Merge pull request #2566 from rmehta/commit-session
[minor] commit update timestamp in sessions.py
2017-01-10 17:57:19 +05:30
Rushabh Mehta
c711179fa6 [minor] commit update timestamp in sessions.py 2017-01-10 17:52:15 +05:30
Rushabh Mehta
0618b98c92 [minor] cleanup to comment update and maintenance mode page 2017-01-10 17:50:36 +05:30
Rushabh Mehta
a5b4f8ce7d [cleanup] for kanban 2017-01-10 15:43:26 +05:30
Faris Ansari
21a2b88d71 Kanban Board #2172 (#2542)
* [kanban] wip

* [kanban] refresh views on kanban change, add kanban board to title, kanban cards draggable

* update field on column change, open form when clicked

* [kanban] refactor into new view KanbanView

* [kanban] minor

* [kanban] refactor into classes

* [kanban] refactor wip

* [kanban] Show Board button in kanban board

* [kanban] add card, move card

* [kanban] wip

* [kanban] filters wip

* [kanban] add new column wip

* [kanban] filters sort-of working

* [kanban] filters still not working, ugh

* another failed attempt :(

* [kanban] filters working, added quick edit for cards

* [kanban] add column partially working

* added assign to

* kanban using stores wip

* wip

* add card, add column working without refresh

* save filter button

* show card meta

* delete column

* fluxify data flow

* change:cards working

* delete changed to archive

* removed old store implementation

* restore column option

* edit card title, api cleanup

* kanban_column_order wip

* kanban column order wip2

* order save finished

* fix new card sorting

* cleanups

* fixed undefined card

* fixed refresh on list view change

* cleanups
2017-01-10 15:06:06 +05:30