vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
17710 commits 1 branch 0 tags 587 MiB
Commit graph

1048 commits

Author SHA1 Message Date
Faris Ansari
b7c4593200 Merge branch 'develop' of https://github.com/frappe/frappe into cast-numeric-values 2019-01-08 12:21:25 +05:30
Frappe Bot
1197271700 Fixed merge conflict 2019-01-05 09:06:05 +00:00
Sagar Vora
53b11e3d0d fix(core): rename "View log" to "View Log" and patch (#6708) 2019-01-03 16:34:08 +05:30
Faris Ansari
c687d7e8b7 fix: Cast numeric values to int 2019-01-01 18:27:56 +05:30
Saurabh
d5fdc670f7 Merge branch 'staging' into develop 2019-01-01 14:26:16 +05:30
Suraj Shetty
eacaea6a0d Add accidently removed match filters (#6701) 
- Fixes "No user permission applied for Reports" issue
 2018-12-31 20:07:13 +05:30
Zarrar
ffa0a1821c fix: Delete View Logs when deleting a document (#6695) 2018-12-31 11:34:48 +05:30
Faris Ansari
3b86f16b73 New Control: Table MultiSelect (#6675) 
* feat(control): Add Table MultiSelect control

* fix: Use btn-group instead of span

* fix: Remove functionality

* fix: Add 'Table MultiSelect' to Field doctypes

* fix: Replace usage of string 'Table' with array `table_fields`

* fix: Use internal array to store values instead of building from HTML elements

* fix(style): Add semicolon

* fix: Read only mode and click to navigate to form

* style: indent

* fix: fallback to empty array

* fix: Add formatters in js and py

* style: missing semicolon

* fix: Add docfield validation
 2018-12-28 15:36:59 +05:30
Frappe Bot
a7754527df Merge branch 'staging' into develop 2018-12-26 14:31:02 +00:00
Suraj Shetty
8b201911b4
fix(permission): Update db_query.py (#6683) 2018-12-26 19:57:18 +05:30
Suraj Shetty
fe49117c92
fix: issue related to quotes (#6682) 2018-12-26 19:36:13 +05:30
Frappe Bot
0499b4a845 Merge branch 'staging' into develop 2018-12-26 12:03:03 +00:00
Suraj Shetty
40fb7ac76f Init reference doctype 2018-12-12 13:50:20 +05:30
Suraj Shetty
039bd58a31 Fix minor bug 2018-12-12 13:17:12 +05:30
Suraj Shetty
70a8054020 Fix client side user permission check 2018-12-12 13:15:11 +05:30
Suraj Shetty
943be440fa Fix user permission check 
- show complete list in no user permission for the
 reference doctype is found
 2018-12-12 12:58:56 +05:30
Suraj Shetty
390254b65d
Merge branch 'staging-fixes' into staging-fixes 2018-11-29 09:18:43 +05:30
Ameya Shenoy
c5d276b813
Merge branch 'staging' into develop 2018-11-28 08:24:00 +00:00
Ameya Shenoy
f513739d1a
Merge branch 'master' into staging-fixes 2018-11-28 07:53:35 +00:00
Saurabh
4738a9711a fix: tighten protection against sql injection (#6546) 2018-11-28 10:22:30 +05:30
Suraj Shetty
79ddfe6021
Merge branch 'staging-fixes' into staging-fixes 2018-11-26 18:12:34 +05:30
Ameya Shenoy
3669203acf fix(get_version): from hooks.py instaed of git (#6534) 2018-11-26 12:16:12 +01:00
Nabin Hait
e50e6deed3
fix(fetch from): Always set value based on fetch_from if new doc (#6536) 2018-11-26 16:14:58 +05:30
Suraj Shetty
3830e83278 Include Markdown Editor and HTML Editor to data_fieldtype 2018-11-26 13:06:35 +05:30
Ameya Shenoy
13524a1ad5
Merge branch 'staging' into develop 2018-11-23 08:14:29 +00:00
Ameya Shenoy
d1d0edc636
Merge branch 'master' into staging-fixes 2018-11-23 08:07:36 +00:00
Rohit Waghchaure
d8277d0f98 [Fix] Fetch from works after submission of document 2018-11-22 20:10:08 +05:30
Aditya Hase
02d8edd332 [Feature] Markdown Editor (#6383) 
* feat(markdown-editor): Add new fieldtype - MarkdownEditor

* feat(markdown-editor): Add MarkdownEditor control

* fix(markdown-editor): Fix placement of "Show Preview" button

* fix(markdown-editor): Render HTML in prints
 2018-11-22 11:37:50 +01:00
rohitwaghchaure
c247ec17ea fix: child table access using get_list function (#6511) 
User was able to fetch child table data without having access from client side using frappe.db.get_list function
 2018-11-22 12:44:32 +05:30
rohitwaghchaure
df6687f9c0 fix: After rename, user still able to search document using old name (#6515) 2018-11-22 11:33:29 +05:30
Suraj Shetty
e79cfc531a Merge branch 'staging-fixes' of https://github.com/frappe/frappe into staging-fixes 2018-11-21 13:18:33 +05:30
Ameya Shenoy
d0e7690ae2
Merge branch 'staging' into develop 2018-11-05 06:48:46 +00:00
Ameya Shenoy
5a791cd099
Merge branch 'master' into staging-fixes 2018-11-05 06:37:49 +00:00
Saurabh
856a721073 [fix] sql injection fix (#6390) 2018-11-05 10:51:57 +05:30
Suraj Shetty
88ba2ecf36 Init return_empty 2018-11-05 10:51:39 +05:30
Suraj Shetty
30de0662e9 Set a boolean to return empty response 2018-11-05 10:39:11 +05:30
Suraj Shetty
15d3f4660e fix(security): pop ignore_permissions arg from whitelisted method 2018-11-05 10:29:50 +05:30
Suraj Shetty
0aee7afb87 Fix permission error while import (#6385) 
Custom permission should apply while import
or else import of doctype with custom roles fails
 2018-11-02 12:19:25 +05:30
Suraj Shetty
83a17a8242 Fix user permission on link fields 2018-11-01 21:18:15 +05:30
Suraj Shetty
5df1a040ff Remove unwanted code 2018-11-01 21:18:14 +05:30
Suraj Shetty
87d5f87d08 Add applicable_for field 2018-11-01 21:18:14 +05:30
Suraj Shetty
4b3ae8f1ce wip(user_permissions) 2018-11-01 21:17:21 +05:30
Ameya Shenoy
62736ba219
Merge branch 'staging' into develop 2018-10-31 10:58:47 +00:00
Ameya Shenoy
55fbf7ad99
Merge branch 'master' into staging-fixes 2018-10-31 10:40:55 +00:00
Saurabh
a1e68b6fd5 [fix] potential sql injection by sanitizing fields parameter 2018-10-31 14:26:22 +05:30
Ameya Shenoy
742f0d2602
Merge branch 'staging' into develop 2018-10-31 07:29:46 +00:00
Shreya
a4f0316119 fix(series): Revert series count after doc deletion 2018-10-25 14:43:31 +05:30
Ameya Shenoy
63c5613f92
Merge branch 'staging' into develop 2018-10-11 10:11:26 +00:00
Suraj Shetty
e85589f46c HTML Editor control (#6237) 
* Add HTML editor

* Add HTML editor map to db_schema.py

* Revert permission change
- ref #6218

* Fix typo

* Add HTML Editor entry to customize form field

* Update customize_form_field.json

* Update permissions.py

* Debounce preview generation

* Translate strings
 2018-10-11 14:07:16 +05:30
Ameya Shenoy
387f556dd5
Merge branch 'staging' into develop 2018-10-04 11:41:29 +00:00