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

14839 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jason Robinson
831af6507d Merge pull request #5006 from taratatach/4940-mention-notification-not-marked-as-read-when-viewing-post 
Set mention notification as read when viewing post
 2014-06-27 10:17:01 +03:00
Jason Robinson
c6f2691cc3 Merge pull request #5009 from taratatach/4951-sharing-notification-not-marked-as-read-when-visiting-profile 
Set sharing notification as read
 2014-06-27 10:16:17 +03:00
Hincu Petru
1d09978440 Fix hidding of poll publisher for close action 2014-06-25 10:54:00 +00:00
Hincu Petru
653612b74d Remove posts for ignored person 2014-06-25 08:56:12 +00:00
Jason Robinson
b246c7b5ef Merge branch 'master' into develop 2014-06-24 22:26:20 +03:00
Jason Robinson
98ab4ff5d2 Merge branch 'hotfix-0.4.0.1-post-report' 2014-06-24 22:25:15 +03:00
Jason Robinson
c7536e523a Re-bump version to 0.4.0.1 2014-06-24 22:23:26 +03:00
Lukas Matt
3108926dc3 Reports email notification; wrong recipient 
The mailer uses the person_id to find a user
which cannot work on a production environment.

I haven't used a remote user on my test setup.

(cherry picked from commit 01a45ccf40)
 2014-06-24 22:20:53 +03:00
Jason Robinson
e776beed11 Merge pull request #5020 from Zauberstuhl/reports_email_notification_bug 
[Bug] Reports email notification; wrong recipient
 2014-06-24 22:17:25 +03:00
Jason Robinson
bd4dea608a Merge branch 'hotfix/0.4.0.1' into develop 
Conflicts:
	Changelog.md
	config/defaults.yml
 2014-06-24 22:08:07 +03:00
Jason Robinson
d7249b245d Merge branch 'hotfix/0.4.0.1' 2014-06-24 22:01:24 +03:00
Jason Robinson
90dd5d3868 Bump to 0.4.0.1 2014-06-24 22:01:12 +03:00
Jason Robinson
d18e48952c Use different user.construct_public_followings_sql query depending on database backend. 
This is done for performance reasons as a temporary fix for problems with 0.4.0.0 on MySQL. This madness is explained in issue https://github.com/diaspora/diaspora/issues/5014.

(cherry picked from commit 80075c13f4)
 2014-06-24 21:57:21 +03:00
Jonne Haß
32747ffc65 Merge pull request #5026 from jaywink/hotfix-mysql-madness-develop 
Use different user.construct_public_followings_sql query depending on database backend
 2014-06-24 19:23:07 +02:00
Jason Robinson
80075c13f4 Use different user.construct_public_followings_sql query depending on database backend. 
This is done for performance reasons as a temporary fix for problems with 0.4.0.0 on MySQL. This madness is explained in issue https://github.com/diaspora/diaspora/issues/5014.
 2014-06-24 17:07:40 +03:00
Lukas Matt
01a45ccf40 Reports email notification; wrong recipient 
The mailer uses the person_id to find a user
which cannot work on a production environment.

I haven't used a remote user on my test setup.
 2014-06-23 15:54:25 -04:00
Jason Robinson
c475a3985e start new development cycle 2014-06-22 19:32:23 +03:00
Jason Robinson
98ff4d4bbd Merge branch 'release/0.4.0.0' into develop 2014-06-22 19:02:00 +03:00
Jason Robinson
569871ea2a Merge branch 'release/0.4.0.0' 2014-06-22 19:01:39 +03:00
Jason Robinson
51ecae1b77 bump to 0.4.0.0 2014-06-22 19:01:31 +03:00
Jonne Haß
d3ac1dbf90 updated 77 locale files [ci skip] 2014-06-22 15:08:40 +02:00
Jonne Haß
b7d310f318 Merge pull request #5012 from goobertron/changelog 
Update changelog

Conflicts:
	Changelog.md
 2014-06-22 15:03:23 +02:00
Jonne Haß
96fa96b88c Merge pull request #5007 from jaywink/revert-mobile-bookmarklet-fix 
Revert "Fix toggling services for mobile bookmarklet"
 2014-06-22 15:01:34 +02:00
Jonne Haß
07f6a3bbd5 Merge pull request #5008 from jaywink/bookmarklet-notes-linefeeds 
Fix broken bookmarklet if params have encoded linefeeds.
 2014-06-22 15:01:19 +02:00
