mirror
/
soapbox
kopia lustrzana https://gitlab.com/soapbox-pub/soapbox
1
0
Forkuj 1
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność
1 039 Commity
213 Gałęzie
14 Tagi
78 MiB
Wykres commitów

1039 Commity (preload)

Autor SHA1 Wiadomość Data
Alex Gleason e58841ad21 Merge branch 'edit_profile_checkbox_toggle' into 'develop' 
Fixed features/edit_profile checkbox issues.  Fixes #261 and #284

Closes #284 and #261

See merge request soapbox-pub/soapbox-fe!123
 2020-08-10 20:24:43 +00:00
Mary Kate e6b5ef24eb list markdown hotfix 2020-08-10 15:20:09 -05:00
Mary Kate 5349045e51 Revert "only render emoji selector in the dom when needed" 
This reverts commit 769a512445.
 2020-08-10 15:06:39 -05:00
Mary Kate 42a7a61ce7 border radius fixes 2020-08-10 15:05:24 -05:00
Curtis bb5091a979 Merge branch 'develop' into 'edit_profile_checkbox_toggle' 
# Conflicts:
#   app/soapbox/features/edit_profile/index.js
 2020-08-10 19:08:29 +00:00
crockwave 40dbfbb5da Re-enabled attempt to use `bot` checkbox in profile_edit. Refactored shouldAppend method 2020-08-10 13:53:02 -05:00
Alex Gleason 84de5be8c9 Merge branch 'new_upload_icon' into 'develop' 
New upload icon, fixes #282

Closes #282

See merge request soapbox-pub/soapbox-fe!146
 2020-08-10 18:00:59 +00:00
Sean King 10d1010265 New upload icon 2020-08-10 11:49:38 -06:00
Mary Kate 6ac0c615fe fixes #278, large awaiting approval button 2020-08-10 12:23:59 -05:00
Mary Kate 5998f52e9f fix relationship not loading on hover card 2020-08-10 12:08:32 -05:00
Alex Gleason 3fc91c2c1d
Revert "Merge branch 'bullet_point_css' into 'develop'" 
This reverts commit bf3de8adc5, reversing
changes made to a892e3ce81.
 2020-08-10 10:48:41 -05:00
Alex Gleason 4fed326bd5 Merge branch 'poll_x' into 'develop' 
Fix poll X button, fixes #281

Closes #281

See merge request soapbox-pub/soapbox-fe!144
 2020-08-10 15:37:45 +00:00
Sean King 02a1bb47cf Fix poll X button 2020-08-10 09:25:57 -06:00
Alex Gleason bf3de8adc5 Merge branch 'bullet_point_css' into 'develop' 
Fix bullet point css issue, fixes #279

Closes #279

See merge request soapbox-pub/soapbox-fe!143
 2020-08-10 04:49:00 +00:00
Sean King f3893effbe Fix bullet point css issue 2020-08-09 22:27:55 -06:00
Curtis ea94b05608 Resolve merge conflicts 
Merge branch 'develop' into 'admin_cfg'

# Conflicts:
#   app/soapbox/features/compose/components/action_bar.js
#   app/soapbox/features/edit_profile/index.js
 2020-08-09 23:02:48 +00:00
Alex Gleason a892e3ce81 Merge branch 'toggle_css' into 'develop' 
Fix toggle CSS, fixes #277

Closes #277

See merge request soapbox-pub/soapbox-fe!141
 2020-08-09 21:35:05 +00:00
Sean King c91ca7edd6 Fix toggle CSS 2020-08-09 15:23:27 -06:00
Alex Gleason b30dc39f1a
Bio fixes 2020-08-09 15:13:36 -05:00
Alex Gleason 695a78503d
Verified ['pleroma', 'tags'] fix 2020-08-09 14:55:32 -05:00
Alex Gleason d9579831e0
Merge remote-tracking branch 'origin/multi_line_bio' into develop 2020-08-09 14:45:31 -05:00
Alex Gleason 504e36c7d8
Fix linter 2020-08-09 14:44:56 -05:00
Alex Gleason e97b9d2168
Update columns layout for all pages 2020-08-09 14:37:02 -05:00
Alex Gleason 6f6f91e2f4
Verified className fix 2020-08-09 14:32:22 -05:00
Alex Gleason 2fff5db5d5
Handle `max_fields` fallback differently 2020-08-09 14:01:16 -05:00
Sean King 9c505d0d84 Fix for Pleroma 2.1 and older versions regarding profile metadata 2020-08-09 10:55:39 -06:00
Curtis ROck 72a4a38fec Refactoring to use soapbox object as state. Still buggy 2020-08-09 11:03:24 -05:00
Alex Gleason 715779653c
Rearrange home sidebars 2020-08-09 00:29:28 -05:00
Alex Gleason 3135a2a5ec Merge branch 'fields-limit' into 'develop' 
Reintroduce fields limit changes

