Commit graph

9085 commits

Author SHA1 Message Date
Anand Doshi
106e281608 [fix] don't allow import for child tables 2016-01-06 12:22:03 +05:30
Anand Doshi
cfdaf5b10a [minor] added back edit-link 2016-01-05 19:20:35 +05:30
Anand Doshi
3fa108bfec Merge branch 'develop' 2016-01-05 19:09:06 +05:30
Anand Doshi
ea0b635c03 bumped to version 6.17.3 2016-01-05 19:39:06 +06:00
Anand Doshi
3a73cbab59 [docs] 2016-01-05 19:07:56 +05:30
Anand Doshi
0134ac78e6 Merge pull request #1497 from nabinhait/custom_field_idx
[fix] Set _idx based on Custom Field
2016-01-05 18:44:57 +05:30
Anand Doshi
1386e86483 Merge pull request #1494 from rmehta/translations
[translation] fixes
2016-01-05 18:40:16 +05:30
Anand Doshi
01ad5b0b29 [fix] tabbing in grid and collapsed sections 2016-01-05 18:22:57 +05:30
Anand Doshi
d32444151f [minor] don't update modified in last scheduler event 2016-01-05 18:22:43 +05:30
Anand Doshi
054005e331 [fix] setup wizard language trigger 2016-01-05 16:26:32 +05:30
Anand Doshi
989e0c24ea [minor] add column liked_by 2016-01-05 16:26:32 +05:30
Nabin Hait
61866f6a8a [fix] Set _idx based on Custom Field 2016-01-05 15:18:19 +05:30
Nabin Hait
aaa5765995 Merge pull request #1496 from nabinhait/fix22
minor fix
2016-01-05 11:16:45 +05:30
Nabin Hait
8b88b18f11 minor fix 2016-01-05 11:16:02 +05:30
Anand Doshi
c0b8438688 Merge branch 'develop' 2016-01-04 18:25:01 +05:30
Anand Doshi
bb00724062 bumped to version 6.17.2 2016-01-04 18:55:01 +06:00
Anand Doshi
4e5a9e46b7 [patch] 2016-01-04 18:23:12 +05:30
Anand Doshi
8a04ef7bc4 Merge pull request #1495 from saurabh6790/installer_fixes
[fixes] message_title fixes
2016-01-04 18:17:04 +05:30
Saurabh
2a8d9ed889 [fixes] message_title fixes 2016-01-04 18:06:58 +05:30
Anand Doshi
54a1400fca Merge branch 'develop' 2016-01-04 17:57:43 +05:30
Anand Doshi
12c04f1908 bumped to version 6.17.1 2016-01-04 18:27:43 +06:00
Anand Doshi
7fba47b75d [fix] web.html and breadcrumbs 2016-01-04 17:51:38 +05:30
Anand Doshi
f93509ffb4 [fix] Don't allow to like one's own document, allow deletion of own Like comment 2016-01-04 17:51:38 +05:30
Anand Doshi
2ece94a485 Merge branch 'develop' 2016-01-04 16:52:28 +05:30
Anand Doshi
a7aaba911d bumped to version 6.17.0 2016-01-04 17:22:28 +06:00
Anand Doshi
fa26f6c6f3 [translations] 2016-01-04 16:50:18 +05:30
Anand Doshi
babd355fe4 [cleanup] removed toggle template blocks 2016-01-04 16:50:11 +05:30
Anand Doshi
19c1d651f2 [hotfix] removed load_via_ajax 2016-01-04 16:28:42 +05:30
Anand Doshi
05832984b5 [change-log] 2016-01-04 16:18:55 +05:30
Rushabh Mehta
3d1960c798 [translation] fixes 2016-01-04 16:11:18 +05:30
Rushabh Mehta
f14466100e [fix] minor listing css 2016-01-04 15:13:11 +05:30
Anand Doshi
33d45b4e52 Merge pull request #1493 from rmehta/load-js-after-html
[website] load js after html
2016-01-04 11:40:40 +05:30
Anand Doshi
9f94fd11a7 Merge pull request #1489 from anandpdoshi/feature/like
[feature] Ability to like a document, comment or communication, see notifications about it and view it on activity feed
2016-01-04 11:39:59 +05:30
Rushabh Mehta
eac452a926 [cleanup] web templates, now using standard jinja architecture and removed push-state 2016-01-01 17:49:25 +05:30
Rushabh Mehta
308913fd03 [website] load js after html 2016-01-01 17:17:47 +05:30
Anand Doshi
3241a0969f [feature] Ability to like a document, comment or communication, see notifications about it and view it on activity feed 2016-01-01 12:50:14 +05:30
mbauskar
629221c8bd Merge branch 'develop' of http://github.com/frappe/frappe into develop 2015-12-31 16:39:50 +05:30
Nabin Hait
7462b993d7 Merge branch 'develop' 2015-12-31 16:12:57 +05:30
Nabin Hait
c283249fea bumped to version 6.16.4 2015-12-31 16:42:57 +06:00
Nabin Hait
675ce88eca [change-log] 2015-12-31 16:10:35 +05:30
Nabin Hait
d94d326c65 Merge pull request #1490 from nabinhait/fix43
Toggle enable funciton for grid
2015-12-31 15:40:36 +05:30
Nabin Hait
110374cc8a Merge pull request #1487 from nabinhait/file_size
Increased file size limit upto 10MB
2015-12-31 15:40:12 +05:30
Nabin Hait
3008d41ebb Merge pull request #1486 from rmehta/docs-fixes
[fixes] [docs] added videos to tutorial and remove __init__ from function names
2015-12-31 15:40:04 +05:30
Nabin Hait
151852cbf7 Merge pull request #1485 from MaxMorais/patch-9
Fix UnicodeDecodeError
2015-12-31 15:39:38 +05:30
Nabin Hait
a29ce14e49 Toggle enable funciton for grid 2015-12-31 13:22:35 +05:30
Anand Doshi
2dfbdac737 [minor] pass device in clear_sessions 2015-12-31 12:56:21 +05:30
Rushabh Mehta
e3a2b1265c [minor] quit install if before_install returns False and encoding in importer 2015-12-31 11:11:03 +05:30
Rushabh Mehta
4552ab12c6 [fixes] [docs] added videos to tutorial and remove __init__ from function names 2015-12-30 12:34:00 +05:30
Nabin Hait
bc731a0a69 Increased file size limit upto 10MB 2015-12-30 11:08:41 +05:30
Maxwell
3930e543c0 Fix UnicodeDecodeError
```
19:38:09 web.1                | Traceback (innermost last):
19:38:09 web.1                |   File "/vagrant/frappe-bench/apps/frappe/frappe/utils/error.py", line 36, in make_error_snapshot
19:38:09 web.1                |     snapshot = get_snapshot(exception)
19:38:09 web.1                |   File "/vagrant/frappe-bench/apps/frappe/frappe/utils/error.py", line 67, in get_snapshot
19:38:09 web.1                |     'evalue': cstr(evalue),
19:38:09 web.1                |   File "/vagrant/frappe-bench/apps/frappe/frappe/utils/data.py", line 256, in cstr
19:38:09 web.1                |     return unicode(s)
19:38:09 web.1                |  UnicodeDecodeError: 'ascii' codec can't decode byte 0xc3 in position 14: ordinal not in range(128)
```

Dont ask me why this silly change works, but it works!
2015-12-29 12:16:50 -02:00