Commit graph

9085 commits

Author SHA1 Message Date
Rushabh Mehta
39a253d95e Merge branch 'develop' 2016-02-10 12:21:16 +05:30
Rushabh Mehta
f44165541d bumped to version 6.22.3 2016-02-10 12:51:16 +06:00
Rushabh Mehta
6ba4bb06ff [fix] NotFound if site is not found, remove Async Task, cleanup in translate 2016-02-10 12:17:17 +05:30
Rushabh Mehta
247a484cd0 Merge branch 'develop' 2016-02-10 11:56:53 +05:30
Rushabh Mehta
f0b0c03300 bumped to version 6.22.2 2016-02-10 12:26:53 +06:00
Anand Doshi
7743fd1c65 [hotfix] don't migrate reference_doctype and reference_name from Feed 2016-02-10 11:52:39 +05:30
Rushabh Mehta
0366cadade Merge branch 'develop' 2016-02-10 11:15:41 +05:30
Rushabh Mehta
e40a4b2566 bumped to version 6.22.1 2016-02-10 11:45:41 +06:00
Anand Doshi
f3f72fe570 [hotfix] doc_owner 2016-02-10 11:12:23 +05:30
Rushabh Mehta
95bbe5c7ea [hot] site-not-found is 404 2016-02-10 11:11:59 +05:30
Rushabh Mehta
d5240aa061 [enhancement] added FrappeTask for pre-process, post-process 2016-02-09 18:58:17 +05:30
Anand Doshi
e31ae68f74 [command] new-language lang_code app_name to create lang_code.csv in app_name/translations 2016-02-09 15:56:48 +05:30
Rushabh Mehta
b3864278da Merge branch 'develop' 2016-02-09 12:37:56 +05:30
Rushabh Mehta
a537de3b5d bumped to version 6.22.0 2016-02-09 13:07:56 +06:00
Rushabh Mehta
4eb5ccb78c [change-log] 2016-02-09 12:36:11 +05:30
Rushabh Mehta
1710d223ab [translations
]
2016-02-09 12:26:58 +05:30
Rushabh Mehta
a476feafe0 Merge pull request #1563 from robertschouten/patch-2
PrettyDate improvement
2016-02-09 10:16:35 +05:30
robertschouten
dc1dc3aedf PrettyDate improvement
Hi,
Have an improvement for petty date changed the month annotation to 'M' to avoid confusion with the 'm' annotation for minute
2016-02-09 10:25:00 +08:00
Anand Doshi
cb7f638255 [hotfix] dev_server = 1 2016-02-08 19:09:55 +05:30
Rushabh Mehta
c6493140bb Merge pull request #1562 from anandpdoshi/enhancement/repeat-header-footer
[enhancement] enable/disable repeating header and footer in pdf
2016-02-08 17:51:44 +05:30
Anand Doshi
d8069dbce4 [enhancement] option to enable/disable repeating header and footer in PDFs 2016-02-08 15:15:22 +05:30
Rushabh Mehta
e487a5b9c8 [minor] validate email alert templates 2016-02-08 14:55:53 +05:30
Anand Doshi
18d595c875 [minor] Communication: default sent_or_received=Sent 2016-02-08 14:52:05 +05:30
Rushabh Mehta
38ac775bd6 [cleanup] added frappe.utils.jinja.validate_template 2016-02-08 14:50:19 +05:30
Anand Doshi
7a8858e763 [fix] error.py encode print get_traceback 2016-02-08 14:20:26 +05:30
Anand Doshi
5b45450252 [fix] create optional columns during sync, use email account name if no sender full name 2016-02-08 13:14:00 +05:30
Rushabh Mehta
b6558ebec3 Merge pull request #1532 from anandpdoshi/enhancement/comment-feed-communication-merge
[enhancement] Merge Comment and Feed into Communication
2016-02-08 10:57:39 +05:30
Rushabh Mehta
f1b839e76b Merge pull request #1560 from makeen/status_for_bulk_email_list
Column status for Bulk Mail list
2016-02-08 10:10:37 +05:30
Raul Viveros
ac4a2f300d column status for Bulk Mail list 2016-02-07 23:05:46 +01:00
Rushabh Mehta
d98a90db58 Merge pull request #1557 from saurabh6790/installer_fixes
[fixes] purge pending task
2016-02-06 10:49:24 +05:30
Rushabh Mehta
77bca8554e Merge pull request #1556 from saguas/develop
task_unsubscribe Event.
2016-02-06 10:46:24 +05:30
Anand Doshi
465318878e [enhancement] Merge Comment and Feed into Communication 💥 2016-02-04 17:46:53 +05:30
Rushabh Mehta
4944ff5e22 [fix] add app_name/docs/current to gitignore for new app 2016-02-04 17:13:45 +05:30
Rushabh Mehta
8014979947 [docs] remove /docs/current from repo, since they will be created during build 2016-02-04 17:09:01 +05:30
Nabin Hait
44e8dfeb0a Merge branch 'develop' 2016-02-03 15:18:31 +05:30
Nabin Hait
6baf8c33ff bumped to version 6.21.0 2016-02-03 15:48:31 +06:00
Nabin Hait
3a1c779b25 [change-log] 2016-02-03 15:15:06 +05:30
Nabin Hait
adba5823d7 [docs] 2016-02-03 15:14:53 +05:30
Nabin Hait
b413b37d06 [translations] 2016-02-03 13:12:26 +05:30
Saurabh
30f672456d [fixes] purge queued task 2016-02-03 13:01:03 +05:30
Luis Fernandes
9c929b8463 Add task_unsubscribe to socketio.js. 2016-02-02 13:42:47 +00:00
Luís Fernandes
5343d2be93 Merge pull request #1 from frappe/develop
Update from original
2016-02-02 13:15:20 +00:00
Nabin Hait
a6aa1442cc Merge pull request #1554 from rmehta/form-event-off
[enhancement] [minor] frappe.ui.form.off will clear standard events
2016-02-02 16:08:10 +05:30
Rushabh Mehta
1d4c8223b6 [minor] fix doctor command 2016-02-02 11:05:28 +05:30
Rushabh Mehta
6a01a711bc Merge pull request #1555 from makeen/fix-scheduler-starus-command-doctor
fix scheduler status in command doctor
2016-02-02 05:59:10 +05:30
Raul Viveros
f4909b57ad fix scheduler status in command doctor 2016-02-01 22:20:34 +01:00
Rushabh Mehta
1e3f40bc91 [enhancement] [minor] frappe.ui.form.off will clear standard events 2016-02-01 17:32:49 +05:30
Anand Doshi
2c95a9599e [minor] fix Link selection - set me.selected as false after a timeout 2016-01-29 16:57:58 +05:30
Rushabh Mehta
fff31e5ee6 [fix] add dev_server in desk.html 2016-01-29 16:22:17 +05:30
Anand Doshi
3e4f96fd21 Merge pull request #1548 from neilLasrado/develop
[Minor] fixed code in guess indicator
2016-01-29 12:43:15 +05:30