Eugen
|
744456cb55
|
Merge branch 'master' into add_more_tests_to_models
|
8 years ago |
|
Eugen
|
1bb3d8d3f5
|
Merge pull request #885 from optikfluffel/patch-1
Update Production-guide.md
|
8 years ago |
|
Eugen
|
bb582ac177
|
Merge pull request #839 from SirCmpwn/profile-readability
Improve readability of text on profiles
|
8 years ago |
|
Eugen
|
f9c7d2d52d
|
Merge pull request #860 from pierreozoux/patch-1
Update the list of instances
|
8 years ago |
|
Eugen
|
cb1617245b
|
Merge branch 'master' into patch-1
|
8 years ago |
|
Eugen
|
58d8c64ce6
|
Merge pull request #859 from dereckson/patch-1
Add social.nasqueron.org instance
|
8 years ago |
|
Eugen
|
49cd7f7fc4
|
Merge branch 'master' into patch-1
|
8 years ago |
|
Eugen
|
4fae68139c
|
Merge pull request #843 from fmauNeko/patch-1
Update List-of-Mastodon-instances.md
|
8 years ago |
|
Eugen
|
4390ae7bf9
|
Merge branch 'master' into patch-1
|
8 years ago |
Drew DeVault
|
27e4759c00
|
Improve readability of text on profiles
|
8 years ago |
|
Eugen
|
05de364fbc
|
Merge pull request #863 from Eychics/master
Add closed_registrations message on French language
|
8 years ago |
|
Eugen
|
c571ed77d7
|
Merge pull request #818 from JantsoP/master
Updated Finnish Translation
|
8 years ago |
|
Eugen
|
7603a1d5d2
|
Merge pull request #846 from TrollDecker/master
Update social.diskseven.com's IPv6 status
|
8 years ago |
|
Eugen
|
0662ab35eb
|
Merge pull request #842 from Angristan/patch-2
Missing quotes
|
8 years ago |
|
Eugen
|
9c47a07dfa
|
Merge pull request #845 from thurloat/patch-1
Add mastodon.club to running instances list
|
8 years ago |
|
Eugen
|
3340074137
|
Merge pull request #848 from ProgVal/patch-3
Add oc.todon.fr to the list of instances.
|
8 years ago |
|
Eugen
|
b3523a6a8d
|
Merge pull request #854 from Angristan/patch-3
Fix crontab edit
|
8 years ago |
|
Eugen
|
cc82f3adff
|
Merge pull request #866 from kklleemm/patch-1
Fix typos on french translations
|
8 years ago |
|
Eugen
|
45c3772ddb
|
Merge pull request #792 from chapeaumeinfreund/master
Updated and fixed german orthography
|
8 years ago |
|
Eugen
|
27b758f328
|
Merge pull request #790 from chapeaumeinfreund/patch-1
Updated and fixed german orthography
|
8 years ago |
|
Eugen
|
4751381a24
|
Merge pull request #852 from peterkeen/email-whitelist-817
[#817] Add email whitelist
|
8 years ago |
|
Eugen
|
ae1b33d594
|
Merge pull request #891 from ashfurrow/patch-1
Adds instructions for adding admin users for Heroku installs
|
8 years ago |
|
Eugen
|
2f7da4167f
|
Merge pull request #805 from nevillepark/master
Changed "reblogs" to "boosts"
|
8 years ago |
|
Eugen
|
dd839491b6
|
Merge pull request #894 from asm/mastodon_cc
Adding https://mastodon.cc
|
8 years ago |
|
Eugen
|
a8468cc6cc
|
Merge pull request #898 from SirCmpwn/remote-follow-improvements
Remote follow improvements
|
8 years ago |
|
Eugen
|
6a8bb89f80
|
Merge pull request #858 from krainboltgreene/patch-6
Use active record shorthand
|
8 years ago |
Ash Furrow
|
bd371b6adb
|
Updates instructions.
|
8 years ago |
|
Eugen
|
a5f1a6bf01
|
Merge pull request #872 from kwaio/patch-1
typo in admin doc
|
8 years ago |
|
Drew DeVault
|
932b0b2f1f
|
Remote follow improvements
This stores the @username@instance you provide in your session and
reuses it the next time you remote follow someone from this instance.
|
8 years ago |
|
Eugen
|
497fc3894a
|
Merge pull request #868 from Angristan/patch-4
Add file package
|
8 years ago |
|
Eugen Rochko
|
d2b7daf6bb
|
Remove PuSH subscriptions when delivery is answered with a 4xx error
|
8 years ago |
Jason Snell
|
1771eea458
|
Adding https://mastodon.cc
|
8 years ago |
Samy KACIMI
|
28ed6fb058
|
alphebatically order test gem group as required by rubocop
|
8 years ago |
|
Samy KACIMI
|
06424fd912
|
fix rubocop issues
|
8 years ago |
|
Ash Furrow
|
5e8e8ba01d
|
Adds instructions for adding admin users.
|
8 years ago |
|
Samy KACIMI
|
3c5248ca20
|
Merge branch 'master' into add_more_tests_to_models
|
8 years ago |
|
Samy KACIMI
|
630ba25d44
|
update account_spec
|
8 years ago |
|
Samy KACIMI
|
01c7e8ee7c
|
rollback database.yml update
|
8 years ago |
|
Samy KACIMI
|
9f80b2dd4e
|
add more tests to models
|
8 years ago |
Valentin_NC
|
e9b2c26a20
|
add persistance to Postresql container
|
8 years ago |
Udo Kramer
|
cfa339d3ff
|
Update Production-guide.md
|
8 years ago |
|
Eugen
|
ebc2c97264
|
Merge pull request #876 from krainboltgreene/patch-7
Quick attempt to get pull requests passing
|
8 years ago |
Kurtis Rainbolt-Greene
|
d6c7d89053
|
Quick attempt to get pull requests passing
|
8 years ago |
axolotl
|
f6463e595f
|
Added Esperanto translation inside the javascripts folder
|
8 years ago |
Nope Nope
|
583208f5ae
|
typo in admin doc
s/rails/rake/
|
8 years ago |
Angristan
|
1447ba504b
|
Add file package
If the file package is not installed, we get "Validation failed: File has contents that are not what they are reported to be" when upload media.
|
8 years ago |
|
Eugen Rochko
|
fa2a1af90a
|
Spawn FeedInsertWorker to deliver status into personal feed
|
8 years ago |
Clément D
|
ba8744d0a7
|
Fix typos on french translations
|
8 years ago |
Thibaut (Eychics)
|
6afd3a6eab
|
Add closed_registrations message on French language
|
8 years ago |
Pierre Ozoux
|
ecbda73b27
|
Update the list of instances
|
8 years ago |
