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

15974 commits

This branch
This branch
All branches
Author SHA1 Message Date
Faldrian
0fa571d5e4 Fixed more-button wording when there are <15 posts 2015-06-19 22:17:21 +02:00
SansPseudoFix
cce5a98537 Add link to pod statistics in right navigation 
closes #6117
 2015-06-19 21:29:25 +02:00
Pablo Cuadrado
c050c606c2 this was causing an empty element to be created 
closes #6111
 2015-06-17 12:40:22 +02:00
Jonne Haß
3a527d01da Remove top margin for first heading in a post 
That is, if it's the first element in the post

closes #6110
 2015-06-16 23:43:14 +02:00
Jonne Haß
bff18523ef Update BUNDLED WITH to 1.10.4 2015-06-16 22:37:08 +02:00
Jonne Haß
4b2a43b005 Merge branch 'master' into stable 2015-06-16 21:40:18 +02:00
Jonne Haß
56df5978af bump to 0.5.1.1 2015-06-16 21:38:01 +02:00
Jonne Haß
532f78b5a1 Update rails to 4.2.2, rack to 1.6.2 and jquery-rails to 4.0.4 
This fixes CVE-2015-3226, CVE-2015-3227, CVE-2015-1840 and CVE-2015-3225
 2015-06-16 21:33:16 +02:00
Benjamin Neff
beb06bc42d precompile images from facebox gem 
regression from #6005

closes #6105
 2015-06-15 13:46:07 +02:00
Jonne Haß
a247984685 Merge branch 'master' into stable 2015-06-14 18:00:01 +02:00
Jonne Haß
9b36ec6797 release 0.5.1 2015-06-14 17:57:41 +02:00
Jonne Haß
5a63d201a3 Merge branch 'release/0.5.1.0-RC' into stable 2015-06-14 17:41:42 +02:00
Jonne Haß
7052f2a63b updated 12 locale files [ci skip] 2015-06-14 17:40:55 +02:00
Steffen van Bergerem
034fc5b183 Update markdown-it 
closes #6091
 2015-06-10 13:33:33 +02:00
Benjamin Neff
ce380d78c9 make sql and federation debug-logging configurable 
by default both are disabled now, you can enable them in the
diaspora.yml if you need them.

closes #6090
 2015-06-09 22:55:16 +02:00
Dennis Schubert
ea4eebd2e1 Merge branch 'release/0.5.1.0-RC' into stable 2015-06-09 05:51:36 +02:00
Jonne Haß
38b32ca2c4 updated 73 locale files [ci skip] 2015-06-09 05:51:16 +02:00
Dennis Schubert
1aa802c07c Merge branch 'release/0.5.1.0-RC' into stable 2015-06-09 05:48:53 +02:00
Dennis Schubert
2837e58903 Remove listen note from the readme 
this is not included in 0.5.1.0.

[ci skip]
 2015-06-09 05:48:29 +02:00
Steffen van Bergerem
5516926b74 Update perfect-scrollbar 
closes #6085
 2015-06-08 16:59:27 +02:00
Jonne Haß
dd1cea9665 Merge branch 'release/0.5.0.0-RC' into stable 2015-06-08 13:52:42 +02:00
Jonne Haß
baafa9c51b updated 73 locale files [ci skip] 2015-06-08 13:51:17 +02:00
Dennis Schubert
b80785e06e Update Changelog for the upcoming 0.5.2.0 2015-06-08 04:32:29 +02:00
Dennis Schubert
ebd12430ea Add note regarding production.server.listen changes 
[ci skip]
 2015-06-08 04:26:13 +02:00
Benjamin Neff
d42b5c128e update photos when received over public path 
closes #6082
 2015-06-08 04:18:31 +02:00
Benjamin Neff
99b36598c7 add migration to fix public flag of photos 2015-06-08 04:15:17 +02:00
Benjamin Neff
e16b9af7e6 make public and private receiver work similar ... 2015-06-08 04:15:17 +02:00
Benjamin Neff
ed10bea21f don't dispatch photos twice ... 2015-06-08 04:15:17 +02:00
Benjamin Neff
c75f92d07a add XMLLogger to debug federation 2015-06-08 04:15:17 +02:00
Benjamin Neff
97153ad08b update tests for new twitter client 
closes #6083
 2015-06-08 04:08:46 +02:00
Jan Berdajs
ec4e7b4a69 upgrade Twitter gem - fixes Faraday deprecation warning 2015-06-08 04:08:02 +02:00
Benjamin Neff
aa2297a8c0 retry receive share-visibility when failed while receiving parallel 
refactoring:
- remove unused return-values (were used for caching, which was removed again)
- remove transaction (doesn't help here, added in 2615126)

closes #6068
 2015-06-08 00:58:00 +02:00
Benjamin Neff
010afa1019 refactor: iterate over visiblities 
closes #6060
 2015-06-08 00:45:16 +02:00
Benjamin Neff
0ffb83d351 load conversations and visibilities in one query with correct order 2015-06-08 00:44:41 +02:00
Benjamin Neff
735d692ac0 fix selected week on weekly stats page 
closes #6079
 2015-06-07 21:14:47 +02:00
Benjamin Neff
2571b042c6 only log private stuff to debug 
closes #6069
 2015-06-07 11:36:07 +02:00
Benjamin Neff
0b5bf2e340 add simplecov for test-coverage 
works with rubymine

closes #6065
 2015-06-06 17:54:57 +02:00
Jonne Haß
6c71d9f257 Only strip text direction markers around hashtags for now 
Fixes #6067
 2015-06-06 15:23:12 +02:00
Jonne Haß
fe3d8814c4 add rubocop binstub [ci skip] 2015-06-05 09:44:22 +02:00
Benjamin Neff
214ce1cf6e change path to uma.jpg to /assets 
closes #6064
 2015-06-05 09:40:34 +02:00
Jonne Haß
d5c873d549 Disable Style/MultilineOperationIndentation [ci skip] 2015-06-04 21:23:31 +02:00
Jonne Haß
bb24b8bedb bump BUNDLED WITH [ci skip] 
See https://github.com/bundler/bundler/issues/3697
 2015-06-04 11:27:37 +02:00
Jonne Haß
f9ce41bae4 bump fixture_builder 2015-06-04 10:58:01 +02:00
Benjamin Neff
27b4a44e4a replace Rails.logger with logging-logger 
closes #6041
 2015-06-04 04:17:15 +02:00
Benjamin Neff
b6c46b3fc4 add logging mixin and replace federation-logger 2015-06-04 04:16:03 +02:00
Steffen van Bergerem
1b77258d0e Set default for post title truncation to 70 characters 
closes #6022
 2015-06-02 12:14:35 +02:00
Jason Robinson
d2e0b3ceae Fix Facebook scopes for cross-posting 
Facebook deprecated their v1.0 API and thus the old ones no longer work (for new authorizations).

closes #6019 [ci skip]
 2015-06-02 02:47:20 +02:00
Benjamin Neff
b8a6af2742 add db migration to cleanup default avatar image-urls 
closes #6014
 2015-06-02 02:34:32 +02:00
Benjamin Neff
03dbb75dd5 don't save default avatars to the database 2015-06-02 02:32:01 +02:00
Benjamin Neff
a7fa3eabcb Disable autocorrect/autocapitalize for the username 
and cleanup the code so it follows the code guidelines

closes #5955

closes #6028
 2015-06-02 00:44:47 +02:00