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

3577 commits

Author SHA1 Message Date
Benjamin Neff
99b7229d5a Merge branch 'next-minor' into develop 2016-11-22 03:55:12 +01:00
Steffen van Bergerem
0051d6a0b8 Move comment, like and reshare creation error translations 
closes #7202
 2016-11-22 03:54:56 +01:00
Steffen van Bergerem
6c5c865b15 Use error message from the server when reshare failed 2016-11-22 03:53:01 +01:00
Steffen van Bergerem
8078c60cee Refactor aspect membership error response handling with flash messages 2016-11-22 03:53:01 +01:00
Steffen van Bergerem
8cd26054c8
Merge branch 'next-minor' into develop 2016-11-18 15:29:00 +01:00
Augier
af331bfb30
Add collection to app.views.NotificationDropdown and app.views.Notifications 
closes #6952
 2016-11-18 15:27:37 +01:00
Dennis Schubert
8fb17f8e2c
Merge branch 'next-minor' into develop 2016-11-06 02:41:46 +01:00
Benjamin Neff
851c16d80c
Add setting for a custom changelog url. 
fixes #7073

closes #7166
 2016-11-06 02:41:42 +01:00
Dennis Schubert
48cb2aca1d
Merge branch 'next-minor' into develop 2016-11-06 02:41:12 +01:00
Benjamin Neff
704e5bd399
Remove unused /user/getting_started_completed route 
The used one is /getting_started_completed

closes #7164
 2016-11-06 02:41:08 +01:00
Dennis Schubert
ead2ba8edf
Merge branch 'next-minor' into develop 2016-11-06 02:40:11 +01:00
Benjamin Neff
57c0330535
Schedule a connection-check when receiving a message from an offline pod 
closes #7158
 2016-11-06 02:40:05 +01:00
Dennis Schubert
0c78fcaae7
Merge branch 'next-minor' into develop 2016-11-06 02:34:16 +01:00
Benjamin Neff
08282cea01
Add dark theme 
Also renamed "Original Dark" to "Original Gray", because it isn't "dark".

closes #7152
 2016-11-06 02:34:11 +01:00
Dennis Schubert
260cc23357
updated 29 locale files [ci skip] 2016-11-06 02:31:20 +01:00
Benjamin Neff
694d4cbc0f Merge branch 'next-minor' into develop 2016-11-02 23:03:36 +01:00
Steffen van Bergerem
2ec45317a3 Add new JSON endpoint for reshares 2016-11-02 22:59:25 +01:00
Dennis Schubert
ad1b2793eb
Merge branch 'next-minor' into develop 2016-10-30 00:15:20 +02:00
Dennis Schubert
b78ef83c23
Merge branch 'release/0.6.1.0' into next-minor 2016-10-30 00:15:12 +02:00
Benjamin Neff
e18627f542
Suppress deprecation warning: disable csp in report-only mode 2016-10-30 00:14:23 +02:00
Dennis Schubert
69ec1d6fe8
Merge branch 'next-minor' into develop 2016-10-28 00:36:22 +02:00
Benjamin Neff
16cd4752cb
Move auth_token to users controller 
This token is only used for the chat, it isn't an official API.
 2016-10-28 00:36:14 +02:00
Dennis Schubert
368e6d9ef5
Start 0.6.2.0 cycle 
[ci skip]
 2016-10-27 02:29:14 +02:00
Dennis Schubert
402d87729c
Merge branch 'next-minor' into develop 2016-10-27 02:26:57 +02:00
Benjamin Neff
4f6018c74a
Bump secure_headers 
closes #7151
 2016-10-27 02:26:52 +02:00
Dennis Schubert
75aaf869c5
Merge branch 'next-minor' into develop 2016-10-27 02:26:15 +02:00
Benjamin Neff
0dd98a5c13
Bump diaspora_federation 
closes #7145
 2016-10-27 02:26:11 +02:00
