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

1128 commits

Author SHA1 Message Date
Dennis Schubert
228f3852b2 Merge branch 'stable' into develop 2015-10-15 05:58:44 +02:00
Steffen van Bergerem
995ce18c37 Display publisher on user profile path 
closes #6503
 2015-10-15 05:58:38 +02:00
Jonne Haß
99d4e0b332 Merge branch 'stable' into develop 2015-10-14 22:33:14 +02:00
cmrd Senya
69b46df3d6 Notifications for comments on local posts by non-contacts 2015-10-14 22:32:19 +02:00
Jonne Haß
d9572ec337 Merge branch 'stable' into develop 2015-10-14 11:00:47 +02:00
Lincoln Stoll
6ac6dc1059 Don't set key for logfile on Heroku 
This fixes the issue reported in #5947. Sidekiq will only log to stdout when this key evals to false, so this can't be forced with an empty string. This change eliminates the key altogether when running on Heroku.

closes #6500
 2015-10-14 11:00:42 +02:00
Jonne Haß
09f4eeac2a Merge branch 'stable' into develop 2015-10-12 16:12:36 +02:00
Steffen van Bergerem
b68daaece3 Redirect to sign in on 401 ajax response 
closes #6496
 2015-10-12 16:12:30 +02:00
Dennis Schubert
2b2ce66126 Merge branch 'stable' into develop 2015-10-12 03:44:44 +02:00
Dennis Schubert
9df2cb7290 Prepare 0.5.5.0 release 
[ci skip]
 2015-10-12 03:41:38 +02:00
Jonne Haß
2aed793d19 Merge branch 'stable' into develop 2015-10-11 17:30:47 +02:00
Steffen van Bergerem
123e6d1dd4 Redirect logged out users to sign up page for limited posts 
closes #6490
 2015-10-11 17:29:01 +02:00
Jonne Haß
77295ffcfb Merge pull request #6487 from svbergerem/move-reshare-count 
Move reshare count
 2015-10-10 20:51:27 +02:00
Steffen van Bergerem
bce7157b86 Merge pull request #6395 from AugierLe42e/drop-flash-messages-widget 
Use backbone for flash messages
 2015-10-10 17:17:52 +02:00
Dennis Schubert
aab21be09d Merge branch 'stable' into develop 2015-10-10 06:45:15 +02:00
Steffen van Bergerem
230f6d6d62 Fix hovercard view console error 
closes #6480
 2015-10-10 06:45:09 +02:00
Steffen van Bergerem
1ad48d7ce3 Fix changelog for #6462 [ci skip] 2015-10-08 16:18:49 +02:00
Steffen van Bergerem
0dd6c71b6d Fix changelog for #6462 [ci skip] 2015-10-08 16:14:13 +02:00
Jonne Haß
23099823c1 Merge branch 'stable' into develop 2015-10-08 10:52:25 +02:00
Steffen van Bergerem
0c214cd4ca Make click on active stream link reload the stream 
closes #6466
 2015-10-08 10:52:18 +02:00
Jonne Haß
92b5ea29ed Merge branch 'stable' into develop 2015-10-07 22:29:45 +02:00
Steffen van Bergerem
e0be1b49f1 Add public stream 
closes #6465
 2015-10-07 22:29:39 +02:00
Steffen van Bergerem
c663d9d55e Merge branch 'stable' into develop 2015-10-07 22:00:52 +02:00
Faldrian
058bcb43f8 Added avatar image fallback for notifications 
closes #6463
 2015-10-07 21:58:56 +02:00
Steffen van Bergerem
fc9d7396cc Merge branch 'stable' into develop 2015-10-07 21:38:26 +02:00
Faldrian
d486e37487 following tags now normalized and sorted in ui 
closes #6454
 2015-10-07 21:38:12 +02:00
Jonne Haß
1df5c7f7bf Merge branch 'stable' into develop 2015-10-07 10:58:10 +02:00
Faldrian
a946251a9e Show getting_started only if user has made no profile changes on the page 
closes #6456
 2015-10-07 10:58:06 +02:00
Jonne Haß
ebe2754196 Merge pull request #6457 from svbergerem/permalink-v1 
Add permalink for stream elements
 2015-10-07 02:02:37 +02:00
Jonne Haß
7b4d7dc737 Merge branch 'stable' into develop 2015-10-06 22:50:42 +02:00
Steffen van Bergerem
517cd56f21 Don't reload stream pages 
closes #6462
 2015-10-06 22:46:58 +02:00
Jonne Haß
1ce967e873 Merge pull request #6378 from Zauberstuhl/bootstrap3_and_user_detail_btn 
Report tab; Bootstrap3 compatible and reported-user-detail button
 2015-10-03 19:12:08 +02:00
Steffen van Bergerem
7c777ca904 Merge branch 'stable' into develop 2015-10-02 23:42:36 +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
dca23d1369 Merge pull request #6415 from AugierLe42e/replace-mobile-background-image 
Replace mobile background image by a color
 2015-10-02 21:57:16 +02:00
Steffen van Bergerem
7bcf464cf4 Merge pull request #6435 from Flaburgan/publisher-xsmall-cancel 
Hide publisher cancel button on xsmall screens
 2015-10-01 00:08:17 +02:00
Jonne Haß
2569c48050 Merge pull request #6431 from svbergerem/conversations-style-changes 
Change conversation page style
 2015-09-28 18:44:26 +02:00
Jonne Haß
4087036e63 Merge pull request #6428 from svbergerem/unify-error-pages 
Unify error pages
 2015-09-27 11:42:03 +02:00
Jonne Haß
600457a552 Merge pull request #6429 from svbergerem/fix-location-post-preview 
Fix post preview with location
 2015-09-27 11:37:15 +02:00
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