jasper 92874b6902 Fxing conflicts		2019-02-08 13:13:11 -08:00
..
assets	Use an existing image served by backend instead	2019-02-03 13:30:54 -05:00
boot	Fxing conflicts	2019-02-08 13:13:11 -08:00
components	Fxing conflicts	2019-02-08 13:13:11 -08:00
i18n	Merge branch 'add-admin-and-moderator-fields-to-user-card-view' into 'develop'	2019-02-07 22:45:08 +00:00
lib	improve web push notifications	2018-12-25 20:43:18 +07:00
modules	Fxing conflicts	2019-02-08 13:13:11 -08:00
services	#291 - enable media/favorite tabs with prefetched data	2019-02-08 09:56:45 -05:00
_variables.scss	Make role badge visible only on user profile page	2019-02-06 18:07:37 +03:00
App.js	Fix showFeaturesPanel option as instance	2019-02-08 12:17:14 -08:00
App.scss	move login hint into the main content	2019-02-06 05:01:32 -05:00
App.vue	remove unnecessary div	2019-02-06 11:53:51 -05:00
main.js	Add media viewer module and media module component, modify attachment behavior	2019-01-14 19:23:13 +02:00
sw.js	add checkbox to disable web push	2018-12-13 00:03:50 +07:00