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 |
|
Rushabh Mehta
|
6083999f8a
|
added standard reply fixes frappe/erpnext#1819
|
2014-06-19 15:16:56 +05:30 |
|
Anand Doshi
|
cf8b6c0a6e
|
Merge pull request #625 from rmehta/develop
viet nam > vietnam fixes frappe/erpnext#1800
|
2014-06-19 15:08:47 +05:30 |
|
Rushabh Mehta
|
8885b6b4dc
|
vietnam
|
2014-06-19 14:31:10 +05:30 |
|
Anand Doshi
|
02d51386e2
|
Merge pull request #624 from rmehta/develop
fixes for tags in form and report
|
2014-06-19 12:51:30 +05:30 |
|
Rushabh Mehta
|
ec65913182
|
fixes for tags in form and report
|
2014-06-19 11:34:30 +05:30 |
|
Anand Doshi
|
a4fed1efe4
|
Validate Selects and Fixed Number Formats
|
2014-06-18 21:09:40 +05:30 |
|
Anand Doshi
|
65ae2fbd29
|
Remove script tags, once evaled
|
2014-06-18 18:02:02 +05:30 |
|
Nabin Hait
|
d236836a9f
|
Merge pull request #622 from anandpdoshi/anand-wip
Disable Signup in Website Settings should still show Login link in Top Bar
|
2014-06-18 17:37:33 +05:30 |
|
Anand Doshi
|
587da3d060
|
Update session into database every 10 mins
|
2014-06-18 17:33:23 +05:30 |
|
Anand Doshi
|
91f8338849
|
Fixes frappe/erpnext#1811
|
2014-06-18 16:49:46 +05:30 |
|
Anand Doshi
|
eb9c558cf0
|
hotfix: dont_update_if_missing
|
2014-06-18 15:26:40 +05:30 |
|
Anand Doshi
|
dcbfb5dae1
|
Merge pull request #621 from anandpdoshi/anand-wip
dont_update_if_missing property, lets you skip fields for which you don't want missing values to be updated
|
2014-06-18 14:53:00 +05:30 |
|
Anand Doshi
|
33d1da9d43
|
dont_update_if_missing property, lets you skip fields for which you don't want missing values to be updated
|
2014-06-18 12:54:27 +05:30 |
|
Rushabh Mehta
|
9b7cb3c46c
|
Merge pull request #618 from anandpdoshi/anand-wip
Fixed Data Import for Children, Query Reports trigger refresh
|
2014-06-18 10:56:30 +05:30 |
|
Anand Doshi
|
23029a3dcc
|
Merge pull request #619 from nabinhait/v4-hotfix
Multiple fixes
|
2014-06-18 10:49:48 +05:30 |
|
Nabin Hait
|
37ca839b29
|
Update user report view settings on field_rename
|
2014-06-18 10:16:58 +05:30 |
|
Nabin Hait
|
9b4d4b648e
|
Dont run validate on update_after_submit
|
2014-06-17 19:09:49 +05:30 |
|
Nabin Hait
|
2eae4a7740
|
minor fix in get_value
|
2014-06-17 19:09:48 +05:30 |
|
Anand Doshi
|
4b8ab8d371
|
Query Report: Trigger refresh on change of filters, if reqd filter values exist
|
2014-06-17 17:56:52 +05:30 |
|
Anand Doshi
|
6e7e641a3a
|
Fixed Data Import for Children
|
2014-06-17 17:17:31 +05:30 |
|
Anand Doshi
|
ff71fa4da2
|
hotfix: remove user_roles where parentfield is blank
|
2014-06-17 16:07:42 +05:30 |
|
Nabin Hait
|
cfaa386a41
|
Merge pull request #617 from anandpdoshi/anand-wip
Don't clear Naming Series property setter when resetting customization
|
2014-06-17 14:15:05 +05:30 |
|
Anand Doshi
|
4092aa00f0
|
Don't clear Naming Series property setter when resetting customization
|
2014-06-17 13:50:47 +05:30 |
|
Pratik Vyas
|
723eb89a9b
|
Merge pull request #616 from anandpdoshi/anand-wip
Don't run popstate on hash change
|
2014-06-17 13:18:05 +05:30 |
|
Anand Doshi
|
4f63fe7dd0
|
Don't run popstate on hash change
|
2014-06-16 18:08:56 +05:30 |
|
Nabin Hait
|
49a819b298
|
Merge pull request #615 from anandpdoshi/anand-wip
Fixed add width property setter
|
2014-06-16 16:34:52 +05:30 |
|
Anand Doshi
|
1fb25aa093
|
Fixed add width property setter
|
2014-06-16 16:06:22 +05:30 |
|
Anand Doshi
|
65e177f98d
|
Fixed insert after
|
2014-06-16 14:39:32 +05:30 |
|
Anand Doshi
|
69907bcf8c
|
hotfix - don't create owner custom field for User
|
2014-06-16 12:54:42 +05:30 |
|
Rushabh Mehta
|
b40bb3a5a0
|
Merge pull request #614 from rmehta/develop
sync_statics force
|
2014-06-13 16:16:59 +05:30 |
|
Rushabh Mehta
|
4844cd040a
|
sync_statics force
|
2014-06-13 16:15:31 +05:30 |
|