Commit graph

284 commits

Author SHA1 Message Date
Nabin Hait
4112407391 Reload in_standard_filter property 2017-01-06 12:56:04 +05:30
Rushabh Mehta
1caf245673 [fix] use POST for data import tool, fixes #2317, frappe/erpnext#7230 2016-12-15 15:53:45 +05:30
Rushabh Mehta
bbf88108f7 [fix] data import for same doctype appearing multiple ptimes, #2228 (#2450) 2016-12-15 15:11:51 +05:30
Rushabh Mehta
7bc7e3bc63 Upgrade Font Awesome (#2410)
* Font-Awesome V3.x to V4.x

Font-Awesome V3.x to V4.x

* Font Tidy

Font Tidy

* FA4 Upgrade - Html Js & Json

FA4 Upgrade - Html Js & Json

* Minor

Minor
2016-12-05 13:07:03 +05:30
Nabin Hait
178be8893c Merge branch 'master' into develop 2016-11-08 15:20:34 +05:30
robert schouten
aa94847574 [minor]dont show doctypes with all disabled roles in permission manager (#2268) 2016-11-07 16:59:52 +05:30
Rushabh Mehta
424f99e6f3 [cleanup] dashboard filters 2016-10-26 19:33:04 +05:30
Rushabh Mehta
89a77016a5 [minor] dont show disabled roles in permission manager (#2180) 2016-10-25 10:59:41 +05:30
Nabin Hait
b208dcb16b Fixed version conflict 2016-10-18 15:24:38 +05:30
Rushabh Mehta
7d1b29a413 [fix] [import] ignore if time missing while file import 2016-10-18 14:25:11 +05:30
Nabin Hait
41c3e7bb25 Fixed version conflict 2016-10-04 17:43:50 +05:30
Rohit Waghchaure
98304ca1e2 [Fix] data import tool, file format issue 2016-10-04 17:29:52 +05:30
KanchanChauhan
983796fbd4 Select only mandatory childtable fields on Select Mandatory (#2092) 2016-09-26 18:16:50 +05:30
KanchanChauhan
8b78f70b43 Option to send email from Data Import Tool where applicable (#2026) 2016-09-13 13:13:02 +05:30
Rushabh Mehta
e8f377faa3 [minor] added add_indicator in dashboard 2016-08-22 15:21:22 +05:30
Rushabh Mehta
e6a35946ec [minor] added option to show failed jobs in background_jobs 2016-08-19 12:24:01 +05:30
Rushabh Mehta
8a10c642a0 [minor] in background jobs, show current jobs and not failed 2016-08-18 18:45:22 +05:30
Rushabh Mehta
b6bee64370 [enhance] minor fixes + background jobs 2016-08-18 18:26:15 +05:30
rohitwaghchaure
c1fbf1da0a [Fix] Data import tool export issue (#1980) 2016-08-17 10:18:28 +05:30
Rushabh Mehta
de7e288875 [feature] select columns in data import tool 2016-08-11 15:57:59 +05:30
Rushabh Mehta
48756d4b4a [minor] name optional in export-json command 2016-07-29 18:51:08 +05:30
Rushabh Mehta
22c3f7966d [enhance] run actions in background doc.queue_action("submit") 2016-07-19 17:12:37 +05:30
Rushabh Mehta
058c95cbdd [minor] desktop.js 2016-07-15 15:16:27 +05:30
Anand Doshi
b3546f1ebc [fix] show 'click here' in expiry message if upgrade_url is available 2016-07-14 17:43:52 +05:30
Rushabh Mehta
205b349880 [minor] move add_sidebar_items to the top 2016-06-27 18:13:49 +05:30
Anand Doshi
a7ace6ae38 [fix] limits and site_info 2016-06-25 21:56:27 +05:30
Anand Doshi
3854bcad04 [fix] limits variables and how usage is stored within limits + additional fixes 2016-06-25 17:41:19 +05:30
Valmik Jangla
59a39c208d Fixed issues in Usage Info page 2016-06-24 14:38:40 +05:30
Valmik Jangla
0687eb145d Added misc Frappe Subscription features 2016-06-22 12:37:33 +05:30
Rushabh Mehta
0ded47f5cf [fix] desktop icons, fixes frappe/erpnext#5489 2016-06-16 12:48:23 +05:30
Rushabh Mehta
814a7869db Merge pull request #1796 from vjFaLk/import-doc-fix
Fix for import-doc
2016-06-14 10:53:17 +05:30
Valmik Jangla
15c4bbac8f Fix for import-doc 2016-06-14 10:49:31 +05:30
shreyas
9511e14353 Move Frappe subscription features to Frappe App as Limits 2016-06-10 16:34:53 +05:30
Nabin Hait
0130d721c1 Merge branch 'master' into develop 2016-05-20 12:16:59 +05:30
Rushabh Mehta
a612e6e0b5 [added] set_desktop_icons in desktop.py 2016-05-11 15:11:36 +05:30
Anand Doshi
aec7388305 [fix] Data Import Template with Data: Sort by 'lft asc' when nested set model 2016-05-11 13:24:28 +05:30
Rushabh Mehta
9c7d1f2ea8 [cleanups] 2016-04-18 19:26:45 +05:30
Nabin Hait
5e6780923c Merge branch 'master' into develop 2016-04-15 11:07:43 +05:30
Nabin Hait
9273935979 Merge branch 'master' into develop 2016-04-14 18:10:03 +05:30
Neil Trini Lasrado
5655772ff7 Fixed bug in block modules 2016-04-14 17:21:24 +05:30
Rushabh Mehta
5ab8a8d405 [cleanup] form links dashboard and added blocked in Desktop Icons, standard icons hidden by default 2016-04-13 17:21:15 +05:30
Rushabh Mehta
ae0afc73df [cleanup] dashboard and default image 2016-04-11 17:35:01 +05:30
shreyas
32ed9cb7e3 [Fix] Escape single quotes in user name while rendering the modules_setup jinja template 2016-04-11 13:11:00 +05:30
Rushabh Mehta
addda4a30c [fix] open filtered list when clicked on notifications circle 2016-04-11 12:42:12 +05:30
Rushabh Mehta
cb44325f39 [fix] limit open notifications to 20 2016-04-08 18:35:46 +05:30
Anand Doshi
7132935fef Merge branch 'master' into develop 2016-04-07 17:39:51 +05:30
Anand Doshi
b466e136a1 [fix] Explore: hide modules from sidebar if hidden for everyone 2016-04-07 12:38:08 +05:30
Rushabh Mehta
f845df0e2e [fix] notifications for desktop icons 2016-04-06 15:29:55 +05:30
Rushabh Mehta
90fb3ebcb9 [enhancement] added image_field so image will appear in the sidebar 2016-04-04 16:56:35 +05:30
Rushabh Mehta
1c7cb9d275 [minor] [enhancement] submit confirm dialog on enter, fixes frappe/erpnext#4996 2016-03-22 14:30:33 +05:30