Commit graph

3541 commits

Author SHA1 Message Date
Nabin Hait
a8be3bf0d2 [fix] [minor] fixes adding event if no end date 2013-08-24 17:18:08 +05:30
Anand Doshi
9ddc77403f [fix] [minor] show for comment in alert-warning 2013-08-23 16:40:58 +05:30
Anand Doshi
adae501f73 Merge branch 'master' of github.com:webnotes/wnframework 2013-08-23 15:28:38 +05:30
Anand Doshi
1ff57101fd [fix] [minor] added back showdown.js as markdown.js 2013-08-23 15:28:11 +05:30
Rushabh Mehta
537c8f418e Merge branch 'master' of github.com:webnotes/wnframework 2013-08-23 13:16:39 +05:30
Rushabh Mehta
90442c7630 [pos] [cleanup] 2013-08-23 13:16:21 +05:30
Anand Doshi
a16db647df [fix] [minor] trigger grid_fieldname_remove function on removing grid row 2013-08-23 12:56:32 +05:30
Anand Doshi
791352e6b7 Merge branch 'master' of github.com:webnotes/wnframework 2013-08-23 11:28:44 +05:30
Anand Doshi
408d9d1d20 [fix] [minor] use for loop instead of $.map in query report to map data, to avert Uncaught RangeError: Maximum call stack size exceeded error 2013-08-23 11:28:15 +05:30
Rushabh Mehta
e9bc315a88 Merge pull request #244 from akhileshdarjee/master
[bug][issue] erpnext/issue#241 - adding print formats of all opened doctypes
2013-08-22 22:22:17 -07:00
Anand Doshi
02f2a7284e [fix] [minor] alert box in login page 2013-08-22 22:58:30 +05:30
Anand Doshi
4c7c09df89 [fix] [minor] fixes after bootstrap 3 2013-08-22 15:41:50 +05:30
Anand Doshi
e1ae964f53 Merge branch 'master' of github.com:webnotes/wnframework 2013-08-22 15:37:39 +05:30
Anand Doshi
b8ca7227cc [fix] [minor] fixes after bootstrap 3 2013-08-22 15:37:09 +05:30
Rushabh Mehta
78ea7ec803 Merge branch 'master' of github.com:webnotes/wnframework 2013-08-22 15:18:10 +05:30
Rushabh Mehta
7286b4d617 [demo] [minor] Added accounts, moved JV creation to server-side 2013-08-22 15:17:57 +05:30
Anand Doshi
9d1381c33b [fix] [minor] do not allow website user access to app 2013-08-22 15:08:55 +05:30
Anand Doshi
a4b54c2b1f Merge branch 'master' of github.com:webnotes/wnframework 2013-08-22 15:02:19 +05:30
Anand Doshi
7029a0ca7d [fix] [minor] do not allow website user access to app 2013-08-22 15:01:42 +05:30
Anand Doshi
b3e37cb52e [fix] [minor] bootstrap 3 fixes 2013-08-22 15:01:11 +05:30
Akhilesh Darjee
27a10a6929 [bug][issue] erpnext/issue#241 - adding print formats of all opened doctypes 2013-08-22 14:25:35 +05:30
Nabin Hait
1b2a36440b [fix] [minor] check for custom script 2013-08-22 11:36:38 +05:30
Rushabh Mehta
dbb132b3e7 Merge pull request #243 from MaxMorais/patch-2
Email bulk fixing
2013-08-21 21:32:09 -07:00
Maxwell
7890bc0d18 Update bulk.py
Correction of var getting in bulk emails, the correct var name is "auto_email_id" but the code uses "auto_mail_id" in line 53
2013-08-21 12:37:34 -03:00
Anand Doshi
6d0438c322 [fix] [minor] webshop fixes after bootstrap 3 2013-08-21 19:36:22 +05:30
Rushabh Mehta
96236d636e [major] upgrade to bootstrap 3 2013-08-21 17:48:02 +05:30
Rushabh Mehta
1df8e7147b [style] added fancy loading effect NProgress 2013-08-21 11:18:39 +05:30
Rushabh Mehta
f8a4227cf8 Merge branch 'master' of github.com:webnotes/wnframework 2013-08-20 15:19:03 +05:30
Rushabh Mehta
7728c8bcfc [minor] [data import] [reportview] fixes 2013-08-20 15:18:06 +05:30
Anand Doshi
8a3fb1f5fd [fix] [minor] if localStorage quota exceeded, clear localStorage 2013-08-20 14:44:25 +05:30
Anand Doshi
f28ffcf9c2 [fix] [minor] letterhead max-width as 100% in print format 2013-08-20 13:40:20 +05:30
Nabin Hait
173c81e975 [fix] [minor] return blank from datetime_in_user_format if date is null 2013-08-20 10:51:20 +05:30
Anand Doshi
33c9db9552 Merge branch 'master' of github.com:webnotes/wnframework 2013-08-19 20:01:32 +05:30
Anand Doshi
90f6e36fc3 [fix] [minor] _round function - implement round halfs to nearest even number 2013-08-19 19:58:22 +05:30
Nabin Hait
2b77e26f5c Merge branch 'serial_no' of github.com:webnotes/wnframework 2013-08-19 16:22:19 +05:30
Anand Doshi
32451e9669 [fix] [minor] do not add new row in grid of a submitted form 2013-08-19 11:18:18 +05:30
Rushabh Mehta
6c82ee9564 [lang] [minor] 2013-08-16 14:28:32 +05:30
Rushabh Mehta
17c093a708 Merge branch 'master' of github.com:webnotes/wnframework 2013-08-16 13:28:40 +05:30
Rushabh Mehta
b8063fa95d [custom script] [minor] Allowed Administrator to Add / Edit Custom Scripts 2013-08-16 13:02:42 +05:30
Nabin Hait
d96816b89e [fix] [minor] get_perm function added in form.js 2013-08-16 12:29:04 +05:30
Rushabh Mehta
5741ad0d5e Merge branch 'master' of github.com:webnotes/wnframework 2013-08-14 18:40:08 +05:30
Rushabh Mehta
0a4e0a6f88 [doc] [minor] add # to autoname if not specified 2013-08-14 18:36:01 +05:30
Anand Doshi
4804d7e81a [fix] [minor] set dirty on sync 2013-08-14 18:34:59 +05:30
Nabin Hait
11daf3afae [fix] [minor] do not set naming series when created new doc through mapper 2013-08-14 15:12:49 +05:30
Nabin Hait
dc1ddbc948 Merge branch 'master' of github.com:webnotes/wnframework 2013-08-14 14:41:18 +05:30
Nabin Hait
e240df5bb3 [fix] [minor] call dirty when synced with local doclist 2013-08-14 14:41:08 +05:30
Anand Doshi
fd5efc69e1 [fix] [minor] downsample data to 1000 points before plotting using flot.downsample plugin 2013-08-14 14:22:47 +05:30
Anand Doshi
064fc47184 [feature] add filters in query reports by adding javascript 2013-08-14 10:56:15 +05:30
Anand Doshi
c13ff2555d [fix] [minor] recurring events 2013-08-14 10:54:38 +05:30
Rushabh Mehta
9b38441405 Merge branch 'master' of github.com:webnotes/wnframework 2013-08-14 10:40:41 +05:30