Commit graph

1513 commits

Author SHA1 Message Date
Lukas Matt
f0d5ff12a2 Diaspora configuration wrapper for Prosody
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
2016-04-25 15:30:28 +02:00
Dennis Schubert
e95c742aa1 Merge branch 'stable' into develop 2016-03-30 10:18:09 +02:00
Benjamin Neff
c4ad63d106 bump diaspora_federation
and bump typhoeus
2016-03-30 09:45:46 +02:00
Steffen van Bergerem
f06ff01c9e Remove jquery.hotkeys 2016-03-04 18:02:22 +01:00
Steffen van Bergerem
bee08daca6 Remove jquery-elastic 2016-03-04 18:02:22 +01:00
Dennis Schubert
e0d6da7ad7 Re-add pg in Gemfile.lock
Regression during from e596b1d277
2016-03-04 16:28:18 +01:00
Jonne Haß
e596b1d277 Merge branch 'stable' into develop 2016-03-04 15:05:36 +01:00
Dennis Schubert
92fcbfbede Bump mysql2 2016-03-04 15:00:33 +01:00
Dennis Schubert
e00cbf62ae Bump js_image_paths 2016-03-04 14:53:02 +01:00
Dennis Schubert
558094409b Bump js-routes 2016-03-04 14:53:02 +01:00
Dennis Schubert
5eba267db2 Bump autoprefixer-rails 2016-03-04 14:53:02 +01:00
Dennis Schubert
9af3e957f6 Bump rails 2016-03-04 14:50:07 +01:00
Dennis Schubert
091c426004 Merge pull request #6672 from k0kubun/hamlit
Use Hamlit to render Haml
2016-03-01 07:16:25 +01:00
Jonne Haß
086b6e4529 Merge branch 'stable' into develop 2016-02-16 11:19:10 +01:00
Steffen van Bergerem
9eb0dddb1a Speed up asset serving in development
closes #6702
2016-02-16 11:19:04 +01:00
Jonne Haß
2a47b889d1 Merge branch 'stable' into develop 2016-02-12 22:18:43 +01:00
Steffen van Bergerem
e66ff6973f Bump markdown-it
closes #6695
2016-02-12 22:18:38 +01:00
Dennis Schubert
0ee0b31e5c Bump openid_connect 2016-02-09 22:22:18 +01:00
Dennis Schubert
a49b7baf36 Bump webfinger 2016-02-09 22:22:05 +01:00
Dennis Schubert
e42a444d8d Bump swd 2016-02-09 22:21:49 +01:00
Dennis Schubert
5262dabbf4 Bump rack-oauth2 2016-02-09 22:21:36 +01:00
Dennis Schubert
f9de06100d Bump jsonpath 2016-02-09 22:21:20 +01:00
Dennis Schubert
ba3eb57ec4 Bump json-jwt 2016-02-09 22:20:56 +01:00
Dennis Schubert
a9d649e173 Bump bindata 2016-02-09 22:20:36 +01:00
Dennis Schubert
8d1f03a35b Bump attr_required 2016-02-09 22:20:17 +01:00
Steffen van Bergerem
e10f606d7b Merge branch 'stable' into develop 2016-02-09 22:19:14 +01:00
Dennis Schubert
cb706010ff Bump sass 2016-02-09 21:32:57 +01:00
Dennis Schubert
b2eeed9ab0 Bump request_store 2016-02-09 21:31:52 +01:00
Dennis Schubert
685884509e Bump rainbow 2016-02-09 21:31:52 +01:00
Dennis Schubert
a1d055dad3 Bump phantomjs 2016-02-09 21:30:41 +01:00
Dennis Schubert
ad83b16b83 Bump parser 2016-02-09 21:29:35 +01:00
Dennis Schubert
b03a010124 Bump oauth2 2016-02-09 21:28:43 +01:00
Dennis Schubert
a987614ac7 Bump nenv 2016-02-09 21:27:09 +01:00
Dennis Schubert
ae257ff137 Bump lumberjack 2016-02-09 21:26:29 +01:00
Dennis Schubert
fc0ba16847 Bump fog-xenserver 2016-02-09 21:25:03 +01:00
Dennis Schubert
07dfb5dcda Bump fog-vsphere 2016-02-09 21:25:03 +01:00
Dennis Schubert
dd382945e6 Bump fog-softlayer 2016-02-09 21:25:03 +01:00
Dennis Schubert
1e3f2556fc Bump fog-radosgw 2016-02-09 21:25:03 +01:00
Dennis Schubert
1ae9869b20 Bump fog-aws 2016-02-09 21:25:03 +01:00
Dennis Schubert
42203b2803 Bump ethon 2016-02-09 21:24:29 +01:00
Dennis Schubert
7c4820cec1 Bump hiredis, em-hiredis and eventmachine 2016-02-09 21:23:54 +01:00
Dennis Schubert
da2ed56f59 Bump childprocess 2016-02-09 21:22:31 +01:00
Dennis Schubert
02f5e29199 Bump byebug 2016-02-09 21:21:38 +01:00
Dennis Schubert
3bfab029d5 Bump twitter-text 2016-02-09 21:14:35 +01:00
Dennis Schubert
86ed0026f3 Bump twitter 2016-02-09 21:14:35 +01:00
Dennis Schubert
c05ca939b6 Bump spring 2016-02-09 21:13:23 +01:00
Dennis Schubert
ed2564d76d Bump simplecov 2016-02-09 21:13:23 +01:00
Dennis Schubert
98949e3afd Bump rb-inotify 2016-02-09 21:12:29 +01:00
Dennis Schubert
9855385bde Bump rb-fsevent 2016-02-09 21:10:45 +01:00
Dennis Schubert
d3b5215951 Bump mini_magick 2016-02-09 21:10:45 +01:00