Dennis Schubert
3025b028e7
Merge branch 'next-minor' into develop 2016-10-27 02:22:33 +02:00
cmrd Senya
a80806ca58
Fix ID token issuer field to match discovery data 
OpenID Connect spec says:

"The issuer returned by discovery MUST exactly match the value of iss in the ID Token."

https://openid.net/specs/openid-connect-core-1_0.html#IssuerIdentifier

closes #7081
 2016-10-27 02:22:27 +02:00
Benjamin Neff
2c0a2db848 Merge branch 'next-minor' into develop 2016-10-26 02:50:00 +02:00
hilkoc
b7791e6c9d Add user setting for default post visibility 
fixes #4319

closes #7118
 2016-10-26 02:48:11 +02:00
Steffen van Bergerem
fa4f7ff2d8
Merge branch 'next-minor' into develop 2016-10-01 02:37:02 +02:00
Benjamin Neff
1c1c9d6794
Link to diaspora* admin dashboard 
closes #7130
 2016-10-01 02:36:55 +02:00
Dennis Schubert
c41fd52f1d
Merge branch 'next-minor' into develop 2016-09-30 02:11:36 +02:00
Benjamin Neff
ec8a49b338
Add settings for CSP to diaspora.yml 
closes #7128
 2016-09-30 02:11:32 +02:00
Benjamin Neff
caef670934
Configure CSP header for services from diaspora.yml 2016-09-30 02:10:37 +02:00
Benjamin Neff
edf6602099
Add frame-src but don't spam the log with DEPRECATION warnings. 
This is an ugly hack, and it should be reverted once we stop supporting
old browsers.
 2016-09-30 02:10:37 +02:00
Benjamin Neff
6ec0fd4b9f
Add nonce to javascript tags 2016-09-30 02:10:37 +02:00
Benjamin Neff
4da1c78bb7
Add secure_header gem to add some security related headers 
basic config for Content Security Policies
 2016-09-30 02:10:37 +02:00
Steffen van Bergerem
e08b775507
Merge branch 'next-minor' into develop 2016-09-30 00:33:16 +02:00
Steffen van Bergerem
2a697c5d1f
Remove inbox.js from precompiled assets 
closes #7108
 2016-09-30 00:33:12 +02:00
Augier
e424896822
Fully port conversations to Backbone and drop inbox.js 2016-09-30 00:32:46 +02:00
Steffen van Bergerem
3437c4d5cb
Merge branch 'next-minor' into develop 2016-09-28 22:00:10 +02:00
Benjamin Neff
be33b425ba
remove unused precompiled JS files 2016-09-28 21:59:08 +02:00
Benjamin Neff
fccabf9983
Extract mobile bookmarklet JS to file 2016-09-28 21:59:08 +02:00
Benjamin Neff
14304f3620
Extract profile photo uploader to file 2016-09-28 21:59:08 +02:00
Dennis Schubert
5437af74a3
Merge branch 'next-minor' into develop 2016-09-25 02:59:00 +02:00
Benjamin Neff
0e5141dd67
Fix mapbox API URL 
closes #7066
 2016-09-25 02:58:56 +02:00
Dennis Schubert
78083afe38
Undo accidential dev->next-minor merge 
Turns out there is a difference between hg and git and I should not
switch that often.
 2016-09-20 02:04:04 +02:00
Dennis Schubert
f6e5fa1d13
Merge branch 'svbergerem-fix-bundler-require' into next-minor 2016-09-20 01:47:12 +02:00
Dennis Schubert
bc9cf77e8d
Merge branch 'master' into next-minor 2016-09-20 01:46:45 +02:00
Steffen van Bergerem
f6870c1c4d
Require installed optional groups with Bundler 2016-09-20 01:42:59 +02:00
Dennis Schubert
c39a661861
Init 0.6.0.1 hotfix 2016-09-20 01:40:40 +02:00
Steffen van Bergerem
327cabe6fe Add number of unreviewed reports to admin dashboard and admin sidebar 
closes #7109
 2016-09-18 22:48:05 +02:00
