Commit graph

4545 commits

Author SHA1 Message Date
Nabin Hait
da5f460fe4 Fixes related to appification 2014-01-23 15:35:40 +05:30
Rushabh Mehta
51b14f8684 updated bootstrap 2014-01-22 12:44:01 +05:30
Rushabh Mehta
ce38c4ea98 webnotes/wnframework#193 2014-01-21 16:21:42 +05:30
Rushabh Mehta
36be63afe1 filters are not autocompletes webnotes/erpnext#1306 2014-01-21 15:41:02 +05:30
Rushabh Mehta
a8cc46fd9e grid, reportview fix webnotes/wnframework#293 webnotes/erpnext#1300 2014-01-21 12:41:00 +05:30
Rushabh Mehta
9caf081192 added explicit delete permissions 2014-01-20 17:53:50 +05:30
Rushabh Mehta
e2fe0a989b started separate delete permissions 2014-01-20 17:37:00 +05:30
Nabin Hait
af041d7713 Fixed conflict while merging with develop branch 2014-01-20 17:01:01 +05:30
Rushabh Mehta
7fa4ef9593 return appropriate HTTP error code (api) #377 2014-01-20 15:30:39 +05:30
Rushabh Mehta
f3046abd46 added in db.py, bulk unsubscribe optional 2014-01-20 15:30:39 +05:30
Pratik Vyas
28422a5018 Merge branch 'develop' 2014-01-17 16:56:26 +05:30
Pratik Vyas
e7b1be79dd bumped to version 3.7.3 2014-01-17 17:26:26 +06:00
Nabin Hait
703fb2a0bb Merge pull request #402 from pdvyas/version-boot
add version number to bootinfo
2014-01-17 02:39:40 -08:00
Nabin Hait
b392821e9b Merge pull request #407 from pdvyas/mysql-patch
Fixes for MySQL-python==1.2.5
2014-01-17 02:39:17 -08:00
Anand Doshi
2de6067130 Fixes for MySQL-python==1.2.5 2014-01-17 15:09:47 +05:30
Nabin Hait
38d3ba608c Merge pull request #406 from akhileshdarjee/hotfix
use cint for integer values
2014-01-16 21:46:07 -08:00
Akhilesh Darjee
fb33308a83 use cint for integer values 2014-01-17 11:08:28 +05:30
Pratik Vyas
01ac59dad0 Merge branch 'develop' 2014-01-16 16:29:18 +05:30
Pratik Vyas
5a2e6aab87 bumped to version 3.7.2 2014-01-16 16:59:18 +06:00
Anand Doshi
359cc30d6c Updated timepicker addon 2014-01-16 15:52:06 +05:30
Nabin Hait
f23d17ecae Merge pull request #405 from nabinhait/hotfix
Print Table: sort cloumns by idx after removing empty cols
2014-01-16 01:28:59 -08:00
Nabin Hait
10705d0d95 Print Table: sort cloumns by idx after removing empty cols 2014-01-16 14:57:10 +05:30
Nabin Hait
6550426db7 Merge pull request #404 from nabinhait/hotfix
Hotfix
2014-01-15 22:44:47 -08:00
Nabin Hait
30ca0a2868 Merge branch 'develop' of github.com:webnotes/wnframework into hotfix 2014-01-16 12:10:37 +05:30
Nabin Hait
08ffa4edc0 Always reset filters through set_route 2014-01-16 12:07:08 +05:30
Nabin Hait
335deed6e8 Show listview columns order by idx 2014-01-16 12:06:10 +05:30
Rushabh Mehta
aa428dfe24 allow template pages to be overriden by apps 2014-01-15 23:25:04 +05:30
Nabin Hait
4f608654d0 Merge pull request #403 from nabinhait/hotfix
Minor fix in text editor
2014-01-15 05:21:37 -08:00
Rushabh Mehta
2e3030b297 hookable login email title 2014-01-15 16:21:09 +05:30
Rushabh Mehta
08ba44ad11 added flag for no welcome mail 2014-01-15 16:12:36 +05:30
Pratik Vyas
1d572f6fb6 add version number to bootinfo 2014-01-15 14:23:58 +05:30
Rushabh Mehta
78f7ff3649 profile fixes and ctrl+s issue in firefox 2014-01-15 12:24:10 +05:30
Nabin Hait
a437775ea4 Merge branch 'develop' of github.com:webnotes/wnframework into hotfix 2014-01-15 12:09:29 +05:30
Rushabh Mehta
b11dab92f3 cleanup login template and fix base.html 2014-01-15 11:18:08 +05:30
Nabin Hait
6402bee23f Minor fix in text editor 2014-01-15 11:11:28 +05:30
Anand Doshi
e62a5b7e93 Fixes in scheduler logging, get_fullname and jinja environment 2014-01-14 18:50:26 +05:30
Pratik Vyas
142afdeb26 Merge branch 'develop' 2014-01-14 18:49:10 +05:30
Pratik Vyas
2722caba59 bumped to version 3.7.1 2014-01-14 19:19:10 +06:00
Nabin Hait
05d774c5f9 Merge pull request #399 from akhileshdarjee/hotfix
set default condition only if not conditions in filters
2014-01-14 02:30:39 -08:00
Nabin Hait
ea682cc15a Merge pull request #400 from nabinhait/hotfix
Delete notification count for messages, after read or post
2014-01-14 02:30:18 -08:00
Nabin Hait
529b52cc96 Delete notification count for messages, after read or post 2014-01-14 15:53:16 +05:30
Akhilesh Darjee
bd2b891f92 set default condition only if not conditions in filters 2014-01-14 13:09:37 +05:30
Anand Doshi
1be5479fab Fixed scheduler, webnotes scheduler events and delete doc 2014-01-13 21:23:16 +05:30
Pratik Vyas
065c592735 Merge branch 'develop' 2014-01-13 18:37:03 +05:30
Pratik Vyas
2e06deff89 bumped to version 3.7.0 2014-01-13 19:07:03 +06:00
Nabin Hait
63ac6376fc Merge pull request #398 from nabinhait/hotfix
Added missing field in Custom Field compared to DocField
2014-01-13 04:32:59 -08:00
Nabin Hait
396a39ad8b Custom Field: Label is mandatory only if fieldname not exists 2014-01-13 18:00:22 +05:30
Nabin Hait
747d3e3cba Custom Field: Label is mandatory only if fieldname not exists 2014-01-13 17:52:47 +05:30
Anand Doshi
5c8ef83069 Fixes source paths in base.html 2014-01-13 17:50:11 +05:30
Nabin Hait
a55c447eb1 Fixed conflict 2014-01-10 16:35:54 +05:30