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 |
|
Anand Doshi
|
294c73f557
|
Fixed comment deletion
|
2014-06-24 16:42:50 +05:30 |
|
Anand Doshi
|
16073efa61
|
hotfix in permission
|
2014-06-24 16:32:25 +05:30 |
|
Anand Doshi
|
44b7656547
|
Merge pull request #620 from rmehta/wip-4.1
Print Formats for Reports and New Website Routing Model
|
2014-06-24 16:26:53 +05:30 |
|
Anand Doshi
|
53ff5daeb2
|
Merge pull request #635 from pdvyas/hotfix-attachment-url
fix bad attachment urls and encode them
|
2014-06-24 16:26:17 +05:30 |
|
Pratik Vyas
|
8e891892ba
|
fix bad attachment urls and encode them
|
2014-06-24 16:14:22 +05:30 |
|
Anand Doshi
|
5d68aa2884
|
Merge pull request #632 from rmehta/develop
new feature: dynamic links 💥
|
2014-06-23 16:01:42 +05:30 |
|
Rushabh Mehta
|
f0e26cac1c
|
form prev/next fix and file_order fix
|
2014-06-23 15:47:19 +05:30 |
|
Nabin Hait
|
18325f565f
|
Merge pull request #633 from anandpdoshi/anand-wip
Save naming series in property setter before reload
|
2014-06-23 15:46:36 +05:30 |
|
Rushabh Mehta
|
ee3705f66f
|
change default max_file_size to 3MB, its 2014
|
2014-06-23 12:39:14 +05:30 |
|
Rushabh Mehta
|
a4b8a362ae
|
user permissions, show buttons only for system manager
|
2014-06-23 12:31:06 +05:30 |
|
Rushabh Mehta
|
fa280fec57
|
removed print
|
2014-06-23 12:27:39 +05:30 |
|
Rushabh Mehta
|
16d091c5b7
|
reverted common_keys
|
2014-06-23 12:26:26 +05:30 |
|
Rushabh Mehta
|
66393fcd82
|
added upload / download in user permissions
|
2014-06-23 12:14:24 +05:30 |
|
Anand Doshi
|
cb004a168b
|
Save naming series in property setter before reload
|
2014-06-20 20:16:53 +05:30 |
|
Rushabh Mehta
|
d6ca8baf0b
|
dynamic_link_fix
|
2014-06-20 19:09:43 +05:30 |
|
Rushabh Mehta
|
079b345404
|
dynamic_link_fix
|
2014-06-20 16:51:57 +05:30 |
|
Rushabh Mehta
|
3fb3667204
|
new feature: dynamic links 💥
|
2014-06-20 16:47:34 +05:30 |
|
Rushabh Mehta
|
e76a2840e4
|
Merge pull request #631 from anandpdoshi/anand-wip
Do not validate links, selects, mandatory, etc. on cancel
|
2014-06-20 14:56:42 +05:30 |
|
Rushabh Mehta
|
8d07188a1f
|
fix for website routing / renaming
|
2014-06-20 13:40:51 +05:30 |
|
Anand Doshi
|
5b15e85ada
|
Do not validate links, selects, mandatory, etc. on cancel
|
2014-06-20 11:30:52 +05:30 |
|
Rushabh Mehta
|
2077736acd
|
Merge pull request #629 from MaxMorais/patch-4
Fix app doesnt showed in desktop
|
2014-06-20 10:28:32 +05:30 |
|
Maxwell
|
7faf26c29f
|
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-19 23:46:43 -03:00 |
|
Rushabh Mehta
|
b308ca8031
|
sync, sort
|
2014-06-19 19:01:33 +05:30 |
|
Rushabh Mehta
|
85e4a031ed
|
fixed routing of templates.genertors
|
2014-06-19 18:00:14 +05:30 |
|
Rushabh Mehta
|
5655e06448
|
fix hooks for website
|
2014-06-19 18:00:14 +05:30 |
|
Rushabh Mehta
|
6c3b5dded4
|
cleaned up verbosity
|
2014-06-19 18:00:14 +05:30 |
|
Rushabh Mehta
|
5c3ba2edd1
|
fixes for statics -> statics will be built after fixtures
|
2014-06-19 18:00:14 +05:30 |
|
Rushabh Mehta
|
a2aaba7d9e
|
closes frappe/frappe#600
|
2014-06-19 18:00:13 +05:30 |
|
Rushabh Mehta
|
c49f517e96
|
added patches for build_website and removed website template frappe/frappe#600
|
2014-06-19 18:00:08 +05:30 |
|
Rushabh Mehta
|
b0036a27ec
|
make links between user and role permission manager frappe/erpnext#1803
|
2014-06-19 17:59:38 +05:30 |
|
Rushabh Mehta
|
6c6cec7373
|
website route rewrite - started frappe/frappe#600
|
2014-06-19 17:59:38 +05:30 |
|
Rushabh Mehta
|
2a3684a02c
|
build: ability to add html files as frappe.templates[filename] and related fixes to query report
|
2014-06-19 17:59:38 +05:30 |
|
Rushabh Mehta
|
f0b8922e28
|
added feature to add print formats to reports using john resig's microtemplates
|
2014-06-19 17:59:37 +05:30 |
|
Rushabh Mehta
|
99734d82d3
|
added feature to add print formats to reports using john resig's microtemplates
|
2014-06-19 17:59:37 +05:30 |
|
Rushabh Mehta
|
6ef0b2f2bb
|
fix frappe/frappe#516
|
2014-06-19 17:59:37 +05:30 |
|
Rushabh Mehta
|
320cea88b5
|
removed inline styling and fancy formatting for emails
|
2014-06-19 17:59:37 +05:30 |
|
Rushabh Mehta
|
eb70ed8735
|
removed inline styling and fancy formatting for emails
|
2014-06-19 17:59:36 +05:30 |
|
Anand Doshi
|
f1caa27625
|
Merge remote-tracking branch 'frappe/develop' into wip-4.1
|
2014-06-19 17:43:30 +05:30 |
|
Rushabh Mehta
|
213289252c
|
Merge pull request #628 from rmehta/develop
added help in custom script
|
2014-06-19 16:34:07 +05:30 |
|
Rushabh Mehta
|
833913e9e0
|
added help in custom script
|
2014-06-19 16:30:21 +05:30 |
|
Rushabh Mehta
|
93f88bf323
|
Merge pull request #623 from anandpdoshi/anand-wip
Remove script tags, once evaled; Validate Selects
|
2014-06-19 16:29:58 +05:30 |
|
Rushabh Mehta
|
d3d4604e10
|
Merge pull request #627 from anandpdoshi/update-session
Fixed update sessions
|
2014-06-19 16:26:49 +05:30 |
|
Anand Doshi
|
6e48d3b5c6
|
Merge pull request #626 from rmehta/develop
added standard reply fixes frappe/erpnext#1819
|
2014-06-19 16:22:15 +05:30 |
|
Anand Doshi
|
412fab3e64
|
Fixed update sessions
|
2014-06-19 16:08:29 +05:30 |
|
Anand Doshi
|
8b97787f40
|
Remove user_owner Custom Field
|
2014-06-19 16:04:38 +05:30 |
|
Anand Doshi
|
53f04414cf
|
Validate Select field values
Conflicts:
frappe/model/base_document.py
frappe/model/meta.py
|
2014-06-19 16:02:38 +05:30 |
|