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

17204 commits

This branch
This branch
All branches
Author SHA1 Message Date
cmrd Senya
ed61ef6d6a Replace sidetiq with sidekiq-cron 
closes #6616
 2016-01-24 07:20:44 +01:00
Dennis Schubert
515cda7658 Merge branch 'stable' into develop 2016-01-24 07:15:04 +01:00
Benjamin Neff
44ab0df02b fix suppress_annoying_errors 
closes #6653
 2016-01-24 07:14:58 +01:00
Dennis Schubert
b1aa8aacfd Merge branch 'stable' into develop 2016-01-24 07:13:11 +01:00
Steffen van Bergerem
0213bbc028 Add podmin email to 500 error page 
closes #6652
 2016-01-24 07:12:06 +01:00
Dennis Schubert
541e053ddb Merge branch 'stable' into develop 2016-01-24 07:09:12 +01:00
Benjamin Neff
ebfb901b39 update federation gem to prevent locale leakage in receive requests 
closes #6651
 2016-01-24 07:02:15 +01:00
Dennis Schubert
9c7b5bc0ce Merge pull request #6648 from svbergerem/fix-timeago-reshares 
Fix timeago tooltips for reshares
 2016-01-22 02:33:39 +01:00
Dennis Schubert
e79eab67b9 Merge branch 'stable' into develop 2016-01-22 01:42:39 +01:00
Dennis Schubert
072ce711d2 Merge branch 'master' into stable 2016-01-22 01:41:49 +01:00
Dennis Schubert
22fa2c7cc4 Merge branch 'hotfix/0.5.6.1' into develop 2016-01-22 01:40:29 +01:00
Dennis Schubert
cd119f3193 Merge branch 'hotfix/0.5.6.1' 2016-01-22 01:38:51 +01:00
Steffen van Bergerem
a3adc2fb36 Fix timeago tooltips for reshares 2016-01-21 22:42:30 +01:00
Steffen van Bergerem
f6da6a68f6 Merge branch 'stable' into develop 2016-01-21 21:13:01 +01:00
Steffen van Bergerem
18a46d9f90 Fix Changelog [ci skip] 2016-01-21 21:12:37 +01:00
Dennis Schubert
dd93cb6cad Merge pull request #6646 from svbergerem/commenting-when-ignored 
Tell user that the author might ignore them when commenting/liking failed
 2016-01-21 21:07:37 +01:00
Steffen van Bergerem
a52c8a2f55 Tell user that the author might ignore them when commenting/liking failed 2016-01-21 21:02:39 +01:00
Dennis Schubert
ff867cd471 Merge branch 'stable' into develop 2016-01-21 21:00:32 +01:00
Steffen van Bergerem
749016a7b4 Fix keyboard shortcuts on profile pages 
closes #6647
 2016-01-21 21:00:26 +01:00
Dennis Schubert
a8008571b3 Bump devise 2016-01-21 20:55:46 +01:00
Dennis Schubert
f7d42fa83d Bump nokogiri 2016-01-21 20:47:54 +01:00
Dennis Schubert
64a780c831 Prepare 0.5.6.1 hotfix 2016-01-21 20:47:44 +01:00
Steffen van Bergerem
6fce81fc99 Merge branch 'stable' into develop 2016-01-20 21:37:30 +01:00
tamatsyk
960e651764 internationalize controller rescue_from text 
Fix typos

change forbitten to forbidden

fix styling issue and copypaste

improve code style for aspec_memberships_controller.rb with rubocop

fix styling issues

aligned elements of hash literals

fix typo

fix locale name and styling of its usage

fix failing tests

closes #6554
 2016-01-20 21:37:02 +01:00
augier
054971c7de Big refactor on mobile comments 2016-01-15 15:54:34 +01:00
Marien Fressinaud
bde3b47c02 [WIP] [mobile] Embedded new comment form in HTML 2016-01-15 15:54:34 +01:00
Dennis Schubert
053625c277 Merge branch 'stable' into develop 2016-01-13 23:11:35 +01:00
Dennis Schubert
e30019988f Merge branch 'master' into stable 2016-01-13 23:10:27 +01:00
Dennis Schubert
5aef0441e8 Merge branch 'release/0.5.6.0' 2016-01-13 23:09:51 +01:00
Jonne Haß
aa6e4ec0d2 Merge pull request #6631 from svbergerem/white-color-theme 
White color theme
 2016-01-12 16:35:42 +01:00
Jonne Haß
ec0ba06857 Merge branch 'stable' into develop 2016-01-12 16:26:04 +01:00
Benjamin Neff
4cb6afdc94 fix plurals (10-19 was handled as 'one') 
closes #6630
 2016-01-12 16:25:26 +01:00
Jonne Haß
4fe9bb0bfe Merge branch 'stable' into develop 2016-01-12 16:08:33 +01:00
Benjamin Neff
96677c14d1 update rubocop.yml 
* ignore bin folder (generated files)
* allow same length for modules as for classes

closes #6635
 2016-01-12 16:08:27 +01:00
Steffen van Bergerem
5bd15e23f8 Clean up scss code for original white background 2016-01-10 00:48:30 +01:00
jpope
cab192b69e add original white background color theme 2016-01-10 00:48:30 +01:00
Dennis Schubert
cb3f269218 Merge branch 'stable' into develop 2016-01-09 20:11:20 +01:00
Steffen van Bergerem
e99ecd259c Update markdown-it 
closes #6626
 2016-01-09 20:11:15 +01:00
Steffen van Bergerem
67922f8ad4 Merge pull request #6483 from Flaburgan/add-not-connected-header-to-mobile 
Add header on not connected pages on mobile version
 2016-01-08 13:33:04 +01:00
Jonne Haß
baeff22451 Merge pull request #6095 from AugierLe42e/openid 
OpenID Connect
 2016-01-06 12:30:15 +01:00
Dennis Schubert
439ea693a0 Merge pull request #6617 from manuelVo/ignored-user-show-posts-on-profile 
Show posts of ignored users on their profile page
 2016-01-06 10:48:50 +01:00
Dennis Schubert
ccd10d2873 Merge branch 'stable' into develop 2016-01-06 01:05:03 +01:00
Dennis Schubert
65a28fcde0 Start 0.5.7.0 cycle 
[ci skip]
 2016-01-06 01:04:27 +01:00
Dennis Schubert
40e780abcf Merge branch 'stable' into develop 2016-01-06 00:49:15 +01:00
Benjamin Neff
812510b44a refactoring tests again 
closes #6595
 2016-01-06 00:47:55 +01:00
cmrd Senya
b6c7f004e4 Further receive tests development 2016-01-06 00:47:42 +01:00
cmrd Senya
2aaf45166b bump diaspora_federation 2016-01-06 00:47:42 +01:00
cmrd Senya
56f022f28c Fix a few issues with public receiver which include: 
* Make Retraction be allowed to be received publicly (probably just never used before anywhere)
* Since public receiver bypasses @object.receive in some cases add the author signature verification for relayables to protect from relayables forgery
* xml_author was wrong in some cases for RelayableRetraction
 2016-01-06 00:46:14 +01:00
cmrd Senya
e54f87b7a6 Add rspec persistance file 2016-01-06 00:46:14 +01:00
Jonne Haß
764a3fec1d Merge branch 'stable' into develop 2016-01-05 21:34:11 +01:00