matty/ncd-fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
ea94b0560840efccfc75f6f56c6fb8bab560a4c4
ncd-fe/app/soapbox
History
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
..
__fixtures__
Resolve merge conflicts
2020-08-09 23:02:48 +00:00
__mocks__
Tests: Clear API mocks between each test
2020-06-09 17:16:22 -05:00
actions
Resolve merge conflicts
2020-08-09 23:02:48 +00:00
components
Resolve merge conflicts
2020-08-09 23:02:48 +00:00
containers
Merge branch 'profile-hover-cards' into 'develop'
2020-08-03 02:27:14 +00:00
features
Resolve merge conflicts
2020-08-09 23:02:48 +00:00
locales
updated translations
2020-08-02 22:07:35 -05:00
middleware
gabsocial --> soapbox paths
2020-05-28 17:56:55 -05:00
pages
Rearrange home sidebars
2020-08-09 00:29:28 -05:00
reducers
Resolve merge conflicts
2020-08-09 23:02:48 +00: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