hj/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
2278 commits 4 branches 0 tags 44 MiB
Commit graph

2278 commits

This branch
This branch
All branches
Author SHA1 Message Date
Henry Jameson
f4e8b781a9 Merge remote-tracking branch 'upstream/develop' into shigusegubu 
* upstream/develop: (51 commits)
  fix convos
  resolve focus issue in the auto-complete for name field
  resolve issue related to event handler
  resolve issue in prop binding
  this fixes #350 - v-model binding issue
  #341 - fix naming
  #341 - automatic scroll with repeats/reports
  345 - fix long username issue in repeat status
  Update spanish translate - es.json
  Fix return
  Fix clicking link - open new tab unless tag or mention
  Fix max-width of profile banner in setting
  Fix unit test
  Typo
  #332 - add follow/not follow button to follow list
  Add quick css fix for user profile bg img preview
  Switch into Lodash
  Switch into Lodash
  Change the async stuff to not render app before theme is loaded
  fixing conflicts
  ...
 2019-02-14 20:17:22 +02:00
Shpuld Shpludson
295becd6c8 Merge branch 'hotfix/issues-in-autocomplete' into 'develop' 
#355 hotfix/issues in autocomplete

Closes #355

See merge request pleroma/pleroma-fe!574
 2019-02-14 14:50:58 +00:00
Shpuld Shpludson
40b51b659e Merge branch 'fix-convos' into 'develop' 
fix convos

Closes #357

See merge request pleroma/pleroma-fe!575
 2019-02-14 14:20:03 +00:00
Henry Jameson
688906a61e fix convos 2019-02-14 00:11:11 +02:00
Xiaofeng An
19dd36945a resolve focus issue in the auto-complete for name field 2019-02-13 15:39:37 -05:00
Xiaofeng An
98c27fd812 resolve issue related to event handler 2019-02-13 07:38:53 -05:00
Xiaofeng An
2100cb247d resolve issue in prop binding 2019-02-13 07:38:13 -05:00
Shpuld Shpludson
d6f9f34ad8 Merge branch 'fix/no-autocomplete-in-non-post-forms' into 'develop' 
hotfix/this fixes #350 - v-model binding issue

Closes #350

See merge request pleroma/pleroma-fe!573
 2019-02-13 04:48:05 +00:00
Xiaofeng An
64fab9d7bc this fixes #350 - v-model binding issue 2019-02-12 13:55:00 -05:00
Shpuld Shpludson
26954cb3dd Merge branch 'issue-341-repeat-auto-scroll' into 'develop' 
#341 - automatic scroll with repeats/reports

See merge request pleroma/pleroma-fe!568
 2019-02-12 16:06:23 +00:00
dave
25bb80a982 #341 - fix naming 2019-02-12 10:35:54 -05:00
Shpuld Shpludson
6f4fbcffc0 Merge branch 'patch-2' into 'develop' 
Update spanish translate - es.json

See merge request pleroma/pleroma-fe!564
 2019-02-12 15:25:52 +00:00
Shpuld Shpludson
6d8862dc9a Merge branch '300-fixed-background-issue' into 'develop' 
Fix fixed background issue

Closes #300

See merge request pleroma/pleroma-fe!518
 2019-02-12 15:25:18 +00:00
Shpuld Shpludson
25cfb04873 Merge branch 'fix/profile-banner-preview-width' into 'develop' 
#333 Fix max-width of profile banner in setting

See merge request pleroma/pleroma-fe!560
 2019-02-12 15:05:26 +00:00
Shpuld Shpludson
2bc1cc9ff9 Merge branch 'fix/no-autocomplete-in-non-post-forms' into 'develop' 
#255 - implement autocomplete in non post forms

See merge request pleroma/pleroma-fe!551
 2019-02-12 14:55:18 +00:00
Shpuld Shpludson
8cce505cf5 Merge branch '345-long-username' into 'develop' 
345 - fix long username issue in repeat status

Closes #345

See merge request pleroma/pleroma-fe!567
 2019-02-12 14:45:54 +00:00
dave
493d542d92 #341 - automatic scroll with repeats/reports 2019-02-12 05:10:27 -05:00
jared
4d930c7c26 345 - fix long username issue in repeat status 2019-02-11 23:03:51 -05:00
tarteka
2226f80076 Update spanish translate - es.json 2019-02-11 18:29:56 +00:00
Shpuld Shpludson
8efe30c2dc Merge branch 'hotfix/open-link' into 'develop' 
Fix clicking link - open new tab unless tag or mention

See merge request pleroma/pleroma-fe!562
 2019-02-11 15:01:15 +00:00
