Anand Doshi
|
e32895e1ac
|
Merge branch 'master' into edge
|
2013-02-16 18:45:42 +05:30 |
|
Anand Doshi
|
30a41df226
|
email digest patch
|
2013-02-16 18:44:38 +05:30 |
|
Anand Doshi
|
7d684f071d
|
Merge branch 'master' into edge
|
2013-02-16 15:51:46 +05:30 |
|
Anand Doshi
|
6bc12bcca3
|
fixes in search filters returned by get query
|
2013-02-16 15:51:25 +05:30 |
|
Anand Doshi
|
bcb32880d8
|
Merge branch 'master' into edge
|
2013-02-16 15:06:37 +05:30 |
|
Anand Doshi
|
3afed698ec
|
datetime in user format and fixes in calendar breadcrumb
|
2013-02-16 14:52:02 +05:30 |
|
Anand Doshi
|
c7196726f8
|
Merge branch 'master' into edge
|
2013-02-16 11:11:12 +05:30 |
|
Rushabh Mehta
|
1429a6105f
|
removed calendar and fix
|
2013-02-16 10:44:50 +05:30 |
|
Rushabh Mehta
|
dabacf78ad
|
added view selector and calendar view for leave application
|
2013-02-15 19:28:04 +05:30 |
|
Rushabh Mehta
|
ac599d2bf9
|
added mute_emails in conf
|
2013-02-15 17:28:46 +05:30 |
|
Rushabh Mehta
|
c9690e62c2
|
profile: type coversion for email
|
2013-02-15 17:04:52 +05:30 |
|
Rushabh Mehta
|
aa4bd39d1b
|
profile: added send_invite_email as optional
|
2013-02-15 15:02:50 +05:30 |
|
Rushabh Mehta
|
157a268a19
|
request: remove _type from form
|
2013-02-15 14:39:33 +05:30 |
|
Rushabh Mehta
|
c6c0da9560
|
added calendar view
|
2013-02-15 12:09:03 +05:30 |
|
Rushabh Mehta
|
4fe8b0a68b
|
added leave applications and block lists to calendar
|
2013-02-14 20:42:32 +05:30 |
|
Rushabh Mehta
|
2ad8d31b6a
|
Merge branch 'master' of github.com:webnotes/wnframework
|
2013-02-14 17:35:19 +05:30 |
|
Rushabh Mehta
|
af0000e1cd
|
added new calendar and renamed holiday block list
|
2013-02-14 17:34:51 +05:30 |
|
Anand Doshi
|
81cd89966a
|
Merge branch 'master' into edge
|
2013-02-14 16:48:24 +05:30 |
|
Anand Doshi
|
080f4c2e2d
|
fixes in select field
|
2013-02-14 16:46:03 +05:30 |
|
Anand Doshi
|
ebd2231850
|
Merge branch 'master' into edge
|
2013-02-14 15:18:33 +05:30 |
|
Anand Doshi
|
8ca73026ff
|
fixes in communication js, if no subject
|
2013-02-14 15:17:57 +05:30 |
|
Anand Doshi
|
6e0ea61f52
|
Merge branch 'master' into edge
|
2013-02-14 15:12:10 +05:30 |
|
Anand Doshi
|
67469bc6fc
|
send all requests to server.py as POST, but use _type form parameter's POST or GET value to use commit or not
|
2013-02-14 15:09:20 +05:30 |
|
Anand Doshi
|
a53afb87ad
|
Merge branch 'master' into edge
|
2013-02-14 13:39:08 +05:30 |
|
Anand Doshi
|
bcb3382f4f
|
fixes in assign to url
|
2013-02-14 13:36:41 +05:30 |
|
Anand Doshi
|
ea43fb7daf
|
fixes in test runner
|
2013-02-14 13:36:30 +05:30 |
|
Anand Doshi
|
2937639fd8
|
fix in assign to URL
|
2013-02-13 23:42:18 +05:30 |
|
Anand Doshi
|
77e720fe06
|
Merge branch 'master' into edge
|
2013-02-13 23:19:51 +05:30 |
|
Anand Doshi
|
c4d50538c4
|
fixes in assignto
|
2013-02-13 23:19:34 +05:30 |
|
Anand Doshi
|
7ccfefb700
|
Merge branch 'master' into edge
|
2013-02-13 23:04:18 +05:30 |
|
Anand Doshi
|
486ad61d16
|
fixes in remove assign to
|
2013-02-13 23:03:58 +05:30 |
|
Rushabh Mehta
|
8b54326e3e
|
number format fix
|
2013-02-13 22:02:09 +05:30 |
|
Anand Doshi
|
751202e639
|
fix in format_number
|
2013-02-13 21:57:34 +05:30 |
|
Anand Doshi
|
c81f7616e1
|
Merge branch 'master' into edge
|
2013-02-13 20:33:38 +05:30 |
|
Anand Doshi
|
d5ad376a04
|
updated profile test records
|
2013-02-13 20:26:20 +05:30 |
|
Anand Doshi
|
56fc922e5a
|
fixes in test runner and add role for profile
|
2013-02-13 19:57:58 +05:30 |
|
Anand Doshi
|
649f97967c
|
in SelectField's get_value, options can be a dict or string. use appropriate when comparing. Allow's SelectField having different label and value
|
2013-02-13 19:48:41 +05:30 |
|
Anand Doshi
|
43061118a6
|
added add_role method in profile
|
2013-02-13 18:35:33 +05:30 |
|
Anand Doshi
|
22e129caf9
|
fixes in parentfield of userrole
|
2013-02-13 18:04:21 +05:30 |
|
Rushabh Mehta
|
da7f841b2e
|
Merge branch 'master' of github.com:webnotes/wnframework into edge
|
2013-02-13 13:21:54 +01:00 |
|
Anand Doshi
|
ffd3c8082e
|
fixes in db.py
|
2013-02-13 17:48:47 +05:30 |
|
Anand Doshi
|
05c167e22c
|
fixes in profile one system manager validation
|
2013-02-13 16:16:06 +05:30 |
|
Anand Doshi
|
10ed5a53d9
|
Merge branch 'master' of github.com:webnotes/wnframework
|
2013-02-13 16:07:19 +05:30 |
|
Anand Doshi
|
54d0b777a7
|
user role as child table in profile. checkboxes and user roles managed directly using addchild on client side
|
2013-02-13 16:06:50 +05:30 |
|
Rushabh Mehta
|
4248761f7a
|
number format fix, permission fix in listview
|
2013-02-13 12:33:01 +05:30 |
|
Rushabh Mehta
|
62c03924e5
|
added test runner
|
2013-02-13 11:59:16 +05:30 |
|
Rushabh Mehta
|
269b69a69c
|
Merge branch 'edge' of github.com:webnotes/wnframework into edge
|
2013-02-13 05:18:27 +01:00 |
|
Rushabh Mehta
|
39adba6d8e
|
fixed communication subject
|
2013-02-13 09:44:27 +05:30 |
|
Rushabh Mehta
|
ebdfb6f2d4
|
fixed communication subject
|
2013-02-13 09:42:30 +05:30 |
|
Rushabh Mehta
|
64bb7bb289
|
Merge branch 'master' into edge
|
2013-02-12 19:23:48 +05:30 |
|