Commit graph

311 commits

Author SHA1 Message Date
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
Daniel Supernault
91a6f8eba5 Add post delete method 2018-06-01 15:04:33 -06: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
kpcyrd
38e45d3890
Use route() for settings link 2018-06-01 21:34:21 +02:00
Daniel Supernault
1b794c8508 Update StatusPipeline 2018-06-01 12:33:44 -06:00
Daniel Supernault
92939ed867 Add recaptcha to login/register form 2018-06-01 11:58:43 -06:00
Marcin Mikołajczak
8107f64eec Follow/Unfollow button in followers/ing lists
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-06-01 17:59:53 +02:00
Marcin Mikołajczak
9511988ddd Follow/Unfollow button in followers/ing lists
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-06-01 17:49:45 +02:00
moshpirit
c083fa7c9f
Update notification.php 2018-06-01 17:32:44 +02:00
moshpirit
ac4d325325
Update profile.php
Lacked some lines
2018-06-01 17:27:19 +02:00
moshpirit
ab10da0350
Token→"token" and one forgotten word to translate
password wasn't translated and token is not a Spanish word, so it should go between quotation marks
2018-06-01 17:22:10 +02:00
moshpirit
464cd3f888
Create timeline.php 2018-06-01 17:17:50 +02:00
Tim Stahel
31802c942d updated swedish translation 2018-06-01 16:47:11 +02:00
Marcin Mikołajczak
d49a054c38 Do not show “Follow” in notifications if already followed
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-06-01 16:12:10 +02:00
Isak Alexander
a8811e44ec
Update auth.php
Fixed a typo.
2018-06-01 13:47:20 +02:00
Neil Alexander
efbb1017e7
Also fix orderByRaw in SeedFollows 2018-06-01 12:23:52 +01:00
Neil Alexander
11447c13da
Use inRandomOrder instead of orderByRaw in Discover page 2018-06-01 12:13:32 +01:00
Marcin Mikołajczak
fc1dc62576 🌍: 🇵🇱⬆️
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-06-01 10:44:18 +02:00
Jonas
6a87f9d0e2
Update public.blade.php 2018-06-01 09:48:32 +02:00
Jonas
1273a5bb53
Update personal.blade.php 2018-06-01 09:47:34 +02:00
Daniel Supernault
9fbc5d0902 Update complied assets
Closes #78
2018-06-01 01:41:44 -06:00
daniel
92ba5acd8e
Merge pull request #78 from DeadSuperHero/cardtopfix
Prevent card from stretching on profile page
2018-06-01 01:40:10 -06:00
deadsuperhero
3ead4b42b2 adjust to just the class 2018-06-01 00:17:14 -07:00
deadsuperhero
336439b331 prevent card from stretching 2018-06-01 00:12:13 -07:00
Stasiek Michalski
0a619bac8f
Always center content without leaking in card 2018-06-01 08:42:10 +02:00
Daniel Supernault
d2ed666321 Update discover page
Closes #48
2018-06-01 00:06:08 -06:00
j1t
112ca537e6
Update profile.php 2018-06-01 06:03:12 +00:00
j1t
57edcfac80
Create timeline.php 2018-06-01 05:59:07 +00:00
Daniel Supernault
1d3482a6e8 Update compiled assets 2018-05-31 23:38:33 -06:00
Daniel Supernault
8498779430 Fix avatar bug 2018-05-31 22:07:29 -06:00
Daniel Supernault
82f3c50766 Add debugbar config 2018-05-31 21:37:52 -06:00
Daniel Supernault
b9c02e5b68 Update horizon config 2018-05-31 21:35:32 -06:00
Daniel Supernault
1ba6f5715c Update web.php 2018-05-31 21:35:22 -06:00
Daniel Supernault
51aa17052f Update FederationController
Prevent outbox from returning an actor object so other federation
software does not attempt to send inbox requests until the inbox is
fully supported.
2018-05-31 21:34:04 -06:00
Daniel Supernault
4b9dd1e312 Update settings home view 2018-05-31 21:25:18 -06:00