Commit graph

11393 commits

Author SHA1 Message Date
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
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
Rushabh Mehta
7ead90e700 [fix] merge conflict 2017-01-10 15:01:22 +05:30
Rushabh Mehta
f4f3a07961 [minor] consistent button style in 404.html 2017-01-10 14:49:17 +05:30
Rushabh Mehta
042e2b09cb [design] Redesign, cleanup Login, Message pages (#2564)
* [cleanup] login, message pages

* [style] cleanups

* [cleanup]

* [cleanup] update password

* [fix] name for web form (fixes edit-profile)
2017-01-10 14:44:42 +05:30
Valmik
1d2a91c393 Added docs to boilerplate for hooks (#2561) 2017-01-10 14:39:38 +05:30
Viet Pham
138e1a3b93 fix #2116 Ignore no password exception for email account on smtp setup (#2555) 2017-01-10 14:39:00 +05:30
Rushabh Mehta
bb16362578 Reportview fixes (#2554)
* [fix] doctype.py dont setup fetch if new

* [fix] show parent data only once by default in report and fix print for report builder
2017-01-10 14:38:26 +05:30
DRogue
251328d824 Added edit button to comments of doc timeline (#2536)
* Added edit button to comments of doc timeline

* Used $timeline_item where applicable
Changed pencil-icon to check-icon while editing
Added hover effect to edit icon
Made octicon-check green and slightly bigger

* Used tabs instead of spaces for indentation

* Update utils.py

* Update timeline.js
2017-01-10 14:37:52 +05:30
Javier Wong
73ff495386 [Enhancement] Email Alert to Role (#2532)
* [Enhancement] Email Alert to Role

* [Fix] Email Alert Value Change for non String Types
- Currently if we listen on say a date, the value change comparison will fail because doc.get will return a unicode type whilst the frappe.db.get_value will return a date time type

* [Fixed] Email Alert Unit Tests
2017-01-10 14:27:26 +05:30
Saurabh
954abfaa43 [document] document for frappe.call (#2304)
* [document] document for frappe.call

* [fix] documentation for frappe.call()

* Update frappe_ajax_call.md
2017-01-10 14:21:58 +05:30
Nabin Hait
f67b5e3b32 Merge branch 'master' into develop 2017-01-10 12:23:35 +05:30
Nabin Hait
a076c69415 Merge branch 'hotfix' 2017-01-10 12:23:34 +05:30
Nabin Hait
625565db5c bumped to version 7.2.7 2017-01-10 12:53:34 +06:00
Nabin Hait
3195de563b Merge pull request #2562 from RobertSchouten/submit_permit
[fix] only show submit message when permitted
2017-01-10 12:16:28 +05:30
robert schouten
a6ff078925 [fix] only show submit message when permitted 2017-01-10 10:09:24 +08:00
Nabin Hait
f928d7e708 fixed conflict 2017-01-09 16:55:40 +05:30
Nabin Hait
deb2784bda Merge branch 'hotfix' 2017-01-09 16:04:32 +05:30
Nabin Hait
02cc23cf89 bumped to version 7.2.6 2017-01-09 16:34:32 +06:00
Nabin Hait
be5d73c5eb Merge pull request #2556 from saurabh6790/auto_email_report_fix
[fix] validate filters before sending a email
2017-01-09 16:03:22 +05:30
Nabin Hait
a29d0a4c35 Update auto_email_report.py 2017-01-09 16:02:51 +05:30
Nabin Hait
44868ae3ce Merge pull request #2559 from netchampfaris/date-picker-fix
DateRange able to select single date #2538
2017-01-09 16:01:17 +05:30
Nabin Hait
5a027053c8 Merge pull request #2552 from nabinhait/filter_dashboard
Reload in_standard_filter property
2017-01-09 15:45:03 +05:30
Faris Ansari
a70a53e814 DateRange able to select single date 2017-01-09 13:39:52 +05:30
Saurabh
ba39d7c04f [fix] validate filters before sending a email 2017-01-07 15:02:49 +05:30
Rushabh Mehta
3ce7907222 [fix] datepicker in web form 2017-01-07 13:02:49 +05:30
Rushabh Mehta
84baa5285d [minor] tree, expand on select, dont collapse 2017-01-06 17:08:49 +05:30
Rushabh Mehta
6580011f8d [fix] date range selection, fixes frappe/erpnext#7394 2017-01-06 16:46:34 +05:30
Nabin Hait
4112407391 Reload in_standard_filter property 2017-01-06 12:56:04 +05:30
Rushabh Mehta
fa4ec39bf3 Revert "Fix Custom Field In Standard Filter" (#2550) 2017-01-05 18:20:50 +05:30
Nabin Hait
d91d519cd4 Update customize_form_field.json 2017-01-05 18:00:46 +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
Britlog
cc763713f4 Fix UnicodeDecodeError (#2531) 2017-01-05 15:17:12 +05:30
Faris Ansari
2cda3130c1 update frappe-gantt to 0.0.2 (#2547) 2017-01-05 15:13:46 +05:30
Viet Pham
0ec38cfdd2 Fix Custom Field In Standard Filter (#2545)
* custom_field in_standard_filter fix

* add missing files

* Update custom_field_in_standard_filter_fix.py
2017-01-05 15:13:36 +05:30
rohitwaghchaure
0bf453a204 [Fix] Super object has no attribute on_update (#2543) 2017-01-05 15:09:56 +05:30