Commit graph

2135 commits

Author SHA1 Message Date
Frappe Bot
94ea028db3 Merge branch 'master' into develop 2019-03-08 09:38:18 +00:00
Rushabh Mehta
40dd3eb70f
Merge pull request #7046 from deepeshgarg007/comments
fix: Move comments from communication
2019-03-08 12:56:21 +05:30
Rushabh Mehta
67d00d59d9 fix(migration): change user timestamp for reloading 2019-03-08 11:55:58 +05:30
deepeshgarg007
2b403c2b31 fix: Datatype for comment 2019-03-07 18:41:38 +05:30
rohitwaghchaure
952dcedcc9
Merge pull request #7042 from rohitwaghchaure/after_bench_migrate_system_uncheck_disable_prepared_report
fix: after bench migrate system uncheck Disable Prepared Report in the report
2019-03-07 18:20:38 +05:30
Rohit Waghchaure
80bb7cba8f fix: after bench migrate system uncheck Disable Prepared Report in the report 2019-03-07 17:33:50 +05:30
Rushabh Mehta
247c968964
Revert "fix: sanitise comments for js events" 2019-03-07 17:18:38 +05:30
Rushabh Mehta
ee9b894a53
Merge pull request #7039 from scmmishra/fix-comment
fix: sanitise comments for js events
2019-03-07 17:03:51 +05:30
scmmishra
7ef38cb4cc style: removed comments 2019-03-07 16:55:21 +05:30
scmmishra
c6516f16d0 fix: sanitise comments for js events 2019-03-07 16:40:45 +05:30
Anurag Mishra
cd191439fd feat: Document subscription (#6745) 2019-03-07 14:06:22 +05:30
sahil28297
7eb94a2d35
Merge pull request #7036 from sahil28297/create_contact_patch
fix(patch): ignore mandatory for creating contact through patch
2019-03-07 12:57:08 +05:30
Sahil Khan
964fe26801 fix(patch): ignore mandatory for creating contact through patch 2019-03-07 12:38:53 +05:30
Prateeksha Singh
75d98df16c feat(desk): Desk Section settings patch 2019-03-04 12:39:46 +05:30
Suraj Shetty
d04188283c
Merge pull request #6991 from sagarvora/fetch_only_once
feat(core): New DocField "Fetch If Empty"
2019-03-04 12:31:18 +05:30
Faris Ansari
fadedb0062 Merge branch 'develop' of https://github.com/frappe/frappe into website-bootstrap-4 2019-03-02 15:15:22 +05:30
Rushabh Mehta
b5b863c95c fix: query for postgres 2019-03-01 09:40:03 +05:30
Frappe Bot
54e97b9ebc Merge branch 'master' into develop 2019-02-28 10:05:32 +00:00
Rushabh Mehta
a0de1e9614
Merge pull request #6988 from rmehta/communication-in-list
fix: Comment in list view
2019-02-28 12:57:03 +05:30
Suraj Shetty
e92dae4b55 fix: Error handling in user_permission.py 2019-02-27 17:00:10 +05:30
Anurag Mishra
4c3f1b8b82 fix: found user 2019-02-27 15:12:30 +05:30
Anurag Mishra
6082145e55 fix: unlink contact on deleting user 2019-02-27 14:51:34 +05:30
Faris Ansari
3258acb5c9 Merge branch 'develop' of https://github.com/frappe/frappe into website-bootstrap-4 2019-02-26 23:24:23 +05:30
Sagar Vora
0483877c9d feat: New DocField "Fetch If Empty" 2019-02-26 21:46:15 +05:30
Rushabh Mehta
c22fcc61d7 fix(typo): comment.py 2019-02-26 17:11:01 +05:30
Rushabh Mehta
7b691cdd64 fix(comment): add communication to comment 2019-02-26 17:11:01 +05:30
Sagar Vora
d11dd760f8 Merge branch 'master' into develop 2019-02-26 17:06:13 +05:30
Rushabh Mehta
56d958f1d3 fix: add communication in _comments for list view 2019-02-26 16:43:45 +05:30
Rushabh Mehta
22acfd3f0e fix(comment): add communication to comment 2019-02-26 16:24:31 +05:30
Rushabh Mehta
65028d3f7d fix(comments): add indexing 2019-02-26 15:00:36 +05:30
Rohit Waghchaure
65b646e59e fix: Removed duplicate page user permissions for page and report 2019-02-24 08:22:25 +05:30
Faris Ansari
14543f8468 fix: Ignore TypeError while making thumbnail 2019-02-21 16:28:52 +05:30
Faris Ansari
5a96fc70de Merge branch 'develop' of https://github.com/frappe/frappe into website-bootstrap-4 2019-02-20 19:25:25 +05:30
Aditya Hase
5f12f970fa style: Linting fixes 2019-02-19 21:58:58 +05:30
Aditya Hase
a5c1838826 refactor(recorder): Move primary and secondary action buttons to standard positions 2019-02-19 21:58:57 +05:30
Aditya Hase
f6574a4a6a feat(recorder): Show recorder app on recorder page 2019-02-19 21:58:57 +05:30
Aditya Hase
4202e07ce7 feat(recorder): Create recorder page 2019-02-19 21:58:57 +05:30
Rushabh Mehta
849f158a3a chore: make controller boiler-plates linting friendly 2019-02-19 11:09:02 +05:30
Rushabh Mehta
6c12448554 fix(typo): notify_mentions in comment 2019-02-18 17:59:39 +05:30
Rushabh Mehta
fcaadf78ad
Merge pull request #6891 from rmehta/refactor-comments
BREAKING CHANGE: Comments are now handled separately from Communication and Version
2019-02-16 16:54:16 +05:30
Frappe Bot
bfc25ad1e5 Merge branch 'master' into develop 2019-02-15 10:21:47 +00:00
Zarrar
5ddf3c10bb fix: Language Code naming validation (#6933)
* fix: language code naming fix

* fix: validate name and language code
2019-02-15 15:10:14 +05:30
Rushabh Mehta
ebdd219fbf
Merge pull request #6913 from saurabh6790/scrub_new_lines_and_white_spaces
fix: scrub new lines and white spaces from options and fetch_from field
2019-02-14 12:12:50 +05:30
Rushabh Mehta
f806f80665
Merge pull request #6923 from Zlash65/email-sender-name
feat: Use Email Account name as Sender's name
2019-02-14 12:12:14 +05:30
Suraj Shetty
fadb3f79ec Remove unwanted trailing spaces 2019-02-13 23:07:09 +05:30
Suraj Shetty
d014e02768 Index user field in User Permission doctype for faster select query 2019-02-13 23:00:40 +05:30
Rushabh Mehta
f00394ba13 fix: linting (nosec) 2019-02-13 18:49:22 +05:30
Rushabh Mehta
d610ce9522 fix(tests): tests and linting 2019-02-13 16:50:34 +05:30
Zlash65
9d61601829 feat: replace sender name by email account name 2019-02-12 17:37:45 +05:30
Sagar Vora
17b20b22a3 Merge branch 'master' into develop 2019-02-12 16:31:54 +05:30