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

17659 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jonne Haß
0515c33769 Use double quotes when embeding translations in JS 
Translations commonly include single quotes, which closes
the JavaScript string unexpectedly. Closes #5055
 2014-07-03 22:57:42 +02:00
Utah Kate Newman
7f2b3d3bf3 replaces blue comment box border and box shadow with gray border and no box shadow 2014-07-02 16:31:29 -07:00
Jonne Haß
e4246b6fdd Bump Rails to 3.2.19 
Rails 3.2.19 fixes a possible SQL-Injection when using the PostgreSQL
adapter. However this is only exploitable when using the "bit" type,
which we don't.
 2014-07-02 22:17:21 +02:00
Jason Robinson
e6086bbcbb Merge pull request #5046 from Raven24/admin_backend 
[ready] admin backend improvements
 2014-07-02 09:22:37 +03:00
Florian Staudacher
13b716a449 allow admins to close user accounts from the backend 
* thanks to @maxwell for the initial work on this

port admin pages to bootstrap
* improve user view on admin search page
* add 'close account' link to each user in the search results
* keep the same blue color for the admin menu

some refactoring of the routes and the admin code
* try to be more RESTful (possibly)
* use a 'UserSearch' model for search parameters and querying

add changelog entry
 2014-07-01 23:33:15 +02:00
Maxwell Salzberg
cc53e1762b A podmin can now disable a spam account from the interface. 2014-07-01 17:51:39 +02:00
Jonne Haß
5a3d329703 Merge pull request #5049 from kpcyrd/aspect-edit-fix 
Fix broken aspect-edit sidebar update

Conflicts:
	app/assets/javascripts/aspect-edit-pane.js
 2014-07-01 14:49:53 +02:00
Jonne Haß
12c507d6a2 Merge pull request #5048 from kpcyrd/fix-5031 
Fix self-xss issue in contact-group-rename
 2014-07-01 14:44:41 +02:00
Jonne Haß
6fb6a08980 Merge pull request #4945 from hpetru/notifications 
Refactoring Notification#notify
 2014-07-01 14:33:54 +02:00
Jonne Haß
47b7434263 update changelog [ci skip] 2014-07-01 14:31:00 +02:00
Jonne Haß
f86b19efee Merge pull request #5047 from pablocubico/feature/user-menu-styles-minor-fix 
[4703] Minor style fix for user menu
 2014-07-01 14:17:04 +02:00
Jonne Haß
311d7e3bcc Merge pull request #5050 from pablocubico/feature/4466-port-help-page-to-bootstrap 
[4466] help page ported to bootstrap
 2014-07-01 14:15:24 +02:00
Pablo Cuadrado
45d04a44ea added title_header key for the Help header, only for EN lang so far 2014-07-01 06:19:29 -03:00
Pablo Cuadrado
14fbd7b205 help page ported to bootstrap 2014-07-01 05:56:49 -03:00
kpcyrd
6833ca46bb Fix broken aspect-edit sidebar update 2014-07-01 00:33:17 +02:00
kpcyrd
20ffa8fa13 Fix another self-xss issue 2014-07-01 00:12:26 +02:00
kpcyrd
fb4898c4fa Fix self-xss issue in contact-group-rename 2014-06-30 21:32:46 +02:00
Pablo Cuadrado
4232d830ee left padding added, unnecesary cursor pointer removed 2014-06-29 18:24:54 -03:00
Pablo Cuadrado
7aa1028cbe minor style fix for user menu 2014-06-29 15:12:30 -03:00
Jason Robinson
c9552c2cd9 Merge pull request #5030 from hpetru/5029-hide-poll-input-after-post-submit 
Fix hiding poll publisher for close action
 2014-06-27 11:12:52 +03:00
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