goobertron
184f6225df Update changelog to reference fixes rather than bug reports, fix couple of typos. 2014-06-22 13:34:31 +01:00
Jason Robinson
126ced4383 Fix broken bookmarklet if params have encoded linefeeds. 
Closes #4994
 2014-06-22 11:48:24 +03:00
Jason Robinson
a6c983b76d Merge pull request #5010 from Chocobozzz/patch-1 
Fix typo
 2014-06-20 15:02:43 +03:00
Bigard Florian
2458568349 Fix typo 2014-06-20 11:17:54 +02:00
Erwan Guyader
f92dd85748 Set sharing notification as read 
Fix issue #4951

  If the displayed user (on her profile) started sharing with the
current user, mark the notification as read
 2014-06-20 10:55:17 +02:00
Erwan Guyader
126252d47a Add test for mention notifications 2014-06-20 01:23:53 +02:00
Jason Robinson
e4e9f40b2c Revert "Fix toggling services for mobile bookmarklet" 
This fixed the toggling of services, but broke the actual
bookmarklet :)

This reverts commit 1bd7989045.
 2014-06-19 21:47:34 +03:00
Erwan Guyader
48a3909fe0 Set mention notification as read when viewing post 
- If a mention for the current user and the displayed post exists,
    mark it as read
  - Use set_read_state instead of manually setting unread as false
 2014-06-19 00:15:55 +02:00
Jonne Haß
0843db468e Merge pull request #5001 from Zauberstuhl/fixed_unauthorized_report_prompt 
Hide SPV controls unless authenticated
 2014-06-18 21:45:27 +02:00
Lukas Matt
c86b57fe8f Fixed overridden interactions by re-initializing 2014-06-18 13:03:07 -04:00
Jason Robinson
773340de67 Merge pull request #5002 from taratatach/4999-show-more-in-mobile-aspects-stream-redirects-to-my-activity 
Load right stream with Show More on mobile
 2014-06-18 13:02:11 +03:00
Jonne Haß
ccae3a1c64 lock nokogiri to 1.6.1, closes #4996 2014-06-18 11:44:46 +02:00
Erwan Guyader
3ebc0f0387 Test returned path for Show More on mobile 
- Added test when the currant page is Aspects Stream
  - Modified test for the Stream page to account for the new possibility
    (i.e current page is Aspects Stream)
 2014-06-17 21:36:38 +02:00
Erwan Guyader
e804f30823 Code style + allow aspects to be nil 
- Only use old hash style
  - Don't replace the aspect ids list with an empty array if it's nil
 2014-06-17 21:19:17 +02:00
Lukas Matt
10117b81b3 Hide report icon on SPV if author is current user 2014-06-17 12:23:54 -04:00
Lukas Matt
dec7ef667e Hide SPV controls unless authenticated 
* cleaned and removed dead code

refs diaspora/diaspora#4711
 2014-06-17 11:31:16 -04:00
Erwan Guyader
499eb6a9bb Load right stream with Show More on mobile 
- Load aspects stream if user is on this stream instead of loading the
    activity stream
 2014-06-16 18:13:05 +02:00
Jonne Haß
f23fb6b6cb Actually allow false as a value for sidekiq.backtrace in our Sidekiq 
middleware
 2014-06-13 16:04:40 +02:00
Jonne Haß
fadd707ae0 Merge pull request #4985 from jaywink/fix-mobile-bmarklet-services 
Fix toggling services for mobile bookmarklet
 2014-06-03 00:07:27 +02:00
Jason Robinson
1bd7989045 Fix toggling services for mobile bookmarklet 2014-06-02 23:29:47 +03:00
Jonne Haß
72d1ed8f7d bump acts-as-taggable-on 2014-06-01 18:42:51 +02:00
Jonne Haß
b20712e1ad Merge pull request #4976 from jaywink/4949-post-submit-actions 
Hint that something is happening when user submits status message via publisher
 2014-06-01 17:36:11 +02:00
Jonne Haß
1a3b4561a5 Merge pull request #4977 from diaspora/update_gems 
Update gems
 2014-06-01 15:31:25 +02:00
Jason Robinson
ad0982f35e Remove custom bookmarklet error message. 
Flash error is shown on bookmarklet post error. On error, return post_something message to form
 2014-06-01 15:37:54 +03:00
Jason Robinson
f130ab3842 Remove double setButtonsEnabled in publisher error 2014-06-01 15:17:16 +03:00
Jason Robinson
6cf484c9a3 Make sure publisher is totally hidden in bookmarklet after post success 2014-06-01 15:02:40 +03:00