Commit graph

16227 commits

Author SHA1 Message Date
Steffen van Bergerem
25e4d8c365 Fix shortcuts after changing streams 2015-10-06 22:34:36 +02:00
Jonne Haß
c5819b9c57 Enable SQL logging by default in development mode 2015-10-05 15:22:28 +02:00
Lukas Matt
1cf69b33ea bump diaspora-vines to v0.2.0.develop.3
closes #6441
2015-10-03 02:28:01 +02:00
augier
22882aa24d Infinite scroll triggered relative to last element top rather than window bottom
closes #6451
2015-10-02 23:42:26 +02:00
Steffen van Bergerem
baba71612d Replace deprecated default_wait_time for Capybara
closes #6430
2015-09-27 12:02:24 +02:00
Jonne Haß
ca215ca28d Sidetiq still isn't celluloid 0.17 compatible 2015-09-21 12:21:16 +02:00
Jonne Haß
8c246c406f bump typhoeus 2015-09-19 23:02:13 +02:00
Jonne Haß
e571acf2f2 bump notiffany 2015-09-19 23:01:37 +02:00
Jonne Haß
cacc3c2994 bump mime-types 2015-09-19 23:01:37 +02:00
Jonne Haß
cce910000f bump js-routes 2015-09-19 23:01:37 +02:00
Jonne Haß
691274d068 bump jasmine 2015-09-19 23:01:37 +02:00
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
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
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
Jonne Haß
92113749c0 highlight-white is still referenced on stable 2015-09-15 10:44:23 +02:00
Steffen van Bergerem
8bb3d4d8a8 Remove unused color variables
closes  #6404
2015-09-15 09:51:06 +02:00
Jonne Haß
43a09fec39 add changelog entry for #6398 [ci skip] 2015-09-14 22:08:57 +02:00
Steffen van Bergerem
05a6d95811 Always show public photos
closes #6398
2015-09-14 22:04:53 +02:00
Steffen van Bergerem
8fb1116da5 Update AUTHORS file
closes #6399
2015-09-14 21:50:09 +02:00
Jonne Haß
f7a883917c Merge branch 'master' into stable 2015-09-13 12:35:46 +02:00