Commit graph

5632 commits

Author SHA1 Message Date
Anand Doshi
2ead90fc6e Misc fixes 2014-06-27 20:59:00 +05:30
Anand Doshi
eb2f51307e Load doctype module should be done per app 2014-06-27 20:58:48 +05:30
Anand Doshi
2464568cc0 Fixes in Website Route system 2014-06-27 20:58:12 +05:30
Anand Doshi
e592883612 Removed ERPNext patch 2014-06-27 20:54:09 +05:30
Anand Doshi
197d1c55df Merge remote-tracking branch 'frappe/develop' into wip-4.1 2014-06-26 15:04:35 +05:30
Anand Doshi
74da0a9608 Merge pull request #645 from nabinhait/v4-hotfix
Dont copy amended_from and amendment_date in copy_doc
2014-06-26 15:03:39 +05:30
Nabin Hait
df3a115d42 minor fix 2014-06-26 15:01:25 +05:30
Anand Doshi
a827713a9a Merge remote-tracking branch 'frappe/develop' into wip-4.1 2014-06-26 14:52:54 +05:30
Anand Doshi
505b9cd22f Merge branch 'rmehta-wip-4.1' into wip-4.1
Conflicts:
	frappe/core/doctype/doctype/doctype.py
2014-06-26 14:51:39 +05:30
Anand Doshi
c37f66229b Fixed load_doctype_module 2014-06-26 14:51:00 +05:30
Nabin Hait
a714b2d588 Dont copy amended_from and amendment_date in copy_doc 2014-06-26 14:48:38 +05:30
Anand Doshi
b77841b08d Changed System Signature to Footer 2014-06-26 14:38:45 +05:30
Anand Doshi
e8688c9b2c System Signature - fixes frappe/erpnext#1849 2014-06-26 14:38:45 +05:30
Anand Doshi
8c0c92aef7 Increased Max Communications Per Hour to 1000 2014-06-26 14:38:45 +05:30
Pratik Vyas
19f7e971eb hotfix get_file_url 2014-06-26 14:38:45 +05:30
Anand Doshi
cc64be0e15 Fixed comment deletion 2014-06-26 14:38:45 +05:30
Anand Doshi
e7d2ff0522 hotfix in permission 2014-06-26 14:38:44 +05:30
Pratik Vyas
01d97f1a30 fix bad attachment urls and encode them 2014-06-26 14:38:44 +05:30
Rushabh Mehta
2d042f4392 form prev/next fix and file_order fix 2014-06-26 14:38:44 +05:30
Rushabh Mehta
2349f9283d change default max_file_size to 3MB, its 2014 2014-06-26 14:38:44 +05:30
Rushabh Mehta
c534a3bbd9 user permissions, show buttons only for system manager 2014-06-26 14:38:44 +05:30
Rushabh Mehta
8cde609132 removed print 2014-06-26 14:38:43 +05:30
Rushabh Mehta
958c9c4328 reverted common_keys 2014-06-26 14:38:43 +05:30
Rushabh Mehta
6037531682 added upload / download in user permissions 2014-06-26 14:38:43 +05:30
Anand Doshi
8c48b6833f Save naming series in property setter before reload 2014-06-26 14:38:43 +05:30
Rushabh Mehta
a506d83bd2 dynamic_link_fix 2014-06-26 14:38:17 +05:30
Rushabh Mehta
a6314e6670 dynamic_link_fix 2014-06-26 14:38:17 +05:30
Rushabh Mehta
4fdfdddcd2 new feature: dynamic links 💥 2014-06-26 14:38:17 +05:30
Anand Doshi
0826b97c86 Do not validate links, selects, mandatory, etc. on cancel 2014-06-26 14:38:17 +05:30
Maxwell
e053586872 Fix app doesnt showed in desktop
Related to #607, #608 and this discussion on GGroup

https://groups.google.com/forum/?utm_medium=email&utm_source=footer#!msg/erpnext-developer-forum/cQMhAZAFiF4/7B8GHkH4RZ0J
2014-06-26 14:38:16 +05:30
Rushabh Mehta
287f956ddb Merge pull request #644 from anandpdoshi/anand-wip-4.1
System Signature - fixes frappe/erpnext#1849
2014-06-26 14:11:53 +05:30
Anand Doshi
f08c2cb69e Changed System Signature to Footer 2014-06-26 12:57:52 +05:30
Anand Doshi
17f80e860a System Signature - fixes frappe/erpnext#1849 2014-06-26 12:03:50 +05:30
Rushabh Mehta
dce15554f6 Merge pull request #643 from anandpdoshi/anand-wip
Show correct avatar in User listview
2014-06-26 10:43:13 +05:30
Anand Doshi
3b0a9bf026 Show correct avatar in User listview 2014-06-26 10:38:56 +05:30
Rushabh Mehta
62f774eb7f Merge pull request #642 from nabinhait/v4-hotfix
Module name based on app title and make init while creating folder
2014-06-25 20:38:53 +05:30
Rushabh Mehta
d47c38e7de Merge pull request #641 from anandpdoshi/anand-wip
Fixed report: Permitted Documents For User
2014-06-25 20:37:07 +05:30
Nabin Hait
25f83d8f32 Module name based on app title and make init while creating folder 2014-06-25 19:02:06 +05:30
Anand Doshi
bc4b1cefc1 Fixed report: Permitted Documents For User 2014-06-25 18:23:24 +05:30
Anand Doshi
b8ddc30416 Merge pull request #640 from anandpdoshi/anand-wip
hotfix in filter field select
2014-06-25 18:12:29 +05:30
Anand Doshi
7c237f825a hotfix in filter field select 2014-06-25 18:11:42 +05:30
Rushabh Mehta
81d3f4c244 added form grid for docfields 2014-06-25 17:39:41 +05:30
Rushabh Mehta
41900035b9 added new feature form_grid_templates to beautify form grids 2014-06-25 17:33:22 +05:30
Anand Doshi
4d30406f68 Merge remote-tracking branch 'frappe/develop' into wip-4.1 2014-06-25 17:07:04 +05:30
Rushabh Mehta
ac83922a55 Merge pull request #638 from anandpdoshi/anand-wip
Increased Max Communications Per Hour to 1000
2014-06-25 16:04:31 +05:30
Anand Doshi
a13db72d13 Increased Max Communications Per Hour to 1000 2014-06-25 15:38:52 +05:30
Anand Doshi
714f4ed4d0 Merge remote-tracking branch 'frappe/develop' into wip-4.1
Conflicts:
	frappe/patches.txt
2014-06-25 15:38:10 +05:30
Anand Doshi
30a28c595f Merge pull request #637 from pdvyas/hotfix-filemanager
hotfix get_file_url
2014-06-25 15:24:26 +05:30
Pratik Vyas
ff34bf6c77 hotfix get_file_url 2014-06-25 12:07:33 +05:30
Pratik Vyas
5762ce7f19 Merge pull request #636 from anandpdoshi/anand-wip
hotfix in permission
2014-06-24 17:07:51 +05:30