nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
16717 commits 4 branches 0 tags 121 MiB
Commit graph

1089 commits

Author SHA1 Message Date
Steffen van Bergerem
9d6ce5b110 Merge pull request #6336 from AugierLe42e/clean-publisher 
Cleaning publisher
 2015-09-26 00:49:34 +02:00
Steffen van Bergerem
b40d5362cf Merge pull request #6256 from TeamDeltaQuadrant/5813-show-geolocation-on-osm 
5813 show geolocation on osm
 2015-09-23 01:43:49 +02:00
Steffen van Bergerem
f2456eda9c Merge pull request #6345 from Flaburgan/override-bootstrap-list-group 
Override bootstrap list group default
 2015-09-20 01:37:14 +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
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ß
6407b446fc Merge branch 'stable' into develop 2015-09-13 12:35:56 +02:00
Jonne Haß
f7a883917c Merge branch 'master' into stable 2015-09-13 12:35:46 +02:00
Jonne Haß
04b3531cd0 bump to 0.5.3.1 2015-09-13 12:33:44 +02:00
Jonne Haß
ba61ca4bdf Merge branch 'stable' into develop 2015-09-07 13:25:14 +02:00
Jonne Haß
0e64d8de2a Refactor tumblr service spec 
closes #6386
 2015-09-07 13:24:53 +02:00
Jonne Haß
176b32c815 Merge branch 'stable' into develop 2015-09-07 12:41:36 +02:00
zaziemo
d38741d5eb add more specs to test moderator role 
fixes #5324

closes #6351
 2015-09-07 12:38:12 +02:00
Steffen van Bergerem
426f55e685 Merge branch 'stable' into develop 2015-09-05 16:12:00 +02:00
sjain1107
928576bc88 6306-add-spinner-on-initial-stream-load 
closes #6384
 2015-09-05 16:11:09 +02:00
Dennis Schubert
39fb1a6db2 Merge branch 'stable' into develop 2015-08-30 10:17:28 +02:00
Jason Robinson
0087fefd14 Change default autofollow_on_join_user 
Due to performance of joindiaspora.com, a decision was made to set up a project pod that hosts the official support and news autofollow account (see https://www.loomio.org/d/tyZdcGNo/diasporahq-account-move-to-a-project-pod). The new account is hq@pod.diaspora.software.

closes #6369
 2015-08-30 10:17:05 +02:00
Dennis Schubert
4f2f3cca59 Merge branch 'stable' into develop 2015-08-29 21:44:31 +02:00
Steffen van Bergerem
1874c37706 Fix back-to-top backbone view 
closes #6360
 2015-08-29 21:44:24 +02:00
Steffen van Bergerem
5020ac45c7 Merge branch 'stable' into develop 2015-08-29 18:19:12 +02:00
SansPseudoFix
110284626a Fix mobile pagination for notifications view 
Fix syntax

Fix syntax

closes #6364
 2015-08-29 18:13:54 +02:00
Jonne Haß
05e87b3170 Merge pull request #6363 from svbergerem/mobile-view-multiple-reaction-boxes 
Mobile view multiple reaction boxes
 2015-08-29 17:02:45 +02:00
Steffen van Bergerem
1b8d61f44c Merge pull request #6285 from AugierLe42e/port-mobile-header-bs3 
Styling of mobile header consistant with desktop version
 2015-08-28 21:44:15 +02:00
Steffen van Bergerem
9446a3ae21 Merge pull request #6301 from AugierLe42e/image-gallery 
Using Blueimp image gallery
 2015-08-27 23:59:46 +02:00
Jonne Haß
24d9be2e68 Merge branch 'stable' into develop 2015-08-27 21:03:16 +02:00
augier
2ce7a1e185 Mobile subdomain 
closes #6354
 2015-08-27 21:01:36 +02:00
Jonne Haß
a30ba5697e Merge pull request #6290 from Raven24/pod_test 
test pods for connectivity
 2015-08-27 11:38:18 +02:00
Steffen van Bergerem
b4a5819aa8 Merge pull request #6349 from Faldrian/beautify-blocked-persons 
Beautify ignored people list and add diaspora handle for identification
 2015-08-27 11:00:56 +02:00
Dennis Schubert
6b863defa3 Merge branch 'stable' into develop 2015-08-27 05:25:51 +02:00
Steffen van Bergerem
3c370ea56e Remove unused js code (stream widget and dropdowns) 
closes #6279
 2015-08-25 04:26:17 +02:00
Jonne Haß
2bf6c87964 Merge branch 'stable' into develop 2015-08-23 22:49:51 +02:00
theworldbright
6e74ee7d21 Make PostPresenter inherit from BasePresenter 
closes #6315
 2015-08-23 22:49:45 +02:00
Steffen van Bergerem
eddfa7cb5c Merge pull request #6309 from AugierLe42e/left-navbar-polishing 
Left and right navbar polishing
 2015-08-23 11:29:51 +02:00
Jonne Haß
e54208d39b Merge branch 'stable' into develop 2015-08-23 11:13:47 +02:00
Steffen van Bergerem
a7287f4f93 Disable the handlebars auto-indent feature 
closes #6339
 2015-08-23 11:13:42 +02:00
Steffen van Bergerem
40ef382a6e Merge branch 'stable' into develop 2015-08-22 01:35:32 +02:00
Anton Tkachov
ef6c8a5448 Issue #6180: Update stream faces block if somebody was blocked 
closes #6320
 2015-08-22 01:35:23 +02:00
Jonne Haß
d396d5555f Merge branch 'stable' into develop 2015-08-21 14:23:46 +02:00
Benjamin Neff
663835ed3a remove old webfinger/hcard code 
closes #6310
 2015-08-21 14:23:08 +02:00
Jonne Haß
bd707c0d12 Merge pull request #6293 from svbergerem/typeahead 
Replace jquery.autocomplete with typeahead.js
 2015-08-12 15:05:46 +02:00
Jonne Haß
25be9ecfd2 Merge branch 'stable' into develop 2015-08-09 18:35:44 +02:00
theworldbright
d7c92431ae Extract service from comments controller 
closes #6307
 2015-08-09 18:35:11 +02:00
Jonne Haß
480384a077 Merge branch 'stable' into develop 2015-08-06 22:56:30 +02:00
Steffen van Bergerem
dc576fb0d6 Check if person is nil in person_image_tag 
closes #6286
 2015-08-06 22:55:41 +02:00
Steffen van Bergerem
0aa453e437 Merge pull request #6291 from AugierLe42e/change-actions-icons-mobile 
Use entypo icons on mobile posts
 2015-08-06 18:00:03 +02:00
Steffen van Bergerem
633d65fe27 Merge branch 'stable' into develop 2015-08-06 14:42:28 +02:00
Anton Tkachov
f1d6e9440b Issue #6281: add url to hovercard avatar 
closes #6297
 2015-08-06 14:42:14 +02:00
Jonne Haß
85f9a0eaa9 Merge branch 'stable' into develop 2015-08-04 10:41:43 +02:00
Mikica Ivosevic
78b0fbbee6 Refactor HomeController#toggle_mobile 
closes #6260
 2015-08-04 10:41:21 +02:00