See merge request soapbox-pub/soapbox-fe!137
 2020-08-09 02:01:32 +00:00
Alex Gleason 09bd8f28d1 Merge branch 'patch-4' into 'fields-limit' 
Fix for fields_limit

See merge request soapbox-pub/soapbox-fe!138
 2020-08-09 01:51:16 +00:00
Sean King 95fb1b7900 Update index.js 2020-08-09 01:40:35 +00:00
Alex Gleason 9a2fba1ef5
Revert "Revert "Store fieldsLimits in instance/pleroma/metadata of the Redux store. Render fields to maxFields value in features/edit_profile, using maxFields value"" 
This reverts commit b3a6c395df.
 2020-08-08 20:32:39 -05:00
Alex Gleason b3a6c395df
Revert "Store fieldsLimits in instance/pleroma/metadata of the Redux store. Render fields to maxFields value in features/edit_profile, using maxFields value" 
This reverts commit 3d24cfaf53.
 2020-08-08 18:34:35 -05:00
Alex Gleason 6ecf1a3ace Merge branch 'local-timeline-filters' into 'develop' 
Timeline filtering improvements

Closes #254

See merge request soapbox-pub/soapbox-fe!136
 2020-08-08 02:32:47 +00:00
Mary Kate ae608388a0 add DM filter option for Home timeline, fixes #254 2020-08-07 20:47:04 -05:00
Mary Kate e116745e83 timeline filtering improvements 2020-08-07 19:28:30 -05:00
Alex Gleason 4ee0fa8160 Merge branch 'user-verification' into 'develop' 
Display user verification icon

See merge request soapbox-pub/soapbox-fe!128
 2020-08-07 23:23:11 +00:00
Mary Kate 7931a9a89d code review 2020-08-07 18:10:13 -05:00
Mary Kate edb15ce150 Merge branch 'user-verification' of gitlab.com:soapbox-pub/soapbox-fe into user-verification 2020-08-07 17:01:41 -05:00
Mary Kate e9d76b6287 Update chained get requests 2020-08-07 17:01:15 -05:00
Alex Gleason 9819f1aa73 Merge branch 'timeline-word-filters' into 'develop' 
Timeline word filters

Closes #14

See merge request soapbox-pub/soapbox-fe!126
 2020-08-07 21:09:52 +00:00
Curtis 36e634b0aa Resolved merge conflicts 
Merge branch 'develop' into 'timeline-word-filters'

# Conflicts:
#   app/soapbox/components/sidebar_menu.js
#   app/styles/application.scss
 2020-08-07 20:46:44 +00:00
Alex Gleason 92f43566e0 Merge branch 'mfa' into 'develop' 
Multi-Factor Auth with OTP

See merge request soapbox-pub/soapbox-fe!124
 2020-08-07 20:17:13 +00:00
marykatefain 68f765da28 Multi-Factor Auth with OTP 2020-08-07 20:17:13 +00:00
Alex Gleason 2b5c0a95d2 Merge branch 'all_sound_toggle' into 'develop' 
Toggle for all notification sounds, fixes #260

Closes #260

See merge request soapbox-pub/soapbox-fe!134
 2020-08-07 20:06:38 +00:00
Alex Gleason 6bd8c0733a Merge branch 'admin_new_tab' into 'develop' 
Added Admin settings opening in new tab. Fixes #272

Closes #272

See merge request soapbox-pub/soapbox-fe!135
 2020-08-07 20:04:05 +00:00
crockwave a5b69e77a3 Added Admin settings opening in new tab 2020-08-07 12:58:59 -05:00
Sean King 56bac95ad4 Toggle for all notification sounds 2020-08-06 11:54:58 -06:00
crockwave 6e782ca3a0 Modified Profile bio to use textarea, preserving newlines and HTML rendered 2020-08-05 19:08:38 -05:00
Alex Gleason f07de93ee3 Merge branch 'emoji-rendering-hotfix' into 'develop' 
Only render emoji selector in the dom when needed

See merge request soapbox-pub/soapbox-fe!131
 2020-08-05 21:04:41 +00:00