Lance Gilbert
a9d77c6b1b Enable setting BOSH access protocol via chat configuration 
closes #7100
 2016-09-18 22:31:11 +02:00
Steffen van Bergerem
56aec9a978
Require installed optional groups with Bundler 2016-09-12 10:48:46 +02:00
Dennis Schubert
09aef2f145
Merge branch 'next-minor' into develop 2016-09-06 05:08:09 +02:00
Steffen van Bergerem
e27af6ee1a
Redirect logged in users to inviters page when following an invitation link 
closes #7061
 2016-09-06 05:08:04 +02:00
Benjamin Neff
a85c8e75f2 Merge branch 'next-minor' into develop 2016-09-04 03:55:17 +02:00
Steffen van Bergerem
4d51c02432 Add OpenGraph video support 
closes #7043
 2016-09-04 03:55:09 +02:00
Dennis Schubert
fa99009d87
Merge branch 'next-minor' into develop 2016-09-04 03:26:47 +02:00
Steffen van Bergerem
c3de77e0fc
Send notification mails on CSRF fails 
closes #7050
 2016-09-04 03:26:42 +02:00
Steffen van Bergerem
6ad9000f8c
Sign out users with wrong CSRF tokens 
See http://guides.rubyonrails.org/security.html#cross-site-request-forgery-csrf
 2016-09-04 03:26:18 +02:00
Dennis Schubert
0a5df214f2
Merge branch 'next-minor' into develop 2016-09-04 03:06:20 +02:00
Benjamin Neff
b3453c494e
make session-cookie HttpOnly 
closes #7041
 2016-09-04 03:06:15 +02:00
Dennis Schubert
d2a0528b56
Merge branch 'next-minor' into develop 2016-09-04 03:01:55 +02:00
Steffen van Bergerem
08794bc47b
Remove user_photo method from users controller 
closes #7049
 2016-09-04 03:01:51 +02:00
Dennis Schubert
deeabb26af
Merge branch 'release/0.6.0.0' 2016-08-27 00:26:55 +02:00
Dennis Schubert
25f6e852dd
Merge branch 'next-minor' into develop 2016-08-23 01:53:40 +02:00
Dennis Schubert
bcaf99c806
Merge branch 'release/0.6.0.0' into next-minor 2016-08-23 01:53:31 +02:00
Steffen van Bergerem
7f0ffb8b0a
Fix invitation link on people search page 2016-08-23 01:52:25 +02:00
Dennis Schubert
1f9e261231
Merge branch 'stable' into develop 2016-08-22 00:16:27 +02:00
Dennis Schubert
1d61f9aaa8
Merge branch 'release/0.6.0.0' into stable 2016-08-22 00:16:07 +02:00
Dennis Schubert
af9ab2355b
updated 116 locale files [ci skip] 2016-08-22 00:15:54 +02:00
Dennis Schubert
3f157bec35
Prepare 0.7.0.0 cycle 
[ci skip]
 2016-08-21 23:53:42 +02:00
Dennis Schubert
0921cfb43e
Prepare 0.6.1.0 cycle 
[ci skip]
 2016-08-21 23:52:30 +02:00
