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

990 commits

Author SHA1 Message Date
Benjamin Neff
d97448e552 remove ChromeFrame 
Google Chrome Frame was a plugin for Internet Explorer, but is no longer
supported. And it was included with http and not https which triggered a
warning on most pods.

Also set the minimum version to 9 to support #6557

closes #6751
 2016-03-21 14:04:24 +01:00
Benjamin Neff
6ea8cd546e don't change AppConfig.environment.url in jsxc_helper_spec 
closes #6748
 2016-03-18 07:24:40 +01:00
Dennis Schubert
4cb4ee0b5a Merge branch 'master' into stable 2016-03-08 22:55:51 +01:00
Dennis Schubert
352d732a37 Disable fetching of root posts for relayables 
since that could allow fetching spoofed/altered posts
thanks @supertux88
 2016-03-08 22:41:26 +01:00
Dennis Schubert
6270e22226 Start hotfix 0.5.7.1 2016-03-08 22:25:21 +01:00
Steffen van Bergerem
b98af83c9d Sort tag search result by name 
closes #6734
 2016-03-03 17:57:58 +01:00
Dennis Schubert
9f2e5b1868 Only mark unread notifications as read otherwise, the UPDATE statement would update all the notifications... 
closes #6711
 2016-02-23 09:38:34 +01:00
Steffen van Bergerem
0392549702 Add footer on conversations page 
closes #6710
 2016-02-23 06:35:15 +01:00
Steffen van Bergerem
374679c093 Add rspec test for reset_authentication_token without current_user 
closes #6707
 2016-02-21 04:26:12 +01:00
Steffen van Bergerem
02b330de70 Add jasmine test for aspect name form on contacts page 
closes #6706
 2016-02-21 04:19:33 +01:00
Steffen van Bergerem
ac5a7746e2 Remove contacts_title method and translations 
closes #6687
 2016-02-09 12:42:21 +01:00
Steffen van Bergerem
f066daedbb Disable share button in mobile publisher on submit 
closes #6682, closes #6330
 2016-02-08 08:20:24 +01:00
Steffen van Bergerem
f9f5e990f9 Remove bidi-override for author names 
closes #6680, closes #4785
 2016-02-08 08:16:37 +01:00
Steffen van Bergerem
785665b9ad Fix mobile registration layout after failed registration 
closes #6677
 2016-02-07 16:31:48 +01:00
Dennis Schubert
87ef4446e1 Remove uma.jpg and wolf.jpg 
closes #6673
 2016-02-06 15:39:38 +01:00
Faldrian
8e3816e64e let mention-regex only match usable strings 
closes #6658
 2016-01-28 18:47:13 +01:00
Sayed Abdelhaleem
8c0d12b6d3 fix NameError: uninitialized constant User::Zip by specifying rubzip gem main file name in Gemfile 
closes #6659
 2016-01-28 16:36:40 +01:00
Dennis Schubert
211365c169 Merge branch 'master' into stable 2016-01-26 15:19:27 +01:00
Dennis Schubert
ad20bb052c Fix include_root_in_json misuse 
since it is no longer exposed for instances, our post_presenter failed
hard.
 2016-01-26 15:18:02 +01:00
Dennis Schubert
72fe5a79c2 Prepeare 0.5.6.3 hotfix-hotfix 2016-01-26 14:59:33 +01:00
Dennis Schubert
6153fc7286 Merge branch 'hotfix/0.5.6.2' into stable 2016-01-26 14:30:34 +01:00
Dennis Schubert
33af30529a Bump rails 2016-01-26 14:28:02 +01:00
Dennis Schubert
c04ee239c6 Prepare 0.5.6.2 hotfix 2016-01-26 14:26:10 +01:00
Benjamin Neff
44ab0df02b fix suppress_annoying_errors 
closes #6653
 2016-01-24 07:14:58 +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
072ce711d2 Merge branch 'master' into stable 2016-01-22 01:41:49 +01:00
Steffen van Bergerem
18a46d9f90 Fix Changelog [ci skip] 2016-01-21 21:12:37 +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
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
Benjamin Neff
4cb6afdc94 fix plurals (10-19 was handled as 'one') 
closes #6630
 2016-01-12 16:25:26 +01:00
Steffen van Bergerem
09e2c1af2e Mention media.ccc.de in the changelog [ci skip] 2016-01-04 14:19:44 +01:00
Steffen van Bergerem
f3e897ab43 Activate hovercards for logged out users 
closes #6603
 2015-12-29 13:07:03 +01:00
Dennis Schubert
c238329cd8 Merge branch 'master' into stable 2015-12-20 00:41:49 +01:00
Dennis Schubert
3028b283e4 Bump nokogiri 2015-12-20 00:27:11 +01:00
Steffen van Bergerem
e20f2ae566 Fix XSS in sharing message 2015-12-20 00:15:32 +01:00
Steffen van Bergerem
2025fae420 Disable hovercards for logged out users and prevent redirect to sign in page 
closes #6587
 2015-12-17 01:20:24 +01:00
cmrd Senya
f0fc62e94d Fix a security issue that author_signature is not checked on the to-downstream receive of a federated relayable entity, allowing to forge relayables if you are an owner of the pod where a parent object is stored. 
closes #6539
 2015-12-13 12:26:59 +01:00
apsc92
fdb3ae5cb8 Fix_notifications_timestamp_issue #4826 
closes #6573
 2015-12-08 17:30:27 +01:00
Manoj Mishra
ab21e6b134 Fix: Adding mention through paste user name from clipboard is not successfull 
Input buffer wasn't getting updated with the user input when user did a
paste from clipboard, it caused search for the available contacts
to not trigger

closes #6510
 2015-11-27 12:46:02 +01:00
Jonne Haß
29d10a42f8 start 0.5.6.0 cycle 2015-11-23 03:12:00 +01:00
Jonne Haß
5f2e0907b7 freeze 0.5.5.0 2015-11-23 03:10:46 +01:00
Jason Robinson
9a35a0d8dd Add participation to root.author on receiving reshare 
When author of the root post receives a reshare to it, no participation is added to the root author on the reshare. This causes any comments on the reshare on remote pods not to be sent to the author. Adding a participation should subscribe to the reshare and thus bring added comments back to the author.

closes #6481
 2015-11-22 02:50:38 +01:00
Manuel Vögele
0925a26506 Do not add participation for comment if comment validation failed The same fix is also done for the other social actions 
closes #6552
 2015-11-18 03:16:54 +01:00
Jonne Haß
53a7d36e44 Revert "Force flash message width to 80% of screen on small devices" 
This reverts commit e731bb86c5.
 2015-11-13 15:59:18 +01:00
Augier
e731bb86c5 Force flash message width to 80% of screen on small devices 
closes #6529
 2015-11-13 14:31:06 +01:00
Steffen van Bergerem
995ce18c37 Display publisher on user profile path 
closes #6503
 2015-10-15 05:58:38 +02:00
cmrd Senya
69b46df3d6 Notifications for comments on local posts by non-contacts 2015-10-14 22:32:19 +02:00