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

1333 commits

Author SHA1 Message Date
Dennis Schubert
832a56134b Merge pull request #6723 from SuperTux88/fix-share_visibilities 
Link share visibilities directly with users
 2016-03-04 12:05:40 +01:00
Dennis Schubert
75c3e6068c Merge branch 'stable' into develop 2016-03-03 17:58:05 +01:00
Steffen van Bergerem
b98af83c9d Sort tag search result by name 
closes #6734
 2016-03-03 17:57:58 +01:00
Dennis Schubert
7c88fb7936 Merge pull request #6586 from cmrd-senya/drop-signatures 
Remove parent author signature for relayables from the DB
 2016-03-03 17:39:28 +01:00
Steffen van Bergerem
6bf5f0ee9e Add Changelog for #6621 [ci skip] 2016-03-02 22:03:47 +01:00
Dennis Schubert
51eb3a79fc Merge pull request #6718 from svbergerem/fix-contacts-page-notification-count 
Fix notification count change on contacts page
 2016-02-25 09:26:34 +01:00
Steffen van Bergerem
d9e3f3a734 Merge branch 'stable' into develop 2016-02-23 09:38:53 +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
Dennis Schubert
dbdf352a6b Merge branch 'stable' into develop 2016-02-23 06:35:26 +01:00
Steffen van Bergerem
0392549702 Add footer on conversations page 
closes #6710
 2016-02-23 06:35:15 +01:00
Dennis Schubert
535057aca4 Merge branch 'stable' into develop 2016-02-21 04:26:25 +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
Dennis Schubert
3d3e82f7f0 Merge branch 'stable' into develop 2016-02-21 04:20:19 +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
f8f05371e0 Merge pull request #6394 from AugierLe42e/mobile-js-refactor 
Mobile JS refactor
 2016-02-15 22:22:35 +01:00
Dennis Schubert
bad6d74603 Merge pull request #6693 from svbergerem/fix-eye 
Fix eye not stopping all processes
 2016-02-11 10:26:48 +01:00
Dennis Schubert
677bddc3d3 Merge branch 'stable' into develop 2016-02-09 12:42:26 +01:00
Steffen van Bergerem
ac5a7746e2 Remove contacts_title method and translations 
closes #6687
 2016-02-09 12:42:21 +01:00
Dennis Schubert
4f2c6942a5 Merge pull request #6686 from svbergerem/remove-stream-faces 
Remove stream faces
 2016-02-08 19:10:37 +01:00
Dennis Schubert
5b21be845e Merge branch 'stable' into develop 2016-02-08 08:21:35 +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
Dennis Schubert
695ca83638 Merge branch 'stable' into develop 2016-02-08 08:18:33 +01:00
Steffen van Bergerem
f9f5e990f9 Remove bidi-override for author names 
closes #6680, closes #4785
 2016-02-08 08:16:37 +01:00
Dennis Schubert
5933c63a4a Merge pull request #6684 from svbergerem/fix-mobile-js-avatar-upload 
Fix uncaught type error for mobile avatar upload
 2016-02-08 08:01:21 +01:00
Dennis Schubert
9f6cc7cf12 Merge pull request #6683 from svbergerem/fix-mobile-500-like 
Fix 500 for mobile like without javascript
 2016-02-08 08:00:07 +01:00
Dennis Schubert
73ab7e253e Merge pull request #6681 from svbergerem/mobile-getting-started-completed 
Mark getting started as completed on mobile website
 2016-02-08 07:58:29 +01:00
Dennis Schubert
a87f313927 Merge pull request #6679 from svbergerem/post-report-reason-in-mail 
Add reason for post report to email sent to admins
 2016-02-08 07:56:49 +01:00
Dennis Schubert
15d5e0febc Merge branch 'stable' into develop 2016-02-07 16:31:53 +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
c867fb6e26 Add mussing hash key in Changelog 
[ci skip]
 2016-02-07 05:57:29 +01:00
