Commit graph

16960 commits

Author SHA1 Message Date
Suraj Shetty
88a08fdfec Add "pin post" feature 2018-10-21 09:52:12 +05:30
Suraj Shetty
2cfef05eb7 Fix "property not defined" error 2018-10-21 09:52:12 +05:30
Suraj Shetty
7369d8943c Init profile view and sidebar 2018-10-21 09:52:12 +05:30
Suraj Shetty
c125680c7c Fix routing and remove some unwanted code 2018-10-21 09:52:12 +05:30
Suraj Shetty
4692ecfab2 Load user bio 2018-10-21 09:52:12 +05:30
Suraj Shetty
6186fec78e Init profile page 2018-10-21 09:52:12 +05:30
Suraj Shetty
07118968a9 Add like feature 2018-10-21 09:52:12 +05:30
Suraj Shetty
a2f1493650 Add justify-flex-end/start classes to flex.less 2018-10-21 09:52:12 +05:30
Suraj Shetty
47abdf7ab7 Publish post reply with ID to avoid hitting useless listeners 2018-10-21 09:52:12 +05:30
Suraj Shetty
7860548d2b Add type field to post doctype and introduce event & action cards 2018-10-21 09:52:12 +05:30
Suraj Shetty
16ae18c9cd Add social desktop icon 2018-10-21 09:52:12 +05:30
Suraj Shetty
f4bd402a0f Avoid creation of multiple pages 2018-10-21 09:52:12 +05:30
Suraj Shetty
9842734e12 Add UI enhancements and some bug fixes 2018-10-21 09:52:12 +05:30
Suraj Shetty
a4fb567127 Add reply feature 2018-10-21 09:52:12 +05:30
Suraj Shetty
90afe7b273 Add post system code 2018-10-21 09:52:12 +05:30
Suraj Shetty
eb4db826e7 Create social module and post doctype 2018-10-21 09:52:12 +05:30
Ameya Shenoy
06d9385829
Merge branch 'staging' into develop 2018-10-19 12:51:40 +00:00
Ameya Shenoy
9cd5e1af0f
Merge branch 'staging-fixes' into staging 2018-10-19 12:50:06 +00:00
Ameya Shenoy
86b328bae5 bumped to version 11.0.3-beta.12 2018-10-19 12:50:05 +00:00
Ameya Shenoy
b42a87746a
Merge branch 'master' into staging-fixes 2018-10-19 12:42:37 +00:00
Ameya Shenoy
8034e8395c
Merge branch 'hotfix' 2018-10-19 12:38:36 +00:00
Ameya Shenoy
d4a062fdbd bumped to version 10.1.54 2018-10-19 12:38:36 +00:00
Ameya Shenoy
bd23de9865
Merge pull request #6280 from codingCoffee/ver
fix(update message): multiple fixes
2018-10-19 18:07:34 +05:30
rohitwaghchaure
a9c11c3519
Merge pull request #6273 from rohitwaghchaure/multiple_messages_are_coming
[Fix] multiple user permissions messages are coming even if permissions are set
2018-10-19 14:57:45 +05:30
Ameya Shenoy
be8f37dc5b fix(update message): multiple fixes
- added GitPython as a dependency
- use git describe to find the branch version
- prevent version popup for prereleases
- check for update weekly instead of daily
- fixed bug in check for update which used to compare minor version even
if there was a mismatch in comparing major versions

Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
2018-10-18 13:56:32 +00:00
Ameya Shenoy
b848c9dfc7
Merge pull request #6279 from codingCoffee/urllib
fix(travis): urllib3 version 1.23
2018-10-18 18:30:03 +05:30
Ameya Shenoy
2bc7d159f0
fix(travis): python package version management
- urllib3 to 1.23
- bleach to 2.1.4
2018-10-18 12:45:59 +00:00
Shreya Shah
88ff36fd10
Merge pull request #6276 from netchampfaris/quill-fixes-2
Quill fixes
2018-10-18 14:50:01 +05:30
Faris Ansari
f89fd5c6ac fix(Quill): Add class table-bordered to tables 2018-10-18 14:14:18 +05:30
Faris Ansari
a65e5aeec9 fix(Quill): Add forked quill-mention to make mentions work 2018-10-18 14:13:58 +05:30
Chinmay Pai
b1aee1477a communication: save email as drafts to localStorage (#6251)
currently, there is no way to store an email draft. so suppose if someone would like to _not_ lose their email progress, we should store a draft as a safety measure.

a cheap way of doing this is by using localStorage. in this, we use <doctype>-<docname> key format in localStorage with the draft mail as the value. the draft is also auto deleted on mail send.

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>

Co-authored-by: Faris Ansari <netchamp.faris@gmail.com>
Co-authored-by: Kenneth Sequeira <kenneth@frappe.io>
2018-10-18 12:37:06 +05:30
Zarrar
80b3710f3a [Minor] Python 2 - 3 reference issue (#6257)
* reference issue

* use safe_decode instead of python 2-3 port
2018-10-18 12:36:09 +05:30
Saif
3e694eb8ff Get text from link formatter in indicator formatter function (#6266) 2018-10-18 12:35:41 +05:30
Ameya Shenoy
04d255bc5f fix(update message): multiple fixes (#6275)
- added GitPython as a dependency
- use git describe to find the branch version
- prevent version popup for prereleases
- check for update weekly instead of daily
- fixed bug in check for update which used to compare minor version even
if there was a mismatch in comparing major versions

Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
2018-10-18 12:33:00 +05:30
rohitwaghchaure
e45a3660d0 [Fix] Invalid date format message in quick entry for date field (#6274) 2018-10-18 12:32:36 +05:30
rohitwaghchaure
97ec70b83e [Fix] Setup wizard timeout error (#6270) 2018-10-18 12:29:46 +05:30
Rohit Waghchaure
0ab71884da [Fix] multiple user permissions messages are coming even if permissions are set 2018-10-17 18:48:51 +05:30
Faris Ansari
a6fc2caed0 wip 2018-10-17 16:32:28 +05:30
Rushabh Mehta
b76eb03a65 fix(web): fixed container_attributes 2018-10-17 16:31:51 +05:30
rohitwaghchaure
573750d6f4
Merge pull request #6271 from rohitwaghchaure/fix_report_is_not_loading
[Fix] Report Addresses And Contacts not working
2018-10-17 15:49:29 +05:30
Rohit Waghchaure
4db18698d5 [Fix] Report Addresses And Contacts not working 2018-10-17 15:46:25 +05:30
Ameya Shenoy
e692b59330
Merge branch 'staging' into develop 2018-10-17 09:43:17 +00:00
Ameya Shenoy
7fb04a86f8
Merge branch 'staging-fixes' into staging 2018-10-17 09:42:40 +00:00
Ameya Shenoy
1cb0815faf bumped to version 11.0.3-beta.11 2018-10-17 09:42:39 +00:00
Ameya Shenoy
b9db2a43b8
Merge branch 'master' into staging-fixes 2018-10-17 09:02:49 +00:00
Ameya Shenoy
5668e7742e
Merge branch 'hotfix' 2018-10-17 09:02:44 +00:00
Ameya Shenoy
9a24ce1814 bumped to version 10.1.53 2018-10-17 09:02:44 +00:00
Faris Ansari
226c017283
Report fixes v11 (#6269)
* fix(Report): Update datatable for multi column filters

* fix(Report): Show totals for child table columns
2018-10-16 16:14:46 +05:30
rohitwaghchaure
ecc6b0257c
Merge pull request #6267 from rohitwaghchaure/report_breaking_if_no_data_is_found
[Fix] Prepared report breaking if no data
2018-10-16 14:28:02 +05:30
Rohit Waghchaure
b434457648 [Fix] Prepared report breaking if no data 2018-10-16 14:27:07 +05:30