Commit graph

5695 commits

Author SHA1 Message Date
Anand Doshi
0971c5847a Fixed number format 2014-07-04 16:40:24 +05:30
Anand Doshi
709734d3ac Enable Outgoing Email Settings, Message optional in Add User Permission 2014-07-04 15:41:50 +05:30
Rushabh Mehta
89a673599d Merge pull request #671 from anandpdoshi/anand-july-3
Fixed sync_queues
2014-07-04 10:45:49 +05:30
Anand Doshi
473cc61a72 Sort search results in autosuggest by name 2014-07-03 17:53:51 +05:30
Anand Doshi
a873d7df4f Fixed sync_queues 2014-07-03 16:56:59 +05:30
Rushabh Mehta
3502783fba Merge pull request #669 from rmehta/develop
ignore condition fix and cleanup of progress bars
2014-07-03 14:45:16 +05:30
Rushabh Mehta
0fbf4f9bc4 ignore condition fix and cleanup of progress bars 2014-07-03 14:44:02 +05:30
Rushabh Mehta
5bfa2f068d Merge pull request #668 from anandpdoshi/anand-wip
Fixed order by in db query, on_communication trigger and applications search box
2014-07-03 12:49:23 +05:30
Anand Doshi
3cca0402f8 Fixed startswith count 2014-07-03 12:41:06 +05:30
Anand Doshi
fc736108f6 Fixed Applications search 2014-07-03 12:37:38 +05:30
Anand Doshi
79adf92957 Trigger on_communication using run_method 2014-07-03 12:37:16 +05:30
Anand Doshi
120c49f7cd Don't add **order by** from meta if a mysql group function is used without group by clause
Fixes frappe/frappe-bench#17
2014-07-03 11:31:15 +05:30
Anand Doshi
96570f438c Merge pull request #667 from rmehta/fixes-july-2
fixes for control.js formatter
2014-07-02 18:13:40 +05:30
Rushabh Mehta
48068b673d fixes for control.js formatter 2014-07-02 17:41:23 +05:30
Anand Doshi
14ae4cea96 Merge pull request #666 from pdvyas/scheduler-fix
create scheduler event lock in scheduler_task, not in enqueue events
2014-07-02 17:15:30 +05:30
Pratik Vyas
3f4dc46b7a create scheduler event lock in scheduler_task, not in enqueue events 2014-07-02 14:01:05 +05:30
Anand Doshi
07a08d4589 Merge pull request #664 from anandpdoshi/anand-wip
Fixed ToDo Notification Count
2014-07-01 18:58:53 +05:30
Anand Doshi
775e8c9d9e Fixed ToDo Notification Count 2014-07-01 18:58:05 +05:30
Anand Doshi
727972bc7c Merge pull request #663 from rmehta/develop
fix for todo delete and tags
2014-07-01 18:47:38 +05:30
Rushabh Mehta
dc52a9becd delete_doc None fix 2014-07-01 18:40:42 +05:30
Rushabh Mehta
9f8e313c9b fix delete_doc 2014-07-01 18:37:59 +05:30
Rushabh Mehta
2eb47c4d8d Merge pull request #662 from anandpdoshi/anand-wip
Raise TemplateNotFoundError in get_html of Print Format
2014-07-01 18:36:57 +05:30
Rushabh Mehta
b0f0bab7fa fix todo 2014-07-01 18:28:22 +05:30
Rushabh Mehta
a354ee0070 fix for todo delete and tags 2014-07-01 18:00:35 +05:30
Anand Doshi
6784a319de Raise TemplateNotFoundError in get_html of Print Format 2014-07-01 16:29:09 +05:30
Rushabh Mehta
f8ee21ce1e Merge pull request #661 from rmehta/develop
fixes for perm.js and added no_sidebar in website settings, fixes frappe...
2014-07-01 13:01:44 +05:30
Rushabh Mehta
dd2d113dfa Merge pull request #660 from nabinhait/v4-hotfix
Fix in translate.py
2014-07-01 12:59:55 +05:30
Rushabh Mehta
42d4dc88da fixes for perm.js and added no_sidebar in website settings, fixes frappe/erpnext#1791 2014-07-01 12:57:03 +05:30
Nabin Hait
239bb27d99 Fix in translate.py 2014-07-01 12:34:08 +05:30
Anand Doshi
22d6dddac8 Merge pull request #659 from anandpdoshi/anand-wip
Website Route: Ingore Permission when building via Website Generator
2014-07-01 12:21:11 +05:30
Anand Doshi
c719f185cb Merge branch 'rmehta-develop' into develop 2014-07-01 12:20:21 +05:30
Anand Doshi
162d49e15b Fixes default test cases 2014-07-01 12:20:12 +05:30
Anand Doshi
3bcaa13099 BugFix: Logout user when disabled 2014-07-01 11:51:31 +05:30
Nabin Hait
1c15748d53 minor fix in getting print format html 2014-07-01 11:51:31 +05:30
Anand Doshi
d56e375e0a Fixed website sync 2014-07-01 11:51:30 +05:30
Anand Doshi
37775bbc2f Fixed notification count for todo 2014-07-01 11:51:30 +05:30
Anand Doshi
cbdc22cf5d ToDo List: Default filter, avatar and Assigned To in list view 2014-07-01 11:51:30 +05:30
Anand Doshi
96d032ca12 Update comments on rename 2014-07-01 11:51:30 +05:30
Nabin Hait
be13050c69 Minor fix in getting controller classname 2014-07-01 11:51:30 +05:30
Anand Doshi
60d79ec37c Website Route: Ingore Permission when building via Website Generator 2014-06-30 18:47:06 +05:30
Anand Doshi
7c1a2f57fe Merge pull request #657 from nabinhait/v4-hotfix
minor fix in getting print format html
2014-06-30 18:13:59 +05:30
Anand Doshi
2b4d8b34e0 Merge pull request #658 from anandpdoshi/anand-wip
BugFix: Logout user when disabled
2014-06-30 18:08:04 +05:30
Rushabh Mehta
319743d563 fix travis, build website before tests 2014-06-30 18:07:33 +05:30
Anand Doshi
5e900693ef BugFix: Logout user when disabled 2014-06-30 18:00:57 +05:30
Rushabh Mehta
c0ff8978e0 Merge pull request #656 from anandpdoshi/anand-wip
ToDo fixes and website sync
2014-06-30 17:54:36 +05:30
Nabin Hait
bfd7bbc07d minor fix in getting print format html 2014-06-30 17:17:22 +05:30
Anand Doshi
1f46b3967d Fixed website sync 2014-06-30 16:54:43 +05:30
Anand Doshi
0c05d40721 Fixed notification count for todo 2014-06-30 16:54:34 +05:30
Rushabh Mehta
a1a9ae0ed6 bugfixes for permission, fixes frappe/erpnext#1855 2014-06-30 16:53:07 +05:30
Anand Doshi
7579766677 ToDo List: Default filter, avatar and Assigned To in list view 2014-06-30 15:20:12 +05:30