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

1007 commits

Author SHA1 Message Date
Jonne Haß
0cbe7ec9a8 Merge branch 'stable' into develop 2015-07-22 10:05:46 +02:00
Steffen van Bergerem
f8bbe71f54 Remove correlations 
closes #6223
 2015-07-22 09:46:52 +02:00
Jonne Haß
d6587469e4 Merge pull request #6218 from svbergerem/mobile-entypo 
Entypo on mobile website
 2015-07-22 00:11:55 +02:00
Jonne Haß
dbbaf90c27 Merge pull request #6216 from svbergerem/admin-page-update-notifications 
Add dashboard to admin page
 2015-07-21 16:55:27 +02:00
Steffen van Bergerem
94b745d5c8 Merge branch 'stable' into develop 2015-07-20 01:31:33 +02:00
Ivan Korunkov
5ca9ca9844 Default home page: fix wiki link title; GitHub wiki is obsolete, because it has been moved from GitHub to independent resource. 
closes #6212
 2015-07-20 01:31:22 +02:00
Jonne Haß
3e841905ec Merge branch 'stable' into develop 2015-07-20 00:58:33 +02:00
Jonne Haß
ccf2fad903 Start 0.5.3.0 development cycle 2015-07-20 00:57:24 +02:00
Jonne Haß
0e439f6c1c Merge branch 'stable' into develop 2015-07-16 11:12:16 +02:00
JoeBew42
e21dad780d Refactoring tests on photo saved with and without EXIF data 
closes #6183
 2015-07-16 11:12:12 +02:00
Dennis Schubert
201a3ec1cf Merge branch 'stable' into develop 2015-07-16 03:11:25 +02:00
realtin
d0b290ea4d refactor hash indentation and add double quotes 
this is the suggested styling according to hound/pronto/rubocop
(#6192)
 2015-07-16 03:08:34 +02:00
fla
7a474f2b7c Update Changelog to improve terms changes indication. 2015-07-14 11:44:23 +02:00
Jonne Haß
9229f1dfd2 Merge branch 'stable' into develop 2015-07-14 09:58:59 +02:00
Alex Chvatal
634aa7b09a capitalize Wiki in the links sidebar. closes #6188 
closes #6193
 2015-07-14 09:58:43 +02:00
Dennis Schubert
0e19603384 Merge pull request #6122 from Flaburgan/6121-terms-of-use 
Add a ToS design change mention in the changelog, close #6121
 2015-07-14 08:33:32 +02:00
Dennis Schubert
eca4fff6c1 Merge branch 'stable' into develop 2015-07-13 23:54:03 +02:00
Benjamin Neff
e4ca9f01e2 fix jsxc_helper_spec and use new url_to in jsxc_helper 
closes #6151
 2015-07-13 23:52:13 +02:00
Dennis Schubert
6b6bf84598 Merge pull request #6151 from SuperTux88/federation-gem 
Federation Gem Step 1: Webfinger/HCard generation
 2015-07-12 17:02:23 +02:00
Jonne Haß
397845161f Merge pull request #6162 from cmrd-senya/5684-public-additional-profile 
Allow additional profile fields (previously private profile) to be set public (new updated version)
 2015-07-11 10:19:19 +02:00
Jonne Haß
84d5a13ce1 Merge branch 'stable' into develop 2015-07-11 00:17:19 +02:00
realtin
9eadc251ae added post guid to the post_serializer 
closes #6185
 2015-07-11 00:17:01 +02:00
Dennis Schubert
c703cadf9b Merge branch 'stable' into develop 2015-07-07 02:51:38 +02:00
Dennis Schubert
b5b5f1f028 Revert "Issue #6145: Set a fixed body-height" for global side effects 
This reverts commit 990c678cd3.
 2015-07-07 02:50:30 +02:00
Dennis Schubert
eecceacd46 Merge branch 'stable' into develop 2015-07-07 02:46:39 +02:00
Haidy777
990c678cd3 Issue #6145: Set a fixed body-height 
closes #6169
 2015-07-07 02:46:34 +02:00
Jonne Haß
1e4224813e Merge branch 'stable' into develop 2015-07-05 20:50:42 +02:00
Benjamin Neff
b0a9a6342f add url_to 
closes #6168
 2015-07-05 20:46:18 +02:00
Jonne Haß
69974bdc13 Merge pull request #6161 from svbergerem/fix-conversation-modal 
Fix two modal issues
 2015-07-03 20:26:31 +02:00
Jonne Haß
7d32000bd0 Merge branch 'stable' into develop 2015-07-03 16:34:18 +02:00
cmrd Senya
fe3ff10e07 Add new daily job to clean cache in public/tmp (as suggested in #5946). 2015-07-03 16:34:01 +02:00
Jonne Haß
961f6b5350 Merge pull request #6158 from svbergerem/update-entypo 
Update entypo
 2015-07-03 16:31:35 +02:00
Dennis Schubert
e0782437b8 Merge branch 'stable' into develop 2015-07-03 05:26:01 +02:00
theworldbright
d410d2ee76 Fix bug where flash error reappeared #6136 
closes #6146
closes #6136
 2015-07-03 05:25:22 +02:00
Jonne Haß
1cd2562572 Merge branch 'stable' into develop 2015-07-02 11:12:16 +02:00
Jonne Haß
6601576149 Merge branch 'master' into stable 2015-07-02 11:11:58 +02:00
Jonne Haß
8624ebb921 bump to 0.5.1.2 2015-07-02 11:09:05 +02:00
Dennis Schubert
4b1cd5b2fa Merge branch 'stable' into develop 2015-06-27 04:37:10 +02:00
Jonne Haß
e6712185a2 bump listen 2015-06-27 04:36:21 +02:00
Jonne Haß
0b6dc320cb Merge pull request #6132 from svbergerem/fix-perfect-scrollbar 
Fix overflow with perfect scrollbar
 2015-06-22 01:29:40 +02:00
Jonne Haß
a663925197 Merge pull request #6130 from svbergerem/fix-autocomplete 
Fix autocomplete
 2015-06-22 00:48:06 +02:00
Jonne Haß
188e554b7b Merge branch 'stable' into develop 2015-06-21 20:48:57 +02:00
fap
1061e101fd Adds welcome message on registration Welcome message is only send out if podmin account is defined and welcome message is enabled in the config. 
This also enables the podmin account to send messages
to any local user.

closes #6128
 2015-06-21 20:48:48 +02:00
Jonne Haß
79c5202a5b Merge pull request #6109 from svbergerem/bootstrap-header-rewrite 
Bootstrap header rewrite
 2015-06-21 19:46:07 +02:00
Steffen van Bergerem
e890ffa698 Merge branch 'stable' into develop 2015-06-19 22:20:57 +02:00
Faldrian
12678bde53 Added cucumber step to add multiple posts in one step 
closes #6118
 2015-06-19 22:19:29 +02:00
Steffen van Bergerem
078e7a722f Merge branch 'stable' into develop 2015-06-19 21:30:15 +02:00
SansPseudoFix
cce5a98537 Add link to pod statistics in right navigation 
closes #6117
 2015-06-19 21:29:25 +02:00
Flaburgan
e3d77cece2 Add a ToS design change mention in the changelog, close 6121 2015-06-19 10:22:20 +02:00
Steffen van Bergerem
5ab09f0659 Merge pull request #6086 from Flaburgan/add-services-mobile 
Add Services and Privacy settings page to mobile
 2015-06-18 22:52:44 +02:00