Commit graph

759 commits

Author SHA1 Message Date
Nabin Hait
16b7cda1b6 Merge branch 'master' of github.com:webnotes/wnframework 2013-07-18 12:28:32 +05:30
Nabin Hait
faf10e4b8e Merge branch 'slow' of github.com:webnotes/wnframework 2013-07-18 11:38:12 +05:30
Nabin Hait
7e5b7e2242 [fix] [minor] matched condition in report 2013-07-18 11:35:49 +05:30
Anand Doshi
45495e1655 [minor] fixed patch 2013-07-17 18:10:35 +05:30
Anand Doshi
b7d3f7f0fa [minor] [fix] always use login id as sender fix 2013-07-16 16:27:25 +05:30
Anand Doshi
2c1c7c4a78 Merge branch 'master' of github.com:webnotes/wnframework 2013-07-16 16:23:08 +05:30
Rushabh Mehta
2138207f78 [bulk] [minor] ignore bad email ids 2013-07-16 16:07:44 +05:30
Anand Doshi
f1c9a293a8 Merge branch 'master' of github.com:webnotes/wnframework 2013-07-16 15:56:09 +05:30
Anand Doshi
dd1b1a1090 [minor] installer fix 2013-07-16 15:55:22 +05:30
Rushabh Mehta
4d7928a836 [permission] [minor] moved 403 to handler.py 2013-07-16 15:38:31 +05:30
Rushabh Mehta
af42359692 [permission] [minor] moved 403 to handler.py 2013-07-16 15:35:23 +05:30
Anand Doshi
95db30993b [minor] [doclist] for append, set idx if missing 2013-07-15 18:31:30 +05:30
Anand Doshi
c8a6481d1f Merge branch 'responsive' of github.com:webnotes/wnframework into responsive 2013-07-15 18:28:37 +05:30
Rushabh Mehta
06e9775790 [minor] [file_manager] fixes to code and cleanup 2013-07-15 18:18:05 +05:30
Anand Doshi
e22d7d384f [minor] [delete doc] option to ignore permissions 2013-07-15 17:59:08 +05:30
Anand Doshi
353a8b3ab8 [minor] [new doc] set naming series if missing 2013-07-15 17:58:40 +05:30
Rushabh Mehta
6a4b02c590 [fix] [minor] file manager versioning 2013-07-15 17:28:31 +05:30
Rushabh Mehta
f1ff8dec6f Merge branch 'responsive' of github.com:webnotes/wnframework into responsive 2013-07-15 17:14:54 +05:30
Rushabh Mehta
a8c423361e [docs] [minor] update to docs, fixed bug in file_manager 2013-07-15 17:14:38 +05:30
Nabin Hait
88b4876aed [fix] [mapper] add rows only table is blank, allow multiple time pull and validation if same item pulled twice 2013-07-15 16:33:23 +05:30
Rushabh Mehta
ce2ed23742 Merge branch 'responsive' of github.com:webnotes/wnframework into responsive 2013-07-11 18:46:35 +05:30
Rushabh Mehta
7bd1e69c65 [translations] Updated Latest 2013-07-11 18:45:46 +05:30
Nabin Hait
cb17173a0d [fix] [cleanup] fixes while testing and code cleanup 2013-07-11 17:49:18 +05:30
Rushabh Mehta
9e8ba300cb [style] Added Icons to Pages 2013-07-11 14:50:38 +05:30
Rushabh Mehta
865fb49973 [minor] [fix] doctype recursive 2013-07-11 12:35:42 +05:30
Rushabh Mehta
e435c5af82 Merge branch 'responsive' of github.com:webnotes/wnframework into responsive 2013-07-11 12:17:15 +05:30
Rushabh Mehta
a17bd79ed8 [feature] Linked With now shows parent Documents 2013-07-11 12:16:30 +05:30
Anand Doshi
20dce362d8 Merge branch 'responsive' of github.com:webnotes/wnframework into responsive
Conflicts:
	webnotes/model/mapper.py
2013-07-10 20:55:05 +05:30
Anand Doshi
a000ec95d7 [minor] converty types for single doctypes in load_from_db, moved some functions to number_format.js for use in website 2013-07-10 20:48:00 +05:30
Nabin Hait
edc9dd596c [fix] get_query where options not mentioned 2013-07-10 20:29:59 +05:30
Nabin Hait
ca4b031c57 Merge branch 'responsive' of git://github.com/saurabh6790/wnframework into saurabh1 2013-07-10 19:03:39 +05:30
Nabin Hait
7b1c78dbdb [fix] related to mapping 2013-07-10 16:48:29 +05:30
Nabin Hait
3dc0fc8114 Merge branch 'responsive' of github.com:webnotes/wnframework into responsive 2013-07-10 14:17:14 +05:30
Nabin Hait
bffe5fb2cf [fix][hr] pull salary structure in salary slip 2013-07-10 14:16:59 +05:30
Saurabh
e0cb6f41ac Merge branch 'responsive' of git://github.com/webnotes/wnframework into responsive 2013-07-10 13:08:48 +05:30
Rushabh Mehta
c519217ea1 Merge branch 'responsive' of github.com:webnotes/wnframework into responsive 2013-07-10 13:06:34 +05:30
Rushabh Mehta
5b254c079d [minor] fix to has_permission 2013-07-10 13:05:32 +05:30
Anand Doshi
98b0353b66 [minor] [fix] in import, do not validate parentfield 2013-07-10 11:38:05 +05:30
Saurabh
135246ca04 [qwt_query] to server side 2013-07-09 16:40:32 +05:30
Rushabh Mehta
5ec86a5b42 [feature] Added 'Customize' and 'Import' fields in List view, [cleanups] #194, #113 2013-07-09 16:04:03 +05:30
Rushabh Mehta
bde1092e4f Merge branch 'responsive' of github.com:webnotes/wnframework into responsive 2013-07-09 14:37:17 +05:30
Rushabh Mehta
7a600ff29c [feature] generate latest updates page from git commit log 2013-07-09 14:36:40 +05:30
Nabin Hait
db1e475ac8 [merge] report match condition 2013-07-09 12:57:01 +05:30
Rushabh Mehta
17db115a59 [doctype] restrict in_list_view 2013-07-09 12:10:34 +05:30
Rushabh Mehta
ce666c05be [notifications] added match permissions #552 2013-07-09 11:58:10 +05:30
Akhilesh Darjee
dca4e59e77 [Report]Added permission to reports for showing data according to the user properties 2013-07-09 11:55:25 +05:30
Rushabh Mehta
dc114ffc5a [email] force use of loginid as the sender 2013-07-09 10:28:57 +05:30
Rushabh Mehta
a016f19bfe [lang] [fix] german 2013-07-09 10:20:31 +05:30
Saurabh
712ab696d9 Merge branch 'responsive' of git://github.com/webnotes/wnframework into responsive 2013-07-09 10:18:14 +05:30
Saurabh
e487b1a37d changes to handle server side queries 2013-07-09 10:10:43 +05:30