matty/ncd-fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
36e634b0aae328829f7259bc2c4a95c98d2c8146
ncd-fe/app/soapbox
History
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
..
__fixtures__
add reason field on registration when by approval mode is on
2020-07-28 21:43:27 -05:00
__mocks__
Tests: Clear API mocks between each test
2020-06-09 17:16:22 -05:00
actions
Resolved merge conflicts
2020-08-07 20:46:44 +00:00
components
Resolved merge conflicts
2020-08-07 20:46:44 +00:00
containers
Merge branch 'profile-hover-cards' into 'develop'
2020-08-03 02:27:14 +00:00
features
Resolved merge conflicts
2020-08-07 20:46:44 +00:00
locales
Deactivate --> Delete
2020-07-20 15:23:38 -05:00
middleware
gabsocial --> soapbox paths
2020-05-28 17:56:55 -05:00
pages
Show profile preview on hover
2020-07-28 14:15:57 -05:00
reducers
Store fieldsLimits in instance/pleroma/metadata of the Redux store. Render fields to maxFields value in features/edit_profile, using maxFields value
2020-08-04 18:05:16 -05:00
selectors
Show donor badge
2020-07-04 21:25:43 -05:00
service_worker
gabsocial --> soapbox paths
2020-05-28 17:56:55 -05:00
storage
gabsocial --> soapbox paths
2020-05-28 17:56:55 -05:00
store
gabsocial --> soapbox paths
2020-05-28 17:56:55 -05:00
utils
Fix RGB->HSL precision issues
2020-06-12 10:48:04 -05:00
api.js
Tests: Start mocking API for action tests
2020-06-09 16:47:41 -05:00
base_polyfills.js
gabsocial --> soapbox paths
2020-05-28 17:56:55 -05:00
common.js
Switch to Fork Awesome
2020-06-26 22:24:23 -06:00
compare_id.js
gabsocial --> soapbox paths
2020-05-28 17:56:55 -05:00
extra_polyfills.js
gabsocial --> soapbox paths
2020-05-28 17:56:55 -05:00
initial_state.js
gabsocial --> soapbox paths
2020-05-28 17:56:55 -05:00
is_mobile.js
gabsocial --> soapbox paths
2020-05-28 17:56:55 -05:00
load_polyfills.js
gabsocial --> soapbox paths
2020-05-28 17:56:55 -05:00
main.js
gabsocial --> soapbox paths
2020-05-28 17:56:55 -05:00
performance.js
gabsocial --> soapbox paths
2020-05-28 17:56:55 -05:00
ready.js
gabsocial --> soapbox paths
2020-05-28 17:56:55 -05:00
rtl.js
gabsocial --> soapbox paths
2020-05-28 17:56:55 -05:00
settings.js
gabsocial --> soapbox paths
2020-05-28 17:56:55 -05:00
stream.js
gabsocial --> soapbox paths
2020-05-28 17:56:55 -05:00
test_helpers.js
Test: Refactor createComponent() helper
2020-06-09 22:26:05 -05:00
test_setup.js
Test: Start creating component snapshots
2020-06-09 21:29:50 -05:00
uuid.js
gabsocial --> soapbox paths
2020-05-28 17:56:55 -05:00