Commit graph

14692 commits

Author SHA1 Message Date
Faris Ansari
70859ba621 Remove conflict 2017-04-03 21:11:51 +05:30
Faris Ansari
05629b27b6 [minor] Fix ellipsis, alignment in Subject column 2017-04-03 21:07:44 +05:30
CH
84f35a538b Correction of the currency format for France 2017-04-03 15:59:49 +02:00
Faris Ansari
18dc60cb2e Hide script field from List View 2017-04-03 18:11:08 +05:30
Nabin Hait
a06e4b73d2 Merge pull request #3002 from sagarvora/patch-2
Changed custom_script.json to remove script from list view
2017-04-03 17:54:47 +05:30
Sagar Vora
0a7d07c81d Changed custom_script.json to remove script from list view
Removed Script text from list view since it leads to a visual error.
2017-04-03 17:09:51 +05:30
Prateeksha Singh
f2df24803c Search refactor (#2983)
* [start] basic sidebar function

* remove flicker on fetch

* use promises for global and help results

* add summary view

* single modal, sidebar keyboard selection

* Placeholder and no_results state, result render prep

* Specific empty states, results template no longer special: thus remove reset(), forum results trial

* Add loading state

* more results working

* commonify more results, added images

* All nav results in modal, with recents

* use common utils in awesome bar

* UI fixes

* Remove forum results

* frappe/erpnext#8222 frappe/erpnext#8264
2017-04-03 13:28:37 +05:30
Nabin Hait
eb6bd89ce0 Merge branch 'develop' 2017-04-03 13:17:29 +05:30
Nabin Hait
b580e82c6f bumped to version 8.0.5 2017-04-03 13:47:29 +06:00
Nabin Hait
6437f39579 Merge pull request #2999 from netchampfaris/list-view-html-refactor
List View HTML Refactor
2017-04-03 13:12:31 +05:30
Faris Ansari
bf21c7a229 Final cleanup 2017-04-03 12:53:17 +05:30
Faris Ansari
a84a40cfca Cleanup html, add css for mobile, fixed class names in code 2017-04-03 12:53:17 +05:30
Faris Ansari
7c5483afc0 List view columns based on flexbox
- Used BEM naming for flat css classes
2017-04-03 12:53:17 +05:30
Nabin Hait
f642c2b42b Merge pull request #2998 from mbauskar/feedback
[minor] fixes in feedback trigger, and feedback web page
2017-04-03 12:48:10 +05:30
mbauskar
38e6cdd166 [minor] fixes in feedback trigger, and feedback web page 2017-04-03 12:19:42 +05:30
Nabin Hait
92b63f29e1 Merge pull request #2997 from mbauskar/email-account-fixes
[minor] minor fixes in email_account and added has_attachment in comm…
2017-04-03 11:52:35 +05:30
mbauskar
04331023a2 [minor] minor fixes in email_account and added has_attachment in communication_list.js 2017-04-03 11:50:31 +05:30
Rushabh Mehta
12775c9a5f [fixes] listview strip and email inbox list view 2017-04-03 09:34:18 +05:30
Rushabh Mehta
5e55f66db2 [minor] fix rename_doc for old patches 2017-04-02 21:17:29 +05:30
Nabin Hait
ca2604dee1 Merge branch 'develop' 2017-04-01 19:02:12 +05:30
Nabin Hait
f9aa7932d3 bumped to version 8.0.4 2017-04-01 19:32:12 +06:00
Nabin Hait
08ed87663a Modified date changed for user json 2017-04-01 19:01:09 +05:30
Nabin Hait
b47787ff01 Update patches.txt 2017-04-01 02:14:34 +05:30
Nabin Hait
2de7f5c1aa Merge pull request #2993 from nabinhait/develop
Reload contact to update new module, which is required while reloading communication
2017-04-01 02:00:43 +05:30
Nabin Hait
3f7c514a48 Reload contact to update new module, which is required while reloading communication 2017-04-01 01:57:38 +05:30
Rushabh Mehta
e31db06ce7 [fix] move user role setting to erpnext 2017-03-31 23:02:01 +05:30
Nabin Hait
9d6ee65c12 Merge branch 'develop' 2017-03-31 18:16:54 +05:30
Nabin Hait
fb36fca710 bumped to version 8.0.3 2017-03-31 18:46:54 +06:00
Faris Ansari
53292122c2 Fix empty state Kanban Board (#2991)
- frappe/erpnext#8236
2017-03-31 17:38:27 +05:30
Rushabh Mehta
49517479cc [fix] update global search in the foreground process while migration, fixes frappe/erpnext#8233 2017-03-31 17:32:51 +05:30
Rushabh Mehta
e8af0b15b1 [minor] add a separator for append_number_if_name_exists 2017-03-31 17:21:21 +05:30
Rushabh Mehta
2c8754a96e [fix] save un translated doctype names for desktop icons, fixes frappe/erpnext#8157 2017-03-31 17:18:17 +05:30
Rushabh Mehta
c52781952d [fix] no ready events in desk 2017-03-31 16:41:57 +05:30
Rushabh Mehta
3076b2cc7a [fix] frappe.ready 2017-03-31 16:36:33 +05:30
Rushabh Mehta
6273cfc96a [fix] datepicker should be selected on show, fixes frappe/erpnext#8102 2017-03-31 16:00:16 +05:30
Rushabh Mehta
a5e7b3483b [fix] timepicker in modal blurs on scroll fixes frappe/erpnext#8002 2017-03-31 15:07:23 +05:30
Nabin Hait
95bdf78585 Merge pull request #2986 from netchampfaris/query-report-fix
[fix] Query report refresh on filter change
2017-03-31 12:45:08 +05:30
Faris Ansari
522da8e57b [fix] Query report refresh on filter change
- frappe/frappe#2874
- frappe/frappe#2949
2017-03-31 12:25:26 +05:30
Nabin Hait
12ce0c1db5 Merge pull request #2984 from netchampfaris/ui-fixes
Page length always 20
2017-03-31 12:12:30 +05:30
Nabin Hait
dc5e3d4eae Merge pull request #2985 from netchampfaris/summernote-fixes
[minor] Fix summernote drag drop event
2017-03-31 12:10:01 +05:30
Faris Ansari
4e6d11c2b6 [minor] Fix summernote drag drop event 2017-03-31 12:01:24 +05:30
Faris Ansari
ed601f51cc Page length always 20, frappe/erpnext#8256 2017-03-31 11:46:45 +05:30
Nabin Hait
4e403b0f5d Merge pull request #2982 from mbauskar/hotfix
[patch] Email inbox desktop icon fixes
2017-03-31 11:44:45 +05:30
Nabin Hait
84798ea48b Merge pull request #2976 from netchampfaris/ui-fixes
[fix] list view assign to area
2017-03-31 11:15:43 +05:30
Saurabh
7e220d6d5e [fix] show site wise background jobs (#2977)
* [fix] show site wise background jobs

* Update background_jobs.py

* Update background_jobs.py
2017-03-31 10:58:37 +05:30
mbauskar
4de21b8024 [patch] Email inbox desktop icon fixes 2017-03-31 08:49:15 +05:30
Nabin Hait
c987dccd55 Merge branch 'hotfix' 2017-03-30 23:56:13 +05:30
Nabin Hait
d586217ddb bumped to version 8.0.2 2017-03-31 00:26:13 +06:00
Nabin Hait
116016499f Fixed Listview rendering of File. Fixes frappe/erpnext#8240 2017-03-30 23:45:36 +05:30
Nabin Hait
a10425059f Merge branch 'hotfix' 2017-03-30 19:33:12 +05:30