Commit graph

11193 commits

Author SHA1 Message Date
Javier Wong
bf06de8ec9 [FIXED] Problem with re-ordering grid items for non editable grid (#2456) 2016-12-15 15:12:59 +05:30
OluyomiKay
eb97b2a739 Create link to task from assigned owner (#2449) 2016-12-15 15:12:26 +05:30
Rushabh Mehta
bbf88108f7 [fix] data import for same doctype appearing multiple ptimes, #2228 (#2450) 2016-12-15 15:11:51 +05:30
rohitwaghchaure
d0bd31e95b [Enhancement] Custom menu for reportview (#2452) 2016-12-15 15:10:15 +05:30
Nabin Hait
fa00e8e3b2 Added standard filters 2016-12-15 14:58:16 +05:30
robert schouten
c044c476a8 move message_id threading to communication to work with inbox (#2458)
* move message_id threading to communication to work with inbox

* move message_id threading fix

* rebase fix

* reset threading to email queue but keep in communications
2016-12-15 14:50:52 +05:30
robert schouten
efa86c6e31 Email cc in headers if expose recipients (#2441)
* move email cc to header

* [test fixes] move email cc to header

* email cc additional tests

* email cc cleanup and unsubsribe link test

* email cc permit footer based cc with expose_recipient and tests + ui
2016-12-15 09:49:54 +05:30
Faris Ansari
c455c40797 [fix] mobile sidebar close button (#2462) 2016-12-15 09:47:10 +05:30
Neil Trini Lasrado
44152ae520 Added ability to collect dynamic payments in webforms (#2440) 2016-12-14 15:17:30 +05:30
Nabin Hait
87c25cb825 Merge pull request #2453 from netchampfaris/tree-decoration
Treeview decoration
2016-12-14 13:08:44 +05:30
Nabin Hait
bc943c2ee3 Merge pull request #2457 from frappe/neilLasrado-documentation
Update generating-docs.md
2016-12-14 13:08:00 +05:30
Neil Trini Lasrado
a9dfad0cb7 Update generating-docs.md
Changed bench command for documentation generation.
2016-12-14 12:12:08 +05:30
Faris Ansari
e0b7308f86 Treeview decoration 2016-12-13 16:15:08 +05:30
Nabin Hait
a70925926f Merge branch 'master' into develop 2016-12-13 14:21:19 +05:30
Nabin Hait
5ed01b6331 Merge branch 'hotfix' 2016-12-13 14:21:18 +05:30
Nabin Hait
29025bf917 bumped to version 7.1.25 2016-12-13 14:51:18 +06:00
khatrijitendra
d31aa1f41c Make Translation of Options in select field of web form (#2447) 2016-12-13 13:00:30 +05:30
Nabin Hait
04ad313eab Remove web forms on uninstalling app (#2446) 2016-12-13 13:00:08 +05:30
zeroheure
8f017e3a22 improve french sentences (#2445) 2016-12-13 12:59:39 +05:30
zeroheure
bc7e69c29e fix typos (#2444) 2016-12-13 12:59:08 +05:30
zeroheure
64861e6322 library means bibliothèque not librairie & fix typos (#2443) 2016-12-13 12:58:24 +05:30
Rushabh Mehta
b9fd3ea5aa [minor] fix image view, frappe/erpnext#7062 2016-12-12 16:31:39 +05:30
Rushabh Mehta
7128289ad6 [minor] fix image view, frappe/erpnext#7062 2016-12-12 15:45:05 +05:30
DrTrills
a1588b7a53 added sudo for nginx reload. (#2438) 2016-12-12 14:35:05 +05:30
Rushabh Mehta
0c15b1b160 [minor] set a default locale for web 2016-12-12 12:08:17 +05:30
Rushabh Mehta
07ce46668f [minor] remove kb icon and module 2016-12-10 11:20:58 +05:30
Rushabh Mehta
d01cfcf736 [fix] permissions for kb 2016-12-10 11:16:39 +05:30
Rushabh Mehta
ca97204bdb [fix] tests + add google analytics id in docs 2016-12-09 16:39:38 +05:30
Rushabh Mehta
2bf66a6bcb [fix] blog links inside blog post 2016-12-09 16:14:36 +05:30
Rushabh Mehta
e0d582bfd4 [minor] expand all in tree frappe/erpnext#6915 (#2431) 2016-12-09 16:00:48 +05:30
DrTrills
d921ae839c fixed directory path (#2436) 2016-12-09 15:59:32 +05:30
Rushabh Mehta
889079504c Blog fixes (#2437)
* [minor] update fetch field only if null

* [fix] blog filtering, titles etc
2016-12-09 15:59:05 +05:30
Rushabh Mehta
5da6226e2e [minor] web form paging fix 2016-12-08 14:19:29 +05:30
Nabin Hait
958d8ea6c0 Merge branch 'master' into develop 2016-12-08 12:32:20 +05:30
Nabin Hait
1bc35a6926 Merge branch 'hotfix' 2016-12-08 12:32:19 +05:30
Nabin Hait
203ca857db bumped to version 7.1.24 2016-12-08 13:02:19 +06:00
Nabin Hait
8d947dfc4c Merge pull request #2426 from rmehta/print-format-custom-fix
[fix] render from custom template if custom_html is set in print format
2016-12-08 12:21:45 +05:30
Nabin Hait
a0f174621a Merge pull request #2419 from rmehta/update-fetch-on-doctype-save
[enhance] update fetch values on doctype save #2414
2016-12-08 12:20:06 +05:30
Nabin Hait
5c3213ffa8 Update report.py 2016-12-08 12:18:04 +05:30
Rushabh Mehta
cd2d45b37f [minor] create trigger for timeline refresh (#2428) 2016-12-07 14:40:57 +05:30
robert schouten
acfb0996cf hide disabled reports (#2427)
* hide disabled reports

* Update moduleview.py
2016-12-07 14:40:39 +05:30
Rushabh Mehta
337b6c4621 [minor] updated icons for social logins 2016-12-07 12:29:53 +05:30
Saurabh
cff4af8323 [fix] schduler call fix (#2423) 2016-12-07 11:31:32 +05:30
Rushabh Mehta
3eb4266aae [minor] cleanup style of comments (#2425) 2016-12-07 11:31:22 +05:30
khatrijitendra
9a44a83117 Make Translation for introduction in web form (#2420) 2016-12-07 11:30:19 +05:30
Rushabh Mehta
bd0852b965 [fix] email account, add sparkpost, sendgrid as options and refactor property use_tls, fixes frappe/erpnext#7129 (#2418) 2016-12-07 11:29:12 +05:30
Léo
9aeec44087 [fix] correct french translation (#2422) 2016-12-07 11:28:40 +05:30
Rushabh Mehta
103f54d06b [fix] date formatting for languages, fixes #2389 (#2417) 2016-12-07 11:27:53 +05:30
robert schouten
bfadc9f81f move email group with newsletter (#2416) 2016-12-07 11:27:41 +05:30
Faris Ansari
455a43e2cd allow 1 filter to be added at a time! (#2404) 2016-12-07 11:26:26 +05:30