Commit graph

10122 commits

Author SHA1 Message Date
Rushabh Mehta
54d8c4f851 [fixes] data-sidebar in body and de-duplicate for awesome bar 2016-07-14 16:59:09 +05:30
Anand Doshi
afe991cd94 Merge branch 'vjFaLk-renew-link' into develop 2016-07-14 16:27:40 +05:30
Anand Doshi
5ebfe2e771 [fix] show clickable link in expiry message 2016-07-14 16:27:33 +05:30
Valmik Jangla
427743e8a9 Email to renew after expiry 2016-07-14 15:53:55 +05:30
Anand Doshi
f2a7ce3dc0 [fix] removed mysql auto-connect on 'mysql has gone away' 2016-07-14 14:38:26 +05:30
Rushabh Mehta
83d7ca3c68 [fix] for doctype 2016-07-14 13:49:08 +05:30
Anand Doshi
1e098dc6d7 [fix] send login emails immediately if now is True 2016-07-14 13:03:19 +05:30
Anand Doshi
45c8e6369e Merge pull request #1868 from vjFaLk/email-group-fix
Email Group fixes
2016-07-13 17:38:52 +05:30
Rushabh Mehta
5d51a9b4f4 [grids] activate grid on selection 2016-07-13 17:31:35 +05:30
Valmik Jangla
4bdf8fab62 Email Group fixes 2016-07-12 23:37:43 -07:00
Anand Doshi
0acf14bde5 [fix] striptags for title block in base.html 2016-07-13 11:29:31 +05:30
Rushabh Mehta
b4219c9021 Merge pull request #1864 from donysukardi/documentation-fixes
[fix] Documentation fixes
2016-07-12 11:15:26 +05:30
Rushabh Mehta
cb23c53df9 Merge pull request #1865 from system19/develop
Update jquery.min.js & jquery-ui.min.js - qunit.js & css - jquery.ui.timepicker-addon.js & css
2016-07-12 07:08:41 +05:30
system19
f3f8ea9b85 Update jquery-ui.min.js v1.11.2 to v1.12.0 2016-07-12 11:19:19 +10:00
system19
9fdd7e261b Update jquery.ui.timepicker-addon.js and jquery.ui.timepicker-addon.css from v.1.4.3 to 1.6.3
http://trentrichardson.com
2016-07-12 11:17:13 +10:00
system19
c295d93282 Update qunit.js and qunit.css from v1.11.0 to v2.0.0
https://qunitjs.com/
2016-07-12 11:15:25 +10:00
system19
f8e4f125d9 Update jquery.hotkeys.js v0.8 to v2.0
https://github.com/jeresig/jquery.hotkeys
2016-07-12 11:14:04 +10:00
system19
e28509c633 Update jquery.min.js from v2.1.3 to v2.2.4 2016-07-12 11:10:15 +10:00
Dony Sukardi
8e92d41895 Merged branch develop into documentation-fixes 2016-07-12 03:29:59 +08:00
Anand Doshi
f791949216 [fix] filters 2016-07-12 00:51:22 +05:30
Dony Sukardi
2dedc9a3de Fix for Documentation
The following issues are addressed in this commit:
- Synchronize CSS with the layout changes in Docs
- Hide 'Shopping Cart' on Docs pages
- Load Frappe context for Jinja
- Fix for 'Improve this page' link
- Get title for ToC from .md files
- Fix for non-pages child routes
2016-07-12 03:16:05 +08:00
Anand Doshi
3acd8b462e Merge branch 'master' into develop 2016-07-11 22:41:31 +05:30
Anand Doshi
92a67b7b78 Merge branch 'hotfix' 2016-07-11 22:40:40 +05:30
Anand Doshi
31e6e95b9a bumped to version 6.27.24 2016-07-11 23:10:40 +06:00
Rushabh Mehta
d631f131b5 [fix] test 2016-07-11 18:28:26 +05:30
Rushabh Mehta
ea8bffe8d1 Merge pull request #1862 from nabinhait/doctype_deletion
Custom Doctype deletion, fixed frappe/erpnext#5175
2016-07-11 18:18:07 +05:30
Rushabh Mehta
bb29746c15 [fix] patch 2016-07-11 18:14:26 +05:30
Rushabh Mehta
3715a76d0b [fix] grid open 2016-07-11 18:12:28 +05:30
Rushabh Mehta
2022bfd425 Merge pull request #1861 from system19/develop
Update fullcalendar.js - gcal.js - moment.js
2016-07-11 17:53:30 +05:30
Rushabh Mehta
d1956d0c13 Merge pull request #1834 from shubham7saxena/frappe-web-form
added parameter passing in web form creation
2016-07-11 17:53:05 +05:30
Rushabh Mehta
ce9e04e44e [fix] grid read-only, fixes frappe/erpnext#5702 2016-07-11 17:58:11 +05:30
Rushabh Mehta
10c56e62f8 [minor] fix style for report 2016-07-11 17:21:46 +05:30
shubham7saxena
bccae71da3 added parameter passing in web form creation 2016-07-11 16:21:04 +05:30
Rushabh Mehta
f22592e581 [fix] formatter if no timezone is set 2016-07-11 16:06:20 +05:30
Rushabh Mehta
093f293f42 [fix] grids editable by default 2016-07-11 16:06:20 +05:30
Nabin Hait
a026b7f884 Reload permissions for DocType 2016-07-11 15:03:20 +05:30
Nabin Hait
8d915701ad Allow non-admin users to delete custom doctypes 2016-07-11 15:02:22 +05:30
Rushabh Mehta
0ae22a5895 Merge pull request #1833 from shubham7saxena/frappe-profile-editing
The user can now update his profile details in /edit-profile link
2016-07-11 14:49:20 +05:30
Rushabh Mehta
7542df5c7c [fix] error messages and minor fix in form_macros.html 2016-07-11 11:49:08 +05:30
Rushabh Mehta
3efd898501 [fix] error messages and minor fix in form_macros.html 2016-07-11 11:44:43 +05:30
system19
b66c3637bb Update fullcalendar.js and gcal.js from v2.3.2 to 2.8.0 2016-07-10 00:47:43 +10:00
system19
837028f804 Update moment.js from 0.3.1 to 0.5.4 2016-07-10 00:46:07 +10:00
Rushabh Mehta
3e3e30cfa6 [cleanups] 2016-07-08 18:21:33 +05:30
Rushabh Mehta
56857c4b7f [fix] grid textarea height 2016-07-08 14:57:45 +05:30
Rushabh Mehta
104df66ab4 [editable fields] now configable and customizable 2016-07-08 14:33:29 +05:30
Rushabh Mehta
10e1921ccc Merge pull request #1860 from nabinhait/report_url
URL of the reports from list sidebar
2016-07-08 10:44:56 +05:30
Nabin Hait
94913d9a91 URL of the reports from list sidebar 2016-07-08 08:56:44 +05:30
Nabin Hait
4a364b7705 Merge pull request #1857 from nabinhait/develop
Get print format
2016-07-08 08:36:04 +05:30
Rushabh Mehta
03c0b4d9e9 Merge pull request #1859 from frappe/revert-1858-V7_fixes_2
Revert "[fix] set project name while creating task frappe/erpnext#5599"
2016-07-08 06:41:09 +05:30
Rushabh Mehta
c922ad3996 Revert "[fix] set project name while creating task frappe/erpnext#5599" 2016-07-08 06:40:57 +05:30