Commit graph

16746 commits

Author SHA1 Message Date
Jonne Haß
0169f5ca8c bump eye, sidekiq, celluloid 2015-09-19 23:00:08 +02:00
Jonne Haß
ab74d2313d bump naught 2015-09-19 22:59:17 +02:00
Jonne Haß
de9f7d4173 bump spring 2015-09-19 22:59:17 +02:00
Jonne Haß
4fec2e8968 bump valid 2015-09-19 22:59:17 +02:00
Jonne Haß
21c54d1083 bump timers 2015-09-19 22:59:17 +02:00
Jonne Haß
00429bac95 bump little-plugger 2015-09-19 22:59:17 +02:00
Jonne Haß
f27a729b54 bump kgio 2015-09-19 22:59:17 +02:00
Jonne Haß
78655b6f43 bump typhoeus 2015-09-19 22:59:17 +02:00
Jonne Haß
6ea200e0e3 bump twitter-text 2015-09-19 22:58:18 +02:00
Jonne Haß
9f6b4c56ad bump twitter 2015-09-19 22:58:18 +02:00
Jonne Haß
92181b9882 bump rspec-instafail 2015-09-19 22:48:43 +02:00
Jonne Haß
16a5ac2630 bump rb-fsevent 2015-09-19 22:47:49 +02:00
Jonne Haß
f9b93c037f bump rails-i18n 2015-09-19 22:47:49 +02:00
Jonne Haß
9a4b157a95 bump rails-assets-perfect-scrollbar 2015-09-19 22:47:14 +02:00
Jonne Haß
c2a29294c9 bump rails-assets-highlightjs 2015-09-19 22:46:29 +02:00
Jonne Haß
265ea26f05 bump pg 2015-09-19 22:42:50 +02:00
Jonne Haß
a6eb8521c3 bump mysql2 2015-09-19 22:42:04 +02:00
Jonne Haß
d9f9855e15 bump omniauth-twitter 2015-09-19 22:40:56 +02:00
Jonne Haß
21a6a8fd86 bump mini_magick 2015-09-19 22:40:27 +02:00
Jonne Haß
7f27b95d4c bump markerb 2015-09-19 22:40:27 +02:00
Jonne Haß
bab07436d2 bump js-routes 2015-09-19 22:40:27 +02:00
Jonne Haß
f255dc490d bump jquery-rails 2015-09-19 22:40:27 +02:00
Jonne Haß
28cebf7800 bump haml 2015-09-19 22:39:37 +02:00
Jonne Haß
1db832fa11 bump guard-rspec 2015-09-19 22:38:47 +02:00
Jonne Haß
4fa8cc4e62 bump fog 2015-09-19 22:37:48 +02:00
Jonne Haß
30c531a6b9 bump devise 2015-09-19 22:37:48 +02:00
Jonne Haß
16a820992b bump database_cleaner 2015-09-19 22:37:47 +02:00
Jonne Haß
f996699aa2 bump sass-rails 2015-09-19 22:37:47 +02:00
Jonne Haß
a333b10805 bump compass-rails 2015-09-19 22:36:39 +02:00
Jonne Haß
8d917742e2 bump capybara 2015-09-19 22:35:25 +02:00
Jonne Haß
7bdb50ad7b bump autoprefixer-rails 2015-09-19 22:33:57 +02:00
Jonne Haß
c7a00018fc Merge branch 'stable' into develop 2015-09-19 11:36:41 +02:00
Benjamin Neff
a40816370e update federation gem to fix #6405
removed some contraints to support friendica and redmatrix again

closes #6410
2015-09-19 11:34:27 +02:00
Jonne Haß
c3c84b95a4 Merge branch 'stable' into develop 2015-09-19 11:33:10 +02:00
Achilleas Pipinellis
9888b4ce43 Add option to set a pid file for unicorn in diaspora.yml
http://unicorn.bogomips.org/Unicorn/Configurator.html#method-i-pid

closes #6411
2015-09-19 11:33:04 +02:00
Steffen van Bergerem
5aeac0c2e3 Merge pull request #6324 from AugierLe42e/styling-main-stream
Styling main stream
2015-09-18 20:55:43 +02:00
augier
f00f3965ff Styling main stream 2015-09-18 19:13:49 +02:00
fla
e7790a5935 Override bootstrap list group default 2015-09-18 14:01:54 +02:00
Steffen van Bergerem
cf5830adad Merge pull request #6408 from SansPseudoFix/fix-tag-tag-page-overflow
Fix for tag overflow - fixes #6142
2015-09-18 12:39:19 +02:00
SansPseudoFix
ccaf107ae5 Fix for tag overflow - fixes #6142
Fix for tag overflow - fixes #6142
2015-09-17 13:54:41 +02:00
Jonne Haß
cda9c0b366 Merge branch 'stable' into develop 2015-09-15 10:44:50 +02:00
Jonne Haß
92113749c0 highlight-white is still referenced on stable 2015-09-15 10:44:23 +02:00
Jonne Haß
70b200e10d Merge branch 'stable' into develop 2015-09-15 09:52:12 +02:00
Steffen van Bergerem
8bb3d4d8a8 Remove unused color variables
closes  #6404
2015-09-15 09:51:06 +02:00
Jonne Haß
3a29cb28ff Merge branch 'stable' into develop 2015-09-14 22:09:04 +02:00
Jonne Haß
43a09fec39 add changelog entry for #6398 [ci skip] 2015-09-14 22:08:57 +02:00
Jonne Haß
0508c1b8d4 Merge branch 'stable' into develop 2015-09-14 22:06:52 +02:00
Steffen van Bergerem
05a6d95811 Always show public photos
closes #6398
2015-09-14 22:04:53 +02:00
Jonne Haß
f74450fa2f Merge branch 'stable' into develop 2015-09-14 21:50:17 +02:00
Steffen van Bergerem
8fb1116da5 Update AUTHORS file
closes #6399
2015-09-14 21:50:09 +02:00