Commit graph

16003 commits

Author SHA1 Message Date
Jonne Haß
e8bcaf98ca bump sidekiq 2015-06-24 04:00:13 +02:00
Jonne Haß
4307e9b53a bump typhoeus 2015-06-24 04:00:09 +02:00
Jonne Haß
d7b8251503 bump sinon-rails 2015-06-24 04:00:00 +02:00
Jonne Haß
b5413f1050 bump rails_admin 2015-06-24 03:59:56 +02:00
Jonne Haß
bdcdf55f84 bump rails-assets-jquery.slimscroll 2015-06-24 03:59:24 +02:00
Jonne Haß
7309ba81e2 bump jwt 2015-06-24 03:59:19 +02:00
Jonne Haß
65708cb11d bump rails-assets-jasmine 2015-06-24 03:59:10 +02:00
Jonne Haß
f73e7c1b6d bump jasmine-core 2015-06-24 03:58:39 +02:00
Jonne Haß
7d741b8d8b bump hashie 2015-06-24 03:56:47 +02:00
Jonne Haß
9032059535 bump uuid 2015-06-24 03:56:30 +02:00
Jonne Haß
97dd149aa0 bump timecop 2015-06-24 03:56:25 +02:00
Jonne Haß
403f49cd50 bump spring 2015-06-24 03:56:18 +02:00
Jonne Haß
1d1a23c74e bump rubocop 2015-06-24 03:56:12 +02:00
Jonne Haß
ccb183c42c bump rspec-rails 2015-06-24 03:56:08 +02:00
Jonne Haß
cb0dd55355 bump redcarpet 2015-06-24 03:56:00 +02:00
Jonne Haß
e0966d0f48 bump rb-fsevent 2015-06-24 03:55:55 +02:00
Jonne Haß
4365c5935e bump mini_magick 2015-06-24 03:55:42 +02:00
Jonne Haß
fbbeffb645 bump json 2015-06-24 03:55:38 +02:00
Jonne Haß
da49bb2946 bump jquery-ui-rails 2015-06-24 03:55:33 +02:00
Jonne Haß
66c5280c61 bump handlebars_assets 2015-06-24 03:55:25 +02:00
Jonne Haß
4c525abe02 bump guard 2015-06-24 03:54:46 +02:00
Jonne Haß
54dabe446f bump fog 2015-06-24 03:54:39 +02:00
Jonne Haß
99c809deca bump devise 2015-06-24 03:54:35 +02:00
Jonne Haß
8e60fa33eb bump autoprefixer-rails 2015-06-24 03:54:26 +02:00
Jonne Haß
7cfc960a60 bump activerecord-import 2015-06-24 03:54:03 +02:00
Jonne Haß
7a3b66c44f bump pg 2015-06-24 03:53:39 +02:00
fap
1061e101fd Adds welcome message on registration Welcome message is only send out if podmin account is defined and welcome message is enabled in the config.
This also enables the podmin account to send messages
to any local user.

closes #6128
2015-06-21 20:48:48 +02:00
fap
073f028f88 Adds welcome message options to config 2015-06-21 20:48:20 +02:00
Faldrian
12678bde53 Added cucumber step to add multiple posts in one step
closes #6118
2015-06-19 22:19:29 +02:00
Faldrian
0fa571d5e4 Fixed more-button wording when there are <15 posts 2015-06-19 22:17:21 +02:00
SansPseudoFix
cce5a98537 Add link to pod statistics in right navigation
closes #6117
2015-06-19 21:29:25 +02:00
Pablo Cuadrado
c050c606c2 this was causing an empty element to be created
closes #6111
2015-06-17 12:40:22 +02:00
Jonne Haß
3a527d01da Remove top margin for first heading in a post
That is, if it's the first element in the post

closes #6110
2015-06-16 23:43:14 +02:00
Jonne Haß
bff18523ef Update BUNDLED WITH to 1.10.4 2015-06-16 22:37:08 +02:00
Jonne Haß
4b2a43b005 Merge branch 'master' into stable 2015-06-16 21:40:18 +02:00
Jonne Haß
56df5978af bump to 0.5.1.1 2015-06-16 21:38:01 +02:00
Jonne Haß
532f78b5a1 Update rails to 4.2.2, rack to 1.6.2 and jquery-rails to 4.0.4
This fixes CVE-2015-3226, CVE-2015-3227, CVE-2015-1840 and CVE-2015-3225
2015-06-16 21:33:16 +02:00
Benjamin Neff
beb06bc42d precompile images from facebox gem
regression from #6005

closes #6105
2015-06-15 13:46:07 +02:00
Jonne Haß
a247984685 Merge branch 'master' into stable 2015-06-14 18:00:01 +02:00
Jonne Haß
9b36ec6797 release 0.5.1 2015-06-14 17:57:41 +02:00
Jonne Haß
5a63d201a3 Merge branch 'release/0.5.1.0-RC' into stable 2015-06-14 17:41:42 +02:00
Jonne Haß
7052f2a63b updated 12 locale files [ci skip] 2015-06-14 17:40:55 +02:00
Steffen van Bergerem
034fc5b183 Update markdown-it
closes #6091
2015-06-10 13:33:33 +02:00
Benjamin Neff
ce380d78c9 make sql and federation debug-logging configurable
by default both are disabled now, you can enable them in the
diaspora.yml if you need them.

closes #6090
2015-06-09 22:55:16 +02:00
Dennis Schubert
ea4eebd2e1 Merge branch 'release/0.5.1.0-RC' into stable 2015-06-09 05:51:36 +02:00
Jonne Haß
38b32ca2c4 updated 73 locale files [ci skip] 2015-06-09 05:51:16 +02:00
Dennis Schubert
1aa802c07c Merge branch 'release/0.5.1.0-RC' into stable 2015-06-09 05:48:53 +02:00
Dennis Schubert
2837e58903 Remove listen note from the readme
this is not included in 0.5.1.0.

[ci skip]
2015-06-09 05:48:29 +02:00
Steffen van Bergerem
5516926b74 Update perfect-scrollbar
closes #6085
2015-06-08 16:59:27 +02:00
Jonne Haß
dd1cea9665 Merge branch 'release/0.5.0.0-RC' into stable 2015-06-08 13:52:42 +02:00