Denis Hovart
bcace2def2 6840 : meta tags update (#6998) 
* Adds a new metadata helper and methods to PostPresenter to have metas on post pages.

* Adds tests to post controller to check correctness of metas

* Add methods to PersonPresenter to have metas on profile pages

* Correct meta data helper test

* Update PersonPresenter, add test to PeopleController

* Creates TagPresenter. Display tag metas on tag index page

* Updata meta data helper spec

* Not displaying bio as the description meta on profile page for now. Privacy concerns to be cleared.

* Set meta info as hashes in presenters

* Move original hardcoded metas info to config/defaults.yml

* metas_tags include by default the general metas, update views

* Update code style, clean views

* Renames TagPresenter StreamTagPresenter, updates TagController spec

* Add a default_metas entry to diaspora.yml.example

* Align metas hash in presenters, refactor meta data helper

* Use bio as description meta if user has a public profile

* Rename StreamTagPresenter to TagStreamPresenter
 2016-08-18 21:52:39 +02:00
Benjamin Neff
bc6c8a0598 disable registration with invite-code when invitations are closed 
also display message if the user has no invitations left and refactored
InvitationsController spec and remove unused message parameter
 2016-08-13 13:51:28 +02:00
Benjamin Neff
2a553940d4 small design fixes for invites 2016-08-13 01:47:27 +02:00
Benjamin Neff
66b7b7e27a Cleanup legacy invitations from code 
Fixes #5116
 2016-08-13 01:47:27 +02:00
Steffen van Bergerem
1d58df13e3
Change 'no posts yet' message [ci skip] 2016-08-12 23:39:46 +02:00
augier
5c2e241106 Displaying the markdown editor on publisher 2016-08-12 23:08:41 +02:00
Steffen van Bergerem
eae9e01f14
Add 'no posts yet' message to empty streams 2016-08-12 12:55:06 +02:00
Jonne Haß
0a77f045a3
bump to 0.5.10.2 2016-08-11 20:25:20 +02:00
Jonne Haß
7fa299b7ad Merge pull request #6959 from cmrd-senya/devise-upgrade 
Upgrade devise to 4.2
 2016-08-11 12:08:42 +02:00
cmrd Senya
4ae26e1ded Upgrade devise to 4.2 2016-08-11 12:25:36 +03:00
Jonne Haß
1d2132ebba Merge pull request #6965 from SuperTux88/5847-fix-settings-page 
Fix settings page after submit
 2016-08-11 02:29:34 +02:00
Benjamin Neff
71ed7446c1 Fix user settings style after submit 
Fixed:
* wrong url
* broken navigation
* broken design
after saving the user settings

Fixes #5847
 2016-08-11 01:58:47 +02:00
Benjamin Neff
be47c6bcd0 remove redirect hack for devise 
only expose routes from devise that we actually use
 2016-08-11 01:58:47 +02:00
Steffen van Bergerem
11f6ed2b9a
Fix community spotlight styles 2016-08-10 23:13:18 +02:00
Benjamin Neff
86e75a02bb fix privacy settings form submit 2016-08-10 13:16:59 +02:00
Jonne Haß
90abad0152 Merge pull request #6950 from cmrd-senya/consolidate-queues 
Consolidate queues
 2016-08-10 11:46:09 +02:00
Jason Robinson
78299c9e2f Consolidate amount of sidekiq queues from 13 to 5 
Sidekiq documentation says 'Sidekiq is not designed to work well with dozens of queues.'. Having the amount of queues we have at the moment brings no anyway.

Closes #5571
 2016-08-10 08:51:22 +00:00
Steffen van Bergerem
79117d1a46
Merge pull request #6944 from AugierLe42e/bump-jquery-2 
Bump to jQuery 2
 2016-08-09 13:00:39 +02:00
Denys Kurets
ef729425b4
6776 remove unused routes 2016-08-09 10:00:51 +02:00
Steffen van Bergerem
5f3e4fc358
Merge pull request #6926 from jhass/timeago_plurals 
Properly support pluralization in timeago strings
 2016-08-08 17:38:30 +02:00
cmrd Senya
923fb8a763
Refactor app.views.AspectMembership 
in order to support adding new aspect to a dropdown without full
page reload
 2016-08-08 17:21:14 +03:00
Augier
2e175c4be5 Bump to jQuery 2 2016-08-07 16:14:52 +02:00
Jonne Haß
734f332333
Properly support pluralization in timeago strings 2016-08-01 13:27:30 +02:00
Jonne Haß
c5849b4724
Correct default value explanation in diaspora.yml.example [ci skip] 2016-07-20 21:51:44 +02:00