Commit graph

6365 commits

Author SHA1 Message Date
Pratik Vyas
08307d8876 Merge branch 'develop' 2014-11-25 11:15:26 +05:30
Pratik Vyas
96c1b13d09 bumped to version 4.6.0 2014-11-25 11:45:26 +06:00
Rushabh Mehta
b969f5df0a Merge pull request #925 from rmehta/translations-update
[translations] updated via frappe.io/translator
2014-11-25 10:49:22 +05:30
Rushabh Mehta
45999ad6c4 Merge pull request #922 from nikess/patch-1
Fixed missing closing inverted commas in html style attribute
2014-11-25 10:48:31 +05:30
Rushabh Mehta
41adcfad1b Merge pull request #920 from pdvyas/validate-jinja-template
Validate jinja2 syntax before saving print format
2014-11-25 10:47:53 +05:30
Nabin Hait
0214743bc4 Merge pull request #926 from nabinhait/fix1
Validate naming series
2014-11-24 18:17:27 +05:30
Rushabh Mehta
08efd4b412 [translations] updated via frappe.io/translator 2014-11-24 16:28:25 +05:30
Nabin Hait
5de44ed2b8 Validate naming series . missing 2014-11-24 15:25:31 +05:30
Nabin Hait
00aace197a Merge pull request #923 from rmehta/develop
[security] [fix] stop client side queries in reportview.py
2014-11-24 15:23:03 +05:30
Rushabh Mehta
1f0690b05d [security] [fix] stop client side queries in reportview.py 2014-11-24 13:20:31 +05:30
nikess
cab28788a0 Fixed missing attribute closing inverted commas 2014-11-22 14:39:13 +00:00
Pratik Vyas
3e07c1937e fix print format test case 2014-11-19 16:54:34 +05:30
Pratik Vyas
79ce25d44a Validate jinja2 syntax before saving print format 2014-11-19 15:29:28 +05:30
Pratik Vyas
fbf3f142c0 Merge branch 'develop' 2014-11-19 14:33:44 +05:30
Pratik Vyas
06e7c67c15 bumped to version 4.5.9 2014-11-19 15:03:44 +06:00
Pratik Vyas
9051e56d94 remove test for custom field 2014-11-19 14:26:40 +05:30
Rushabh Mehta
53edaa23fa [fix] reportview.js, SUP10183 2014-11-19 11:48:11 +05:30
Rushabh Mehta
766d4540b9 [fixes] [minor] based on error reports 2014-11-18 15:24:31 +05:30
Pratik Vyas
a0424552bb Merge branch 'develop' 2014-11-17 12:52:32 +05:30
Pratik Vyas
1349402648 bumped to version 4.5.8 2014-11-17 13:22:32 +06:00
Rushabh Mehta
9de77b59de [fix] [hot] birthdays 2014-11-17 12:45:25 +05:30
Pratik Vyas
2b8a9b63f9 Merge branch 'develop' 2014-11-17 11:35:13 +05:30
Pratik Vyas
08317b8e0e bumped to version 4.5.7 2014-11-17 12:05:13 +06:00
Nabin Hait
93851ad3b5 Merge pull request #918 from pdvyas/fix-duplicate-name
[minor] fix msgprint from duplicate name
2014-11-14 18:00:48 +05:30
Pratik Vyas
4fb0700dc0 [minor] fix msgprint from duplicate name 2014-11-14 17:55:32 +05:30
Nabin Hait
d3dbfdf6a0 Merge pull request #917 from nabinhait/hotfix
fix for negative value in money_in_words
2014-11-14 16:50:50 +05:30
Nabin Hait
c152f3ead3 fix for negative value in money_in_words 2014-11-14 16:45:04 +05:30
Pratik Vyas
38a026f155 Merge branch 'develop' 2014-11-14 16:01:21 +05:30
Pratik Vyas
85e6f40909 bumped to version 4.5.6 2014-11-14 16:31:21 +06:00
Nabin Hait
07d2125b66 Merge pull request #916 from nabinhait/hotfix
hotfix in event
2014-11-14 16:00:09 +05:30
Nabin Hait
66f42121a5 hotfix in event 2014-11-14 15:59:45 +05:30
Pratik Vyas
73973d02b5 Merge branch 'develop' 2014-11-14 15:27:00 +05:30
Pratik Vyas
6b324f451b bumped to version 4.5.5 2014-11-14 15:57:00 +06:00
Nabin Hait
886b609fd3 Merge pull request #891 from nathando/patch-4
Convert dict to object before formatting
2014-11-14 14:59:03 +05:30
Nabin Hait
1aca5e49e0 Merge pull request #911 from pdvyas/fix-filemanager
[minor] encode filename to utf-8 and filepath before saving
2014-11-14 14:58:09 +05:30
Nabin Hait
62c2660332 Merge pull request #910 from jorxzpagta/patch-1
Update event.py
2014-11-14 14:56:34 +05:30
Pratik Vyas
edc8ed43a5 fix event test case 2014-11-14 10:35:01 +05:30
Pratik Vyas
eec17701b3 [minor] fix website route drop table 2014-11-14 10:23:42 +05:30
Pratik Vyas
43aeb93608 [minor] encode filename to utf-8 and filepath before saving 2014-11-14 10:23:42 +05:30
Nabin Hait
9bb708baa7 Merge pull request #915 from nabinhait/hotfix
fix: query order by
2014-11-13 14:43:04 +05:30
Nabin Hait
4eb6cdb157 fix: query order by 2014-11-13 14:42:41 +05:30
Nabin Hait
a0e17a80b1 Merge pull request #914 from nabinhait/hotfix
Block parallel ajax while saving
2014-11-13 11:47:46 +05:30
Nabin Hait
27c23dccac Block parallel ajax while saving 2014-11-13 11:19:44 +05:30
Nabin Hait
a41f04a479 Merge pull request #913 from nabinhait/hotfix
Minor fix
2014-11-12 17:29:20 +05:30
Nabin Hait
3e18bfded9 Minor fix 2014-11-12 17:28:08 +05:30
Nabin Hait
1f994d31b8 Merge pull request #912 from nabinhait/hotfix
Hotfix
2014-11-12 17:13:07 +05:30
Nabin Hait
112ac47ce3 Merge branch 'develop' of https://github.com/frappe/frappe into hotfix 2014-11-12 17:11:12 +05:30
Nabin Hait
71a3cf1dfc link for website view in email 2014-11-12 17:11:01 +05:30
jorxzpagta
1ba7837e97 Update event.py
Calendar Bug: When you create an event and repeat it to a certain date, it repeats the event from the start date to the last day of the calendar on the page.

Fix: it gets the repeat_till data from the database and limits the event to the proposed date.
2014-11-12 16:42:26 +08:00
Pratik Vyas
26f1cc8b97 Merge branch 'develop' 2014-11-10 12:37:44 +05:30