Commit graph

39694 commits

Author SHA1 Message Date
Eugen
aa8dacbc8a Merge pull request #792 from chapeaumeinfreund/master
Updated and fixed german orthography
2017-04-05 03:05:50 +02:00
Eugen
27b758f328 Merge pull request #790 from chapeaumeinfreund/patch-1
Updated and fixed german orthography
2017-04-05 03:05:31 +02:00
Eugen
ce524cbb49 Merge pull request #790 from chapeaumeinfreund/patch-1
Updated and fixed german orthography
2017-04-05 03:05:31 +02:00
Eugen
4751381a24 Merge pull request #852 from peterkeen/email-whitelist-817
[#817] Add email whitelist
2017-04-05 03:04:58 +02:00
Eugen
117b22e905 Merge pull request #852 from peterkeen/email-whitelist-817
[#817] Add email whitelist
2017-04-05 03:04:58 +02:00
Eugen
ae1b33d594 Merge pull request #891 from ashfurrow/patch-1
Adds instructions for adding admin users for Heroku installs
2017-04-05 03:01:43 +02:00
Eugen
d3dab68978 Merge pull request #891 from ashfurrow/patch-1
Adds instructions for adding admin users for Heroku installs
2017-04-05 03:01:43 +02:00
Eugen
2f7da4167f Merge pull request #805 from nevillepark/master
Changed "reblogs" to "boosts"
2017-04-05 03:00:57 +02:00
Eugen
57466d542b Merge pull request #805 from nevillepark/master
Changed "reblogs" to "boosts"
2017-04-05 03:00:57 +02:00
Eugen
dd839491b6 Merge pull request #894 from asm/mastodon_cc
Adding https://mastodon.cc
2017-04-05 02:56:54 +02:00
Eugen
417273326a Merge pull request #894 from asm/mastodon_cc
Adding https://mastodon.cc
2017-04-05 02:56:54 +02:00
Eugen
a8468cc6cc Merge pull request #898 from SirCmpwn/remote-follow-improvements
Remote follow improvements
2017-04-05 02:54:03 +02:00
Eugen
909d81923e Merge pull request #898 from SirCmpwn/remote-follow-improvements
Remote follow improvements
2017-04-05 02:54:03 +02:00
Eugen
6a8bb89f80 Merge pull request #858 from krainboltgreene/patch-6
Use active record shorthand
2017-04-05 02:53:39 +02:00
Eugen
2edeb3fe1c Merge pull request #858 from krainboltgreene/patch-6
Use active record shorthand
2017-04-05 02:53:39 +02:00
Ash Furrow
bd371b6adb Updates instructions. 2017-04-04 20:53:31 -04:00
Ash Furrow
dd441606aa Updates instructions. 2017-04-04 20:53:31 -04:00
Eugen
a5f1a6bf01 Merge pull request #872 from kwaio/patch-1
typo in admin doc
2017-04-05 02:53:09 +02:00
Eugen
feea517046 Merge pull request #872 from kwaio/patch-1
typo in admin doc
2017-04-05 02:53:09 +02:00
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.
2017-04-04 20:52:31 -04:00
Drew DeVault
f7e35d90db 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.
2017-04-04 20:52:31 -04:00
Eugen
497fc3894a Merge pull request #868 from Angristan/patch-4
Add file package
2017-04-05 02:52:00 +02:00
Eugen
e55fbdede3 Merge pull request #868 from Angristan/patch-4
Add file package
2017-04-05 02:52:00 +02:00
Eugen Rochko
d2b7daf6bb Remove PuSH subscriptions when delivery is answered with a 4xx error 2017-04-05 02:34:33 +02:00
Eugen Rochko
bda37489ac Remove PuSH subscriptions when delivery is answered with a 4xx error 2017-04-05 02:34:33 +02:00
Jason Snell
1771eea458 Adding https://mastodon.cc 2017-04-04 16:35:57 -07:00
Jason Snell
50a88d6a6e Adding https://mastodon.cc 2017-04-04 16:35:57 -07:00
Samy KACIMI
28ed6fb058 alphebatically order test gem group as required by rubocop 2017-04-05 00:52:55 +02:00
Samy KACIMI
5af0ecbcd9 alphebatically order test gem group as required by rubocop 2017-04-05 00:52:55 +02:00
Samy KACIMI
06424fd912 fix rubocop issues 2017-04-05 00:47:17 +02:00
Samy KACIMI
79ef756f64 fix rubocop issues 2017-04-05 00:47:17 +02:00
Ash Furrow
5e8e8ba01d Adds instructions for adding admin users. 2017-04-04 18:45:24 -04:00
Ash Furrow
04225ed72e Adds instructions for adding admin users. 2017-04-04 18:45:24 -04:00
Samy KACIMI
3c5248ca20 Merge branch 'master' into add_more_tests_to_models 2017-04-05 00:43:10 +02:00
Samy KACIMI
073f92fc76 Merge branch 'master' into add_more_tests_to_models 2017-04-05 00:43:10 +02:00
Samy KACIMI
630ba25d44 update account_spec 2017-04-05 00:37:23 +02:00
Samy KACIMI
46c0e8b0e7 update account_spec 2017-04-05 00:37:23 +02:00
Samy KACIMI
01c7e8ee7c rollback database.yml update 2017-04-05 00:31:31 +02:00
Samy KACIMI
7762467b47 rollback database.yml update 2017-04-05 00:31:31 +02:00
Samy KACIMI
9f80b2dd4e add more tests to models 2017-04-05 00:29:56 +02:00
Samy KACIMI
81c76fe375 add more tests to models 2017-04-05 00:29:56 +02:00
Valentin_NC
e9b2c26a20 add persistance to Postresql container 2017-04-05 09:06:08 +11:00
Valentin_NC
4512fde181 add persistance to Postresql container 2017-04-05 09:06:08 +11:00
Udo Kramer
cfa339d3ff Update Production-guide.md 2017-04-04 23:45:29 +02:00
Udo Kramer
1e5a1b9abd Update Production-guide.md 2017-04-04 23:45:29 +02:00
Eugen
ebc2c97264 Merge pull request #876 from krainboltgreene/patch-7
Quick attempt to get pull requests passing
2017-04-04 23:11:34 +02:00
Eugen
ed22f65b3c Merge pull request #876 from krainboltgreene/patch-7
Quick attempt to get pull requests passing
2017-04-04 23:11:34 +02:00
Kurtis Rainbolt-Greene
d6c7d89053 Quick attempt to get pull requests passing 2017-04-04 12:14:44 -07:00
Kurtis Rainbolt-Greene
9ae9ecdebe Quick attempt to get pull requests passing 2017-04-04 12:14:44 -07:00
axolotl
f6463e595f Added Esperanto translation inside the javascripts folder 2017-04-04 20:54:42 +02:00