Edijs
f3d2e41a9b Fix return 2019-02-11 07:45:22 -07:00
Edijs
9959c311a9 Fix clicking link - open new tab unless tag or mention 2019-02-11 07:38:12 -07:00
Shpuld Shpludson
b6bac4d06d Merge branch 'fix/profile-not-loading-without-persisted-state' into 'develop' 
Fix #324 Profiles sometimes not loading when there's no persisted state

Closes #324

See merge request pleroma/pleroma-fe!553
 2019-02-11 13:34:03 +00:00
Shpuld Shpludson
0e6134b32e Merge branch 'issue-332-update-follow-tabs' into 'develop' 
#332 - add follow/not follow button to follow list

See merge request pleroma/pleroma-fe!558
 2019-02-11 13:29:58 +00:00
jasper
db465ff839 Fix max-width of profile banner in setting 2019-02-11 00:06:37 -08:00
Shpuld Shpludson
e1e9e50b98 Merge branch 'fix/hashtag-opening' into 'develop' 
Open hashtag in same tab

See merge request pleroma/pleroma-fe!540
 2019-02-11 04:19:17 +00:00
Edijs
be77707381 Fix unit test 2019-02-10 19:32:01 -07:00
Edijs
7addd408a9 Typo 2019-02-10 12:06:13 -07:00
Edijs
fc26f1852e Merge branch 'develop' into fix/hashtag-opening 2019-02-10 11:59:19 -07:00
dave
4b18989fef #332 - add follow/not follow button to follow list 2019-02-09 23:05:23 -05:00
Shpuld Shpludson
4bea3c525f Merge branch 'fix/subject-copying-composition-bug' into 'develop' 
#326 Subject copying composition bug

See merge request pleroma/pleroma-fe!550
 2019-02-09 20:47:29 +00:00
Shpuld Shpludson
cf10fd623b Merge branch 'fix-user-profile-background-setting-preview' into 'develop' 
Add quick css fix for user profile bg img preview

See merge request pleroma/pleroma-fe!554
 2019-02-09 20:42:51 +00:00
jo
7743e3b277 Add quick css fix for user profile bg img preview 2019-02-09 20:42:51 +00:00
jasper
0a43546564 Switch into Lodash 2019-02-09 04:18:52 -08:00
jasper
f75ec48a80 Switch into Lodash 2019-02-09 04:13:52 -08:00
shpuld
3fb531976a Change the async stuff to not render app before theme is loaded 2019-02-09 11:26:35 +02:00
Shpuld Shpludson
d2d06983c9 Merge branch 'patch-2' into 'develop' 
Update spanish translate

See merge request pleroma/pleroma-fe!549
 2019-02-09 07:06:40 +00:00
Shpuld Shpludson
5296d41372 Merge branch 'fix/js-error-in-tag-page' into 'develop' 
Fixed JS error in tag page

See merge request pleroma/pleroma-fe!543
 2019-02-09 06:56:46 +00:00
Shpuld Shpludson
531f150dd3 Merge branch 'fix/add-option-to-hide-filtered-statues' into 'develop' 
#254 Add option to hide filtered statuses

See merge request pleroma/pleroma-fe!539
 2019-02-09 06:47:29 +00:00
feld
9768558e7c Merge branch 'fix/show-features-panel-not-working' into 'develop' 
#322 Fix showFeaturesPanel option as instance

See merge request pleroma/pleroma-fe!552
 2019-02-08 21:27:58 +00:00
jasper
5b52e020e3 fixing conflicts 2019-02-08 13:20:47 -08:00
jasper
ced29a6482 fixing conflicts 2019-02-08 13:18:50 -08:00
jasper
92874b6902 Fxing conflicts 2019-02-08 13:13:11 -08:00
jasper
70c05a0c08 Fix showFeaturesPanel option as instance 2019-02-08 12:17:14 -08:00
Xiaofeng An
9f83aee1ed fix auto-complete field not taking the whole parent width in flex 2019-02-08 11:54:12 -05:00
Xiaofeng An
59cde429b9 fix naming 2019-02-08 11:40:54 -05:00
Xiaofeng An
63680227c1 select either textarea or input 2019-02-08 11:26:17 -05:00
jasper
e90e7ce2db Subject copying composition bug 2019-02-08 08:25:53 -08:00
Xiaofeng An
e8dc019afd remove rows attribute from input 2019-02-08 11:13:35 -05:00
Xiaofeng An
dd8531f9c9 move styles for AutoCompleteInput 2019-02-08 11:13:35 -05:00