kaniini
|
eb93034a40
|
Merge branch 'simplify-sensitivity-label' into 'develop'
Simplified image sensitivity label
See merge request pleroma/pleroma-fe!334
|
2018-09-09 11:55:49 +00:00 |
|
kaniini
|
3f72b611c1
|
Merge branch 'prime-number-step-for-who-to-follow-panel' into 'develop'
Prime number step for Who to follow panel
See merge request pleroma/pleroma-fe!340
|
2018-09-09 11:55:25 +00:00 |
|
Hakaba Hitoyo
|
3a17252929
|
use prime number step for Who to follow panel
|
2018-09-09 14:34:51 +09:00 |
|
Henry
|
2eab0cb115
|
Merge branch 'feature/features-panel' into 'develop'
Features panel
See merge request pleroma/pleroma-fe!331
|
2018-09-07 16:37:24 +00:00 |
|
Henry
|
385484566a
|
Revert "Update messages.js"
This reverts commit 5e1f0d9416
|
2018-09-07 16:22:59 +00:00 |
|
Artik Banana
|
5e1f0d9416
|
Update messages.js
Update the Occitan language - Fixed Linting
|
2018-09-07 16:18:01 +00:00 |
|
hakabahitoyo
|
8b94ea28ec
|
remove formatting options
|
2018-09-04 14:50:02 +09:00 |
|
Hakaba Hitoyo
|
49ab19c342
|
features panel i18n
|
2018-09-04 10:59:02 +09:00 |
|
Hakaba Hitoyo
|
65115bfc7f
|
features panes supports chat & gopher
|
2018-09-04 10:44:25 +09:00 |
|
Henry
|
c348a3ec11
|
Merge branch 'patch-1' into 'develop'
Fix friends query
See merge request pleroma/pleroma-fe!332
|
2018-09-03 20:07:11 +00:00 |
|
Henry Jameson
|
36101abc22
|
Simplified image sensitivity label
|
2018-09-03 18:52:07 +03:00 |
|
Dingdreher
|
900aaefb98
|
Update users.js
|
2018-09-03 12:01:05 +00:00 |
|
hakabahitoyo
|
fa477dd41f
|
show features panel only if not login
|
2018-09-03 16:02:06 +09:00 |
|
hakabahitoyo
|
38b683b30c
|
update
|
2018-09-03 15:57:22 +09:00 |
|
Hakaba Hitoyo
|
a99869146f
|
debug
|
2018-09-03 15:24:49 +09:00 |
|
Hakaba Hitoyo
|
049e2397b1
|
update
|
2018-09-03 15:23:09 +09:00 |
|
hakabahitoyo
|
07ef43c7b5
|
debug
|
2018-09-03 14:55:40 +09:00 |
|
Hakaba Hitoyo
|
52fe01e4d8
|
mock features panel
|
2018-09-03 14:43:10 +09:00 |
|
Shpuld Shpludson
|
20b0ffc0b9
|
Merge branch 'imvomitingasicodethisshit' into 'develop'
Made showing format selection optional and default to false
See merge request pleroma/pleroma-fe!329
|
2018-09-01 05:57:58 +00:00 |
|
Shpuld Shpludson
|
a8ae2a5b11
|
Merge branch 'fix/put-sense-into-rich-text-styles' into 'develop'
Add styles for h1/2/3/4/5 tags in status html for rich text
See merge request pleroma/pleroma-fe!328
|
2018-09-01 05:54:47 +00:00 |
|
Henry Jameson
|
d6240c25cf
|
small fix
|
2018-08-31 17:24:46 +03:00 |
|
Henry Jameson
|
17f30190e0
|
Made showing format selection optional and default to false
|
2018-08-31 17:00:41 +03:00 |
|
shpuld
|
77e8933b2e
|
Fix mistakes
|
2018-08-31 16:13:43 +03:00 |
|
shpuld
|
384c80e238
|
Change styles a bit, make pre-formatted blocks not overflow but scroll
|
2018-08-31 16:04:52 +03:00 |
|
shpuld
|
f07e6b271c
|
Add styles for h1/2/3/4/5 tags in status html
|
2018-08-31 15:11:27 +03:00 |
|
kaniini
|
33b13d3775
|
Merge branch 'fixup/post-status-styling' into 'develop'
post status form: styling fixes for content-type selector, align icons with selector
See merge request pleroma/pleroma-fe!327
|
2018-08-31 04:24:53 +00:00 |
|
William Pitcock
|
f9bfe2ea37
|
post status form: styling fixes for content-type selector, align icons with selector
|
2018-08-31 04:23:06 +00:00 |
|
kaniini
|
958acbab8d
|
Merge branch 'polish' into 'develop'
Another one of those MR that fixes many many small-to-medium things
Closes #92, #75, #122, #52, #72, and #87
See merge request pleroma/pleroma-fe!324
|
2018-08-31 04:10:17 +00:00 |
|
kaniini
|
48391a45ba
|
Merge branch 'bugfix/fetch-friends-id' into 'develop'
Pass user id to fetchFriends
See merge request pleroma/pleroma-fe!326
|
2018-08-31 04:09:33 +00:00 |
|
meireikei
|
2e37e8cf39
|
Pass user id to fetchFriends
It looks like the API that fetchFriends expects was changed, to require
an ID.
|
2018-08-31 04:07:25 +00:00 |
|
kaniini
|
e71b0411aa
|
Merge branch 'post-button-labels' into 'develop'
Add labels to post buttons
See merge request pleroma/pleroma-fe!323
|
2018-08-31 04:04:44 +00:00 |
|
kaniini
|
84aa1ecdcd
|
Merge branch 'feature/rich-text' into 'develop'
initial rich text authoring support
See merge request pleroma/pleroma-fe!325
|
2018-08-31 03:54:37 +00:00 |
|
William Pitcock
|
cabcb5c81b
|
i18n: make "plain text" translatable
|
2018-08-31 03:42:12 +00:00 |
|
William Pitcock
|
9a43ba73e6
|
add the ability to select a post's content type
|
2018-08-31 03:42:11 +00:00 |
|
Henry Jameson
|
8c07e63f77
|
fix
|
2018-08-31 04:39:07 +03:00 |
|
Henry Jameson
|
46d8b55d44
|
Merge remote-tracking branch 'upstream/develop' into polish
* upstream/develop:
i18n: make "plain text" translatable
add the ability to select a post's content type
|
2018-08-31 04:20:40 +03:00 |
|
Henry Jameson
|
e99534ef71
|
added option for logo in navbar to follow color scheme of the rest of the site
also fixed potential mess-up between api/static configs
|
2018-08-31 04:06:00 +03:00 |
|
William Pitcock
|
20a67e6809
|
i18n: make "plain text" translatable
|
2018-08-31 00:44:25 +00:00 |
|
William Pitcock
|
38e3c2493d
|
add the ability to select a post's content type
|
2018-08-31 00:42:42 +00:00 |
|
Henry Jameson
|
63fdad8703
|
fix
|
2018-08-30 22:59:52 +03:00 |
|
Henry Jameson
|
1461a52ade
|
vodka translations
|
2018-08-30 20:45:50 +03:00 |
|
Henry Jameson
|
065d1c7f49
|
fix
|
2018-08-30 20:16:36 +03:00 |
|
Henry Jameson
|
3b9cb1384a
|
fix
|
2018-08-30 19:53:13 +03:00 |
|
Henry Jameson
|
fa4c4c9122
|
fixed #87
|
2018-08-30 18:23:43 +03:00 |
|
Henry Jameson
|
fa1116249d
|
fixup! panel styling cleanup
|
2018-08-30 17:13:54 +03:00 |
|
Henry Jameson
|
42584b1a34
|
fixup! fixup! Added logic to process reply to favorite request and update likes counter accordingly. Should fix some of cases of doubled likes and likes counter not decrementing.
|
2018-08-30 16:52:38 +03:00 |
|
Henry Jameson
|
4589466917
|
fixup! Added logic to process reply to favorite request and update likes counter accordingly. Should fix some of cases of doubled likes and likes counter not decrementing.
|
2018-08-30 16:34:24 +03:00 |
|
Henry Jameson
|
507d5bc444
|
fixup! Added logic to process reply to favorite request and update likes counter accordingly. Should fix some of cases of doubled likes and likes counter not decrementing.
|
2018-08-30 16:27:35 +03:00 |
|
Henry Jameson
|
1246463f96
|
fixes broken nsfw hider in notifications
|
2018-08-30 16:21:10 +03:00 |
|
Henry Jameson
|
fb7f65481e
|
restored "progress" cursor indicator for loading nsfw images
|
2018-08-30 16:11:31 +03:00 |
|