smorele
|
993f2e7299
|
video page translation
|
2016-02-29 10:22:51 +01:00 |
|
smorele
|
0d23f4edfb
|
index translation
|
2016-02-29 10:19:51 +01:00 |
|
smorele
|
4d5c655f76
|
Merge commit '0cce9518f9b85fa08b002f9b58fb602b0bd36bca' into develop
|
2016-02-29 10:18:33 +01:00 |
|
smorele
|
e177fcc9f3
|
add folders to doc translations
|
2016-02-29 10:18:20 +01:00 |
|
Anand Doshi
|
0cce9518f9
|
[hotfix] undo escape_html for data formatter
|
2016-02-29 12:09:22 +05:30 |
|
MaxMorais
|
9ea3d761d9
|
[fix] Add suport to unicode chars in Labels of Reports
|
2016-02-29 12:09:21 +05:30 |
|
Anand Doshi
|
7e5c1c3caa
|
Merge branch 'develop'
|
2016-02-26 20:55:31 +05:30 |
|
Anand Doshi
|
bb3ce39062
|
bumped to version 6.24.7
|
2016-02-26 21:25:31 +06:00 |
|
Anand Doshi
|
7e6d728c61
|
[fix] reload docfield
|
2016-02-26 20:52:35 +05:30 |
|
Nabin Hait
|
2163f49114
|
Merge branch 'develop'
|
2016-02-26 17:34:09 +05:30 |
|
Nabin Hait
|
df0b89b24e
|
bumped to version 6.24.6
|
2016-02-26 18:04:09 +06:00 |
|
Nabin Hait
|
50a321499e
|
Merge pull request #1596 from anandpdoshi/fix/email-send-back-in-reply-to
[fix] Prevent infinite back and forth between two frappe email accounts by sending In-Reply-To like any mail client
|
2016-02-26 17:31:31 +05:30 |
|
Nabin Hait
|
11c3213cd4
|
Merge pull request #1595 from anandpdoshi/fix/js-validate-email
[fix] Validate email even if they are separated by new line
|
2016-02-26 17:22:45 +05:30 |
|
Anand Doshi
|
1123387687
|
[fix] Prevent infinite back and forth between two frappe email accounts by sending In-Reply-To like any mail client
|
2016-02-26 17:19:05 +05:30 |
|
Anand Doshi
|
c2a8526466
|
[fix] show unchecked checkboxes using icon-ban-circle instead of empty box
|
2016-02-26 16:52:00 +05:30 |
|
Nabin Hait
|
e48d61f8fd
|
Merge pull request #1593 from shreyasp/config_generate
[Major] Multi-bench setup
|
2016-02-26 16:29:36 +05:30 |
|
Anand Doshi
|
3b5f10e87e
|
[fix] socketio - use ports defined in bench/config.json
|
2016-02-26 16:11:01 +05:30 |
|
Anand Doshi
|
75d9244cd6
|
[fix] Validate email even if they are separated by new line
|
2016-02-26 16:05:42 +05:30 |
|
Anand Doshi
|
2c0e1b3ab2
|
[fix] show unchecked checkboxes using icon-ban-circle instead of empty box
|
2016-02-26 15:43:26 +05:30 |
|
Nabin Hait
|
6a273d873a
|
Merge branch 'develop'
|
2016-02-26 15:20:24 +05:30 |
|
Nabin Hait
|
0164c566d3
|
bumped to version 6.24.5
|
2016-02-26 15:50:24 +06:00 |
|
Anand Doshi
|
52d6784b47
|
[fix] for static jinja files, run markdown after rendering jinja and don't sanitize html
|
2016-02-26 15:18:06 +05:30 |
|
Nabin Hait
|
e6da245f5b
|
Merge branch 'develop'
|
2016-02-25 15:19:48 +05:30 |
|
Nabin Hait
|
d536190da1
|
bumped to version 6.24.4
|
2016-02-25 15:49:48 +06:00 |
|
Anand Doshi
|
220b65aea9
|
[hotfix] Communication: change field option to Email for CC field
|
2016-02-25 15:18:40 +05:30 |
|
Anand Doshi
|
cea14c85ee
|
[hotfix] Communication: change field option to Email for From and To fields
|
2016-02-25 15:17:06 +05:30 |
|
Nabin Hait
|
369fe07a31
|
Merge branch 'develop'
|
2016-02-25 15:08:35 +05:30 |
|
Nabin Hait
|
eaa9ac87a7
|
bumped to version 6.24.3
|
2016-02-25 15:38:35 +06:00 |
|
Anand Doshi
|
34af73de33
|
[hotfix] Additional whitelist tags in sanitize_html
|
2016-02-25 15:07:02 +05:30 |
|
Nabin Hait
|
67a329ea32
|
Merge branch 'develop'
|
2016-02-25 12:25:05 +05:30 |
|
Nabin Hait
|
d2b8fa79d1
|
bumped to version 6.24.2
|
2016-02-25 12:55:05 +06:00 |
|
Anand Doshi
|
a8adc35243
|
[fix] bulk mail queue - UnicodeDecodeError
|
2016-02-25 12:07:09 +05:30 |
|
Nabin Hait
|
029bf366b8
|
Merge branch 'develop'
|
2016-02-25 11:58:11 +05:30 |
|
Nabin Hait
|
faa62bdf37
|
bumped to version 6.24.1
|
2016-02-25 12:28:11 +06:00 |
|
Nabin Hait
|
a354c29610
|
Merge pull request #1590 from neilLasrado/develop
Fixes in Setup Wizard
|
2016-02-25 10:43:15 +05:30 |
|
Anand Doshi
|
1e347dc8e9
|
[fix] site sync queues - IncorrectSitePath
|
2016-02-24 23:40:10 +05:30 |
|
shreyas
|
8cbc991037
|
[Fix] Getting redis and socketio from config for multi-bench setup
|
2016-02-24 22:55:39 +05:30 |
|
Neil Trini Lasrado
|
53f3e15e92
|
Fixes in Setup Wizard
|
2016-02-24 18:06:57 +05:30 |
|
Nabin Hait
|
a070e2107b
|
Merge branch 'develop'
|
2016-02-24 17:46:25 +05:30 |
|
Nabin Hait
|
7ab7594195
|
bumped to version 6.24.0
|
2016-02-24 18:16:25 +06:00 |
|
Nabin Hait
|
a84dfdb29c
|
[fix] IFrame included in html sanitizer svg elements
|
2016-02-24 17:41:59 +05:30 |
|
Nabin Hait
|
5649950dd2
|
[translations]
|
2016-02-24 14:40:00 +05:30 |
|
Nabin Hait
|
be58094db3
|
Merge pull request #1589 from anandpdoshi/fix/dropbox-backup-error-handling
[fix] Try to reconnect to dropbox if token expires. Also upgrade to oauth2.
|
2016-02-24 14:32:43 +05:30 |
|
Anand Doshi
|
a79bb3cf6e
|
[fix] Try to reconnect to dropbox if token expires. Also upgrade to oauth2.
|
2016-02-24 13:02:19 +05:30 |
|
Nabin Hait
|
7b9eb7444e
|
Merge pull request #1578 from sbkolate/develop
Enable Custom Fields in Naming Series # 3019 of ERPNext Issue
|
2016-02-24 12:54:48 +05:30 |
|
Rushabh Mehta
|
8ca3fea762
|
[minor] [fix] [docs] fix missing link
|
2016-02-24 12:53:53 +05:30 |
|
Nabin Hait
|
4425e5b99e
|
Merge pull request #1520 from anandpdoshi/fix/sanitize-doc
[fix] Sanitize form_dict and doc values to prevent XSS
|
2016-02-24 12:43:07 +05:30 |
|
Nabin Hait
|
1f42f93b4b
|
Merge pull request #1587 from anandpdoshi/fix/download-in-js
[fix] frappe.tools.downloadify: use data-url if download feature is missing in link tag
|
2016-02-24 12:40:48 +05:30 |
|
Nabin Hait
|
a0c8e96003
|
Merge pull request #1588 from neilLasrado/develop
Added new_line_sep to data.py
|
2016-02-24 11:18:39 +05:30 |
|
Neil Trini Lasrado
|
a3999826b6
|
Added new_line_sep to data.py
|
2016-02-23 18:54:02 +05:30 |
|