Commit graph

17050 commits

Author SHA1 Message Date
Ameya Shenoy
aa4ef1b405
Merge branch 'staging' into develop 2018-10-23 08:04:11 +00:00
Ameya Shenoy
a8f2798b82
Merge branch 'staging-fixes' into staging 2018-10-23 08:03:18 +00:00
Ameya Shenoy
1949c680ba bumped to version 11.0.3-beta.13 2018-10-23 08:03:18 +00:00
rohitwaghchaure
7085424a9d
Merge pull request #6298 from rohitwaghchaure/make_verbose_false
Set verbose to false
2018-10-23 12:00:57 +05:30
Rohit Waghchaure
63b2c14ec8 Set verbose to false 2018-10-23 11:59:18 +05:30
Saif
971e60f0bf Added frappe.get_cached_doc in available jinja methods (#6292) 2018-10-23 11:04:18 +05:30
Himanshu Mishra
85d204a464 Primary key in tabSeries (#6285)
* add primary key on naming series

* remove unnecessary file
2018-10-23 11:03:57 +05:30
Frappe PR Bot
1826eb50eb [Translation] Updated Translations (#6294) 2018-10-23 11:03:33 +05:30
Faris Ansari
a80fa7d939
Merge pull request #6295 from netchampfaris/quill-mention-local
fix(Quill): Use a local copy of quill-mention
2018-10-23 10:49:36 +05:30
Faris Ansari
fb075437da Ignore eslint rules in quill mention 2018-10-23 10:25:52 +05:30
Suraj Shetty
36483d8e0b
Social fixes (#6296)
* Fix image viewer

* Fix social home reload issue

* Set session user if unavailable
2018-10-23 09:53:38 +05:30
Faris Ansari
d1c5c263b5 fix(Quill): Use a local copy of quill-mention
quill-mention's distribution copy is built with webpack
so it doesn't work with rollup
2018-10-22 16:12:17 +05:30
Ameya Shenoy
05317b3855
Merge branch 'master' into staging-fixes 2018-10-22 10:31:38 +00:00
Ameya Shenoy
94625ef3a0
Merge branch 'hotfix' 2018-10-22 10:31:33 +00:00
Ameya Shenoy
d8b1ae8d4f bumped to version 10.1.55 2018-10-22 10:31:33 +00:00
Faris Ansari
725932403a
Merge pull request #6213 from surajshetty3416/posts
feat: Social
2018-10-22 11:27:39 +05:30
Faris Ansari
757a7ae9de
Remove semicolon 2018-10-22 11:26:02 +05:30
Rushabh Mehta
eba27d1a5c fix(test): test_scheduler fails randomly 2018-10-22 10:23:03 +05:30
Rushabh Mehta
54767b4806 fix(query_report): change timeout to 10 seconds for filters 2018-10-22 10:23:03 +05:30
Saif
25827755b5 PDF allow parsing header-spacing (#6286)
Simply allow parsing header-spacing from custom css.
2018-10-22 10:13:26 +05:30
KanchanChauhan
fb10e92a9f [Bug Fix] get_value for child table does not work js (#6261) 2018-10-22 09:04:48 +05:30
Jay Parikh
0051915645 New keyboard shortcut combination. (#6290)
* New keyboard shortcut combination.

add shift+ the key, add alt+ the key, add alt+ctrl+ the key or single key e.g f1,f2,etc..

* Fixed Indentation Issues.

* Issue fix (no-self-assign)
2018-10-22 09:03:29 +05:30
Suraj Shetty
10e6dcd4fd Fix alignment 2018-10-21 20:29:44 +05:30
Suraj Shetty
b0fd9cb0a1 Open link in new tab 2018-10-21 20:23:28 +05:30
Suraj Shetty
2069f6a081 Fix profile sidebar UI 2018-10-21 20:13:26 +05:30
Suraj Shetty
429e217d0e Fix no-post-message UI 2018-10-21 20:09:41 +05:30
Suraj Shetty
38db2dba4e Fix pin post UX 2018-10-21 19:51:38 +05:30
Suraj Shetty
93d537b580 Link user avatar to profile page 2018-10-21 19:32:31 +05:30
Suraj Shetty
48459a9c60 Fix empty state UI/UX fix 2018-10-21 17:21:25 +05:30
Suraj Shetty
39ff56b402 Limit text on preview/social card 2018-10-21 13:27:10 +05:30
Suraj Shetty
582f6cf553 Overwrite transision applied for <a> 2018-10-21 13:08:11 +05:30
Suraj Shetty
26f0a29c1e Fix exception handling 2018-10-21 12:46:17 +05:30
Suraj Shetty
9c498f2e96 Fix codacy 2018-10-21 09:55:46 +05:30
Suraj Shetty
922850ce12 Add patch to create desktop icon for social 2018-10-21 09:53:06 +05:30
Suraj Shetty
a119a6476e Delete PostReply component 2018-10-21 09:53:06 +05:30
Suraj Shetty
1eea308dd3 Move route history code to separate file 2018-10-21 09:53:06 +05:30
Suraj Shetty
3fcc101bf7 Translate string 2018-10-21 09:53:06 +05:30
Suraj Shetty
9b2c7b4932 Fix codacy 2018-10-21 09:53:06 +05:30
Suraj Shetty
0914d10811 Disable local pin for now 2018-10-21 09:53:06 +05:30
Suraj Shetty
9c10b5f117 Fix UI and chat toggle issue 2018-10-21 09:53:06 +05:30
Suraj Shetty
3624e90b47 Reduce recent links count to 5 2018-10-21 09:53:06 +05:30
Suraj Shetty
2c839c4161 Add method to parse meta from the provided URL 2018-10-21 09:53:06 +05:30
Suraj Shetty
01e3516fa8 Init link preview 2018-10-21 09:53:05 +05:30
Suraj Shetty
441457b994 Fix UI and pin feature 2018-10-21 09:53:05 +05:30
Suraj Shetty
98dda94952 Revamp social
- Make a PostLoader to load all posts
- UI changes
2018-10-21 09:53:05 +05:30
Suraj Shetty
58dbec1060 Remove event card 2018-10-21 09:53:05 +05:30
Suraj Shetty
fb263b2507 Add get_time fuction to datetime.js 2018-10-21 09:53:05 +05:30
Suraj Shetty
fcedced4bf Refactor
- Remove reply
- Add comment
- Remove pinned item sidebar
- Revamp post UI
2018-10-21 09:53:05 +05:30
Suraj Shetty
7e95b1b4d4 Remove redundant dailog code 2018-10-21 09:53:05 +05:30
Suraj Shetty
0f95d363bd Set lighter background for banner 2018-10-21 09:53:05 +05:30