Anand Doshi
|
c25c2c6d04
|
Merge branch 'edge' of github.com:webnotes/wnframework into webshop
|
2013-04-24 11:55:25 +05:30 |
|
Anand Doshi
|
454c94b411
|
Merge branch 'master' of github.com:webnotes/wnframework into webshop
Conflicts:
core/page/data_import_tool/data_import_tool.py
|
2013-04-24 11:48:37 +05:30 |
|
Anand Doshi
|
182bedec9f
|
Merge branch 'master' into edge
|
2013-04-23 16:29:30 +05:30 |
|
Anand Doshi
|
be23346a1f
|
[fields] [fix] bug fix when clearing a field the first time
|
2013-04-23 16:28:33 +05:30 |
|
Anand Doshi
|
53e7ff575d
|
Merge branch 'master' into edge
|
2013-04-23 14:23:47 +05:30 |
|
Anand Doshi
|
7a61eb6f11
|
[website] [message.html template] fixes
|
2013-04-23 14:22:28 +05:30 |
|
Anand Doshi
|
516c6fc919
|
Merge branch 'master' into edge
|
2013-04-23 12:31:51 +05:30 |
|
Nabin Hait
|
d7a1532b8f
|
fixes in listview bar-graph
|
2013-04-23 11:56:33 +05:30 |
|
Nabin Hait
|
9627fcba07
|
Merge branch 'master' of github.com:webnotes/wnframework
|
2013-04-22 14:11:14 +05:30 |
|
Anand Doshi
|
149988cbd1
|
Merge branch 'edge' of github.com:webnotes/wnframework into edge
|
2013-04-22 14:07:36 +05:30 |
|
Anand Doshi
|
dc63fdbbfe
|
Merge branch 'master' into edge
Conflicts:
core/page/data_import_tool/data_import_tool.py
|
2013-04-22 14:06:22 +05:30 |
|
Rushabh Mehta
|
9df0839792
|
Merge branch 'edge' of github.com:webnotes/wnframework into edge
|
2013-04-22 14:03:56 +05:30 |
|
Rushabh Mehta
|
a92eca19c5
|
Merge branch 'master' into edge
|
2013-04-22 14:03:30 +05:30 |
|
Anand Doshi
|
c345ecca5f
|
[rename] [validation] validate new name given on rename and strip leading and trailing spaces
|
2013-04-22 13:24:53 +05:30 |
|
Nabin Hait
|
1a64041b24
|
Merge branch 'master' of github.com:webnotes/wnframework
|
2013-04-22 13:18:45 +05:30 |
|
Nabin Hait
|
02a1ca4b70
|
added qet_query option on report filters
|
2013-04-22 13:18:26 +05:30 |
|
Anand Doshi
|
5944c84b97
|
[listview] [label] show appropriate tooltip for bar graph
|
2013-04-22 12:20:09 +05:30 |
|
Anand Doshi
|
23e6cc11c7
|
[data import tool] [fix] use get_field method of model/doctype.py
|
2013-04-22 12:01:03 +05:30 |
|
Anand Doshi
|
72212c9038
|
Merge branch 'master' into edge
|
2013-04-22 11:36:39 +05:30 |
|
Anand Doshi
|
2ced1a7d2f
|
Merge branch 'master' of github.com:webnotes/wnframework
|
2013-04-22 11:33:13 +05:30 |
|
Anand Doshi
|
42dc68b138
|
[data import tool] [fix] empty columns logic
|
2013-04-22 11:30:54 +05:30 |
|
Rushabh Mehta
|
44c013c30a
|
[slickgrid] [upgrade] added copy-paste to excel thanks to http://labs.nereo.com/SlickGrid/plugins/slick.cellexternalcopymanager.js
|
2013-04-22 11:22:11 +05:30 |
|
Anand Doshi
|
c80fb24ec3
|
[in import] shifted global variable to webnotes
|
2013-04-19 16:14:48 +05:30 |
|
Anand Doshi
|
c7c63a3f4a
|
Merge branch 'master' of github.com:webnotes/wnframework into webshop
|
2013-04-19 16:02:16 +05:30 |
|
Anand Doshi
|
45cc11f89f
|
Merge branch 'master' into edge
|
2013-04-19 14:55:22 +05:30 |
|
Anand Doshi
|
c8cc88ee3a
|
[login] changed login id input fieldtype to email
|
2013-04-19 14:54:40 +05:30 |
|
Anand Doshi
|
507c1c643a
|
Merge branch 'master' into edge
|
2013-04-19 11:38:37 +05:30 |
|
Anand Doshi
|
2078d52762
|
[geo ip] determine country using geoip; added country info in session and cookies
|
2013-04-18 19:42:21 +05:30 |
|
Anand Doshi
|
72a4b83cb6
|
[data import tool] filter empty columns during import, if the exist at the end
|
2013-04-18 19:31:03 +05:30 |
|
Rushabh Mehta
|
c037ef9dc3
|
[recent] [fix] don't crash bad names
|
2013-04-18 17:53:38 +05:30 |
|
Anand Doshi
|
a3bd61167b
|
[defaults] defaults starting with colon like :Profile, used to set default from boot docs, should not be a part of db schema spec
|
2013-04-18 16:22:27 +05:30 |
|
Rushabh Mehta
|
3acf587f7e
|
[support email import] [fix] ignore if same file is attached twice
|
2013-04-18 11:44:23 +05:30 |
|
Rushabh Mehta
|
5a622bcd54
|
[file_manager] [bugfix] versions split error
|
2013-04-18 10:18:17 +05:30 |
|
Anand Doshi
|
31514a76e2
|
[attachments] [fixes] for fields of type attach_files:
|
2013-04-17 18:44:53 +05:30 |
|
Anand Doshi
|
20c68de8b8
|
[create new] [set default values] ability to set defaults based on partial docs sent during boot
|
2013-04-17 18:01:57 +05:30 |
|
Anand Doshi
|
5a25cb01c6
|
Merge branch 'master' into edge
|
2013-04-16 21:15:31 +05:30 |
|
Nabin Hait
|
a8ae8c4e66
|
naming_series_options mandatory if autoname set by naming_series:
|
2013-04-15 17:19:17 +05:30 |
|
Rushabh Mehta
|
9d51e26169
|
[editors] [fixes]
|
2013-04-15 14:40:39 +05:30 |
|
Nabin Hait
|
ce68ea50b3
|
Merge branch 'master' of github.com:webnotes/wnframework
|
2013-04-15 11:14:42 +05:30 |
|
Nabin Hait
|
9a77313017
|
removed self-reference check on deletion
|
2013-04-15 11:14:09 +05:30 |
|
Rushabh Mehta
|
a5fd8fd53a
|
Merge branch 'edge' of github.com:webnotes/wnframework into edge
|
2013-04-15 10:54:13 +05:30 |
|
Rushabh Mehta
|
d136bb8565
|
[editor] [stylefix]
|
2013-04-15 10:49:15 +05:30 |
|
Anand Doshi
|
62e8b16c00
|
[attachments] [fix] cur_frm.get_files
|
2013-04-12 22:02:49 +05:30 |
|
Anand Doshi
|
c17e4db25e
|
[profile] [fix] profile's get roles to be used to get roles of any profile
|
2013-04-12 21:01:20 +05:30 |
|
Anand Doshi
|
270839ec89
|
[db.py get_value] [enhancement] allow more operators like !=, >, >= etc in get_value
|
2013-04-12 21:00:46 +05:30 |
|
Anand Doshi
|
929f9b6d63
|
[permissions] [fixes] used BeanPermissionError, show label in error message of has_permission
|
2013-04-12 20:18:25 +05:30 |
|
Anand Doshi
|
da2c4b9050
|
[datatype] [fix] use var in for loop of keys and values functions
|
2013-04-12 16:15:44 +05:30 |
|
Anand Doshi
|
89f6861964
|
[file manager] [fix] syntax error in save_file
|
2013-04-12 15:44:03 +05:30 |
|
Rushabh Mehta
|
28d632a634
|
[upload] [feature] using filereader, added to rich text editor for drag and drop
|
2013-04-11 14:22:40 +05:30 |
|
Rushabh Mehta
|
614ecc59a7
|
[upload] [new design] using filereader and ajax to upload files, no more iframes
|
2013-04-11 12:36:30 +05:30 |
|