Commit graph

8801 commits

Author SHA1 Message Date
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
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
Nabin Hait
d45f3baa55 Merge branch 'develop' 2015-12-29 14:14:16 +05:30
Nabin Hait
aec07d7802 bumped to version 6.16.3 2015-12-29 14:44:16 +06:00
Nabin Hait
8ba1ec7117 Merge pull request #1484 from nabinhait/fields_order
[patch] Fixed fields order
2015-12-29 14:12:34 +05:30
Nabin Hait
092f428b07 [patch] Fixed fields order 2015-12-29 13:39:53 +05:30
Rushabh Mehta
6019239bb9 [fix] patch 2015-12-29 12:52:58 +05:30
Rushabh Mehta
f77daaf7c1 [fix] reload error snapshot before resetting perms 2015-12-29 09:18:48 +05:30
Anand Doshi
b0a002ba76 [fix] catch authentication failed error in get server 2015-12-28 19:59:50 +05:30
Nabin Hait
7066a6ca97 Merge branch 'develop' 2015-12-28 18:34:54 +05:30
Nabin Hait
e4e87651e5 bumped to version 6.16.2 2015-12-28 19:04:54 +06:00
Nabin Hait
5439a392f0 [fix] user defaults based on user permissions 2015-12-28 18:34:00 +05:30
Nabin Hait
94061cd613 Merge branch 'develop' 2015-12-28 15:19:57 +05:30
Nabin Hait
5dcec879ab bumped to version 6.16.1 2015-12-28 15:49:56 +06:00
Nabin Hait
767440650c [change-log] 2015-12-28 15:19:05 +05:30
Nabin Hait
75161bd438 Merge branch 'develop' 2015-12-28 15:07:38 +05:30
Nabin Hait
b3d8e4b392 bumped to version 6.16.0 2015-12-28 15:37:38 +06:00
Nabin Hait
18e3b02389 [translations] 2015-12-28 14:37:30 +05:30
Nabin Hait
4246e1423c docs updated 2015-12-28 14:25:12 +05:30
Nabin Hait
2c19a26f6c Merge pull request #1479 from rmehta/error-snapshot-perms
[fix] [minor] Error Snapshot only for Administrator
2015-12-28 12:45:57 +05:30
Nabin Hait
aa73714dc7 Merge pull request #1478 from saurabh6790/installer_fixes
[fixes] Patch Fixes
2015-12-28 12:44:40 +05:30
Rushabh Mehta
4b3a022226 [fix] [minor] Error Snapshot only for Administrator 2015-12-28 11:15:59 +05:30
Rushabh Mehta
6d54ab4bfb [fix] set_input in reportview edit, fixes frappe/erpnext#4544 2015-12-28 10:55:30 +05:30
Rushabh Mehta
9a5d7794c5 [minor] add frappe.db.get_default to jinja 2015-12-28 10:41:17 +05:30
Saurabh
22a52f368e [fixes] Patch Fixes 2015-12-27 11:10:58 +05:30
Anand Doshi
14d20d6360 [fix] fieldnames should be lowercase 2015-12-25 16:09:29 +05:30
Anand Doshi
71eb51367c [hotfix] trigger language change on load 2015-12-25 15:10:39 +05:30
Anand Doshi
6388842866 [hotfix] defaults in create_new 2015-12-25 12:38:16 +05:30
Rushabh Mehta
ab8c1affa0 Merge pull request #1477 from anandpdoshi/fix/oauth-login
[fix] facebook oauth, login using token
2015-12-24 22:08:11 +05:30
Anand Doshi
293a8136cb [fix] facebook oauth, login using token. Fixes frappe/erpnext#4166 2015-12-24 20:37:45 +05:30
Rushabh Mehta
2a24e01b78 Merge pull request #1475 from anandpdoshi/fix/bulk-expiry
[fix] only expire bulk emails that are Not Sent
2015-12-24 15:07:55 +05:30
Anand Doshi
f98b3c5b25 [fix] only expire bulk emails that are Not Sent 2015-12-24 15:01:39 +05:30
Rushabh Mehta
a5b180f54f Merge pull request #1474 from nabinhait/user_defaults
[fix] Get user defaults based on fieldname in special cases
2015-12-24 14:05:55 +05:30
Nabin Hait
49b7457167 [fix] Get user defaults based on fieldname in special cases 2015-12-24 12:59:29 +05:30