Dennis Schubert
d67ec12913 Merge branch 'Faldrian-3307-collapse_long_images' into develop 2016-02-07 05:55:14 +01:00
Dennis Schubert
26e37c46bd Merge branch 'svbergerem-textarea-autosize' into develop 2016-02-07 05:39:49 +01:00
Dennis Schubert
868a45e3e0 Merge branch 'svbergerem-unify-ui' into develop 2016-02-07 05:29:08 +01:00
Steffen van Bergerem
936460e874 Merge branch 'stable' into develop 2016-02-06 15:40:16 +01:00
Dennis Schubert
87ef4446e1 Remove uma.jpg and wolf.jpg 
closes #6673
 2016-02-06 15:39:38 +01:00
Steffen van Bergerem
0c34452840 Merge pull request #6654 from korun/set-default-resize-style-01 
CSS: set "resize: vertical" as default for textarea
 2016-02-06 12:00:44 +01:00
Steffen van Bergerem
0c05b474c5 Merge pull request #6509 from AugierLe42e/fix-mobile-comment 
Refactor mobile comment section
 2016-02-05 11:30:04 +01:00
Jonne Haß
32bda8fe20 Merge branch 'stable' into develop 2016-01-28 18:47:18 +01:00
Faldrian
8e3816e64e let mention-regex only match usable strings 
closes #6658
 2016-01-28 18:47:13 +01:00
Jonne Haß
762299b6ad Merge branch 'stable' into develop 2016-01-28 16:36:46 +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
Steffen van Bergerem
7e297ea18a Add changelog entry for #6641 [ci skip] 2016-01-27 00:09:58 +01:00
Dennis Schubert
7c197756dd Merge branch 'stable' into develop 2016-01-26 15:19:55 +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
8da3cc0852 Merge branch 'stable' into develop 2016-01-26 14:33:36 +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
Dennis Schubert
5f986464da Drop Redis namespace support 2016-01-24 07:29:28 +01:00
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
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
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
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
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
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
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
Steffen van Bergerem
079d5ab298 Merge branch 'stable' into develop 2016-01-04 14:19:53 +01:00
Steffen van Bergerem
09e2c1af2e Mention media.ccc.de in the changelog [ci skip] 2016-01-04 14:19:44 +01:00
Jonne Haß
434deaa75a Merge branch 'stable' into develop 2015-12-29 13:07:08 +01:00
Steffen van Bergerem
f3e897ab43 Activate hovercards for logged out users 
closes #6603
 2015-12-29 13:07:03 +01:00
Dennis Schubert
86fead30a4 Merge branch 'stable' into develop 2015-12-20 00:47:42 +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
Jonne Haß
179964fd15 Merge branch 'stable' into develop 2015-12-17 01:20:31 +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
Jonne Haß
13029235d0 Merge branch 'stable' into develop 2015-12-13 12:28:04 +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
Jonne Haß
21cb1f44cd Merge branch 'stable' into develop 2015-12-08 17:30:32 +01:00
apsc92
fdb3ae5cb8 Fix_notifications_timestamp_issue #4826 
closes #6573
 2015-12-08 17:30:27 +01:00
Steffen van Bergerem
75e3085ca9 Merge branch 'stable' into develop 2015-11-27 12:46:46 +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ß
086931d745 Merge branch 'stable' into develop 2015-11-23 03:13:13 +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
Dennis Schubert
5081d69847 Merge branch 'stable' into develop 2015-11-22 02:52:37 +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
Jonne Haß
17d0ddab41 Merge branch 'stable' into develop 2015-11-18 03:37:34 +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ß
c6939361ee Revert "Revert "Force flash message width to 80% of screen on small devices"" 
This reverts commit 53a7d36e44.
 2015-11-13 16:04:32 +01:00
Jonne Haß
f2091f3b73 Merge branch 'stable' into develop 2015-11-13 16:03:44 +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
Jonne Haß
5de0655e54 Merge branch 'stable' into develop 2015-11-13 14:31:10 +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
Jonne Haß
910e9e815c Merge pull request #6543 from manuelVo/5485-mobile-empty-comment-handling 
Do not disable submit button if comment is empty in mobile view
 2015-11-13 03:56:36 +01:00
Steffen van Bergerem
3c43819bce Merge pull request #6504 from sarithats/fix/login_button 
Change login button color
 2015-10-21 08:16:54 +02:00
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