chris
/
pixelfed
forked from mirror/pixelfed
1
0
Fork 0
Code Pull Requests Activity
6,757 Commits 5 Branches 33 Tags 122 MiB
Commit Graph

6757 Commits

Author SHA1 Message Date
Stasiek Michalski 8fde4618f2
Fix typo 2018-06-02 20:27:16 +02:00
Stasiek Michalski cd55dcac6b
Delete .htaccess 2018-06-02 20:13:41 +02:00
hellcp 76f23cb208 Introduce opengraph tags to the service 2018-06-02 20:11:08 +02:00
voss 4c48a942d7 fixed typo and made changes based on feedback from @zatnosk. 2018-06-02 17:46:12 +01:00
Whaxion 455d95f6c4 Merge remote-tracking branch 'upstream/dev' into dev 2018-06-02 13:42:35 +02:00
Stasiek Michalski 2bdd21105b
Update welcome.blade.php 2018-06-02 10:20:46 +02:00
Derek Schmidt 41683db2b4
Ignore hashtags that begin with a ampersand 
Fixes #131

This is usually a marker of an HTML entity code.
It is possible for a user to do this on purpose,
but not horribly likely.

i hope
 2018-06-02 00:06:55 -07:00
Stasiek Michalski da417a5545
Remove useless padding from footer 2018-06-02 07:27:55 +02:00
Stasiek Michalski ddbf0adb67
Add CSS to keep footer always at the bottom 2018-06-02 07:26:24 +02:00
Stasiek Michalski 840ea0b41b
Update app.blade.php 2018-06-02 07:22:20 +02:00
daniel 582d521ee5
Merge pull request #134 from hellcp/patch-2 
Improve look of user profile
 2018-06-01 23:03:13 -06:00
Stasiek Michalski 2d008ea2ee
Replicate improvements from show 2018-06-02 06:33:15 +02:00
Stasiek Michalski 1b12cc2295
Replicate improvements from show 2018-06-02 06:32:19 +02:00
Stasiek Michalski 2c190ba934
Use new classes from stylesheet 2018-06-02 06:25:12 +02:00
Stasiek Michalski 3550c0b94c
Add lower weight option 2018-06-02 06:22:43 +02:00
Stasiek Michalski b240ae3b44
Add css for changes in user's profile 2018-06-02 06:14:49 +02:00
Daniel Supernault ae6a59e782 Update profile views 
Closes #84
 2018-06-01 21:00:03 -06:00
Daniel Supernault 93129fe39f Update AppServiceProvider 
Closes #107
 2018-06-01 17:39:45 -06:00
daniel 586329b6d9
Merge pull request #126 from imbsky/ja-translation 
Japanese translation 🇯🇵
 2018-06-01 17:03:42 -06:00
daniel dcd6edb154
Merge pull request #114 from m4sk1n/settings-bio-fix 
Fix “Can't update account settings without setting a bio”
 2018-06-01 16:59:56 -06:00
daniel 04cf434aec
Merge pull request #109 from xmgz/dev 
galician (gl), translating pixelfed beta
 2018-06-01 16:54:30 -06:00
daniel 619d51060f
Merge pull request #108 from m4sk1n/discover-fix 
Do not recommend myself
 2018-06-01 16:46:30 -06:00
daniel 136d39e32e
Merge pull request #105 from m4sk1n/follow-in-lists 
Follow/Unfollow button in followers/ing lists
 2018-06-01 16:45:17 -06:00
daniel bf6a014bdb
Merge pull request #104 from iah/patch-1 
Update auth.php
 2018-06-01 16:44:26 -06:00
daniel ee22d9d98c
Merge pull request #103 from moshpirit/patch-4 
Update notification.php
 2018-06-01 16:43:45 -06:00
daniel 3626cdcf93
Merge pull request #102 from moshpirit/patch-3 
Update profile.php
 2018-06-01 16:43:01 -06:00
daniel 8cd153a629
Merge pull request #101 from moshpirit/patch-2 
Token→"token" and one forgotten word to translate
 2018-06-01 16:41:55 -06:00
daniel b00154a85d
Merge pull request #100 from moshpirit/patch-1 
Create timeline.php
 2018-06-01 16:41:21 -06:00
daniel f8ac51a686
Merge pull request #99 from Swedneck/dev 
updated swedish translation
 2018-06-01 16:40:44 -06:00
daniel 2d0442b420
Merge pull request #95 from m4sk1n/follow-button 
Do not show “Follow” button in notifications if already followed
 2018-06-01 16:37:08 -06:00
daniel 7c4a383a65
Merge pull request #93 from neilalexander/patch-2 
Use inRandomOrder instead of orderByRaw in Discover page
 2018-06-01 16:34:46 -06:00
daniel 082e348a81
Merge pull request #91 from m4sk1n/dev 
🌍: 🇵🇱⬆️
 2018-06-01 16:31:05 -06:00
daniel f424adfe83
Merge pull request #83 from Zatnosk/add-accept-attribute 
Add accept attribute
 2018-06-01 16:29:30 -06:00
Daniel Supernault c07cf12a9d Update compiled assets 
Related to #66
 2018-06-01 16:28:12 -06:00
daniel a28f6f60bc
Merge pull request #66 from hellcp/patch-1 
Always center content without leaking in card
 2018-06-01 16:26:24 -06:00
daniel b36651417c
Merge pull request #52 from j1t/dev 
Hebrew Translatin (cont)
 2018-06-01 16:24:47 -06:00
daniel a3f7ecfb80
Merge pull request #39 from Nouutilizaire/dev 
i18n Completes Occitan translation
 2018-06-01 16:22:18 -06:00
daniel 569a00cd92
Merge pull request #120 from dansup/kpcyrd-patch-1 
Use route() for settings link
 2018-06-01 16:21:24 -06:00
Whaxion 20a29acacf Take username on user and not on profile 2018-06-01 23:12:53 +02:00
Daniel Supernault 91a6f8eba5 Add post delete method 2018-06-01 15:04:33 -06:00
bsky 69ce309191 Add ja translation of validation.php 2018-06-02 05:42:05 +09:00
Daniel Supernault fa7d1fef2f Update RestrictedNames so users can't register a username that conflicts with routes 2018-06-01 13:57:31 -06:00
Whaxion 9f0120443e Change id to username in users list 2018-06-01 21:42:30 +02:00
bsky ae4a9753ec Add ja translation of timeline.php 2018-06-02 04:35:56 +09:00
bsky 26a1ffaeed Add ja translation of profile.php 2018-06-02 04:35:01 +09:00
kpcyrd 38e45d3890
Use route() for settings link 2018-06-01 21:34:21 +02:00
bsky b961ed1ada Add ja translation of passwords.php 2018-06-02 04:28:37 +09:00
bsky 43f4024caa Add ja translation of pagination.php 2018-06-02 04:14:55 +09:00
Marcin Mikołajczak 13c0e33490 Fix “Can't update account settings without setting a bio” 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2018-06-01 21:13:29 +02:00
bsky 3c5b662650 Add ja translation of notification.php 2018-06-02 04:09:13 +09:00