Commit graph

519 commits

Author SHA1 Message Date
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
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
Anand Doshi
72212c9038 Merge branch 'master' into edge 2013-04-22 11:36:39 +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
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
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
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
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
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
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
Rushabh Mehta
aebe96f0fe Merge branch 'edge' of github.com:webnotes/wnframework into edge 2013-04-11 08:30:06 +05:30
Rushabh Mehta
2fdf885042 [support] [fix] attachment 2013-04-11 08:29:25 +05:30
Anand Doshi
4af6fc9f57 Merge branch 'master' into edge 2013-04-10 20:31:49 +05:30
Anand Doshi
db7559dd80 [defaults] [fix] if session is set, only then set get_defaults_for_match 2013-04-10 20:27:57 +05:30
Anand Doshi
29a0011d20 Merge branch 'master' into edge
Conflicts:
	core/doctype/doctype/doctype.py
2013-04-10 19:47:51 +05:30
Nabin Hait
a0eca348e2 [fixes] changes in permission validation message 2013-04-10 18:30:31 +05:30
Nabin Hait
1bce744576 [fixes] changes in permission validation message 2013-04-10 18:30:02 +05:30
Anand Doshi
e0f8cf3e8a [permission manager] [fix] if match exists of type fieldname:user and no user property exists for that fieldname, set user default for that fieldname as webnotes.session.user when loading defaults 2013-04-10 15:27:52 +05:30
Rushabh Mehta
18abdbcbac [files] [cleanup/redesign] removed the old file_list structure and also added file listing in setup 2013-04-10 14:16:56 +05:30
Rushabh Mehta
30d6a4efc9 [files] [cleanup/redesign] removed the old file_list structure and also added file listing in setup 2013-04-10 13:54:11 +05:30
Rushabh Mehta
869c748627 [knowledge base] added all permissions 2013-04-09 10:27:06 +05:30
Rushabh Mehta
ee167b5590 [website] [fix] no_cache 2013-04-04 10:29:17 +05:30
Rushabh Mehta
46caedd078 [message] [fix] rewire to core 2013-04-04 10:02:07 +05:30
Rushabh Mehta
cedcb15a70 Merge branch 'master' into edge 2013-04-03 16:39:02 +05:30
Rushabh Mehta
158d6b3d28 [website] [cleanup] added website pages to framework 2013-04-03 16:36:53 +05:30
Rushabh Mehta
3211552c06 [framework] [cleanup] desktop, todo, messages, modules setup moved to framework 2013-04-03 15:21:42 +05:30
Rushabh Mehta
aba6a77fff Merge branch 'master' into edge 2013-04-03 10:42:09 +05:30
Rushabh Mehta
8f91f540e4 [session] [fix
] exipry period
2013-04-03 09:59:30 +05:30
Anand Doshi
b978efcba1 [reportview] [fix] escape single quote 2013-04-02 16:26:46 +05:30
Nabin Hait
5459eca72e [data import][validation] removed validation for no options for select fields 2013-04-02 14:55:50 +05:30
Rushabh Mehta
003fb4de8b Merge branch 'edge' of github.com:webnotes/wnframework into edge 2013-04-02 10:48:45 +05:30
Rushabh Mehta
1377b2f6d1 [website] [cleanup] moved website generic utils to framework 2013-04-02 10:41:36 +05:30
Anand Doshi
1c2860c9d1 [doc] [fix] getchildren injection issue 2013-04-01 19:17:45 +05:30
Anand Doshi
3aaea724b2 [setup] [feature] Update Manager for self hosted applications based on wnframework 2013-04-01 16:40:19 +05:30
Rushabh Mehta
5f71497d48 [framework/cookies] [update] we don't need root path cookies anymore 2013-04-01 16:07:31 +05:30
Anand Doshi
d8d27d3d8a [sessions] [fix] minor fix to eval session data 2013-03-30 22:10:03 +05:30
Anand Doshi
519136ac68 fix in sessions py 2013-03-30 22:05:32 +05:30
Anand Doshi
94fd8bea42 [sessions] [fix] session expire value fetching 2013-03-29 20:39:43 +05:30
Rushabh Mehta
f3c73013fe [memcache] [fix] added disconnect_all 2013-03-28 15:35:20 +05:30
Anand Doshi
c765b29f88 deleted test_docfield 2013-03-26 21:40:58 +05:30