Commit graph

18377 commits

Author SHA1 Message Date
flaburgan
1028632ac1
Add Liberapay button in the donate section
closes #7290
2017-01-22 23:29:57 +01:00
Steffen van Bergerem
8f95e973b2 Bump json
json 1.8.3 was incompatible with ruby 2.4.0

closes #7285
2017-01-19 00:20:43 +01:00
Benjamin Neff
451e6087be Merge branch 'release/0.6.3.0' into next-minor 2017-01-18 23:52:11 +01:00
Benjamin Neff
4e6a9aeb1e Fallback to title if the reshare root was deleted
closes #7284
2017-01-18 23:51:42 +01:00
Steffen van Bergerem
b508b9f6ef Update database config comments
closes #7282
2017-01-16 01:17:27 +01:00
Steffen van Bergerem
941118d7af Move formatting from locale to views
closes #7283
2017-01-15 23:42:03 +01:00
spixi
fa0bd14dfb Fix script/server when bin/ is not in PATH
This fixes an issue, when the bin/ directory of diaspora is not in the PATH variable

closes #7281
2017-01-15 23:27:27 +01:00
Benjamin Neff
5e58068a72 Merge branch 'release/0.6.3.0' into next-minor 2017-01-15 23:00:32 +01:00
Benjamin Neff
e7d6831900 Add .wti to .gitignore 2017-01-15 22:40:13 +01:00
Benjamin Neff
66367cccd8 Start 0.6.4.0 cycle 2017-01-15 05:05:24 +01:00
SansPseudoFix
0f60b9fb94
Switch reason and message
unify

rename and show full post on reports

Fix XSS issue

Unification

Style

Fix pronto

closes #7180
2017-01-15 04:04:18 +01:00
Steffen van Bergerem
d0e70ccd6a Use new ajax error handling for like, unlike and comment failures
closes #7227
2017-01-15 02:19:02 +01:00
Steffen van Bergerem
bc5848fe9e Use new ajax error handling for reshare failures 2017-01-15 02:17:10 +01:00
Steffen van Bergerem
d609238ed4 Refactor mobile alerts for error responses, add them to container with fixed position 2017-01-15 02:17:10 +01:00
Steffen van Bergerem
b8d3323de0 Return error when unlike failed 2017-01-15 02:17:10 +01:00
Steffen van Bergerem
de789267fc Remove id selectors for mobile photo show page
closes #7279
2017-01-15 02:03:00 +01:00
Benjamin Neff
f11d51746d Downgrade thor to 0.19.1
Version 0.19.4 prints errors to the console, which can be weird for
podmins.

See erikhuda/thor#538
2017-01-15 02:01:00 +01:00
Benjamin Neff
8e196a34a1
Hash from federation library now contains strings
closes #7258
2017-01-15 00:13:11 +01:00
Benjamin Neff
b79ccc5207
Add created_at to comments 2017-01-15 00:12:08 +01:00
Benjamin Neff
99c52f055c
Bump diaspora_federation 2017-01-15 00:12:08 +01:00
Benjamin Neff
f671bebd04
Fix background on mobile photo upload with dark theme
closes #7278
2017-01-15 00:11:07 +01:00
Benjamin Neff
0c0b618a8b
Fix background on mobile photo page with dark theme 2017-01-15 00:09:50 +01:00
Steffen van Bergerem
a290c432d8 Fix link to post on mobile photo page
closes #7274
2017-01-14 03:21:37 +01:00
Steffen van Bergerem
521b3deefe Bump markdown-it
closes #7277
2017-01-14 02:08:55 +01:00
Steffen van Bergerem
a341be7677 Bump markdown-it-diaspora-mention 2017-01-14 02:08:14 +01:00
Steffen van Bergerem
6e7910b037 Deduplicate notification dropdown view
closes #7270
2017-01-13 02:49:08 +01:00
Steffen van Bergerem
abe7ef3d18 Update existing notifications in dropdown on fetch
When fetching notifications this merges existing notifications and changes
their appearance in the dropdown if the html or the unread status changed.

This doesn't update all notifications in the dropdown but only those that are
returned by the server.

Related to #7247.
2017-01-13 02:47:37 +01:00
Steffen van Bergerem
ade9b97215 Update backbonejs, switch to rails-assets source 2017-01-13 02:47:37 +01:00
Steffen van Bergerem
b58226ba9a Load comments in mobile view when clicking comment button
closes #7207
2017-01-11 02:43:15 +01:00
Steffen van Bergerem
c9d49c89a6 Always show mobile reaction counts
fixes #5829
2017-01-11 02:43:06 +01:00
Steffen van Bergerem
5efb4a912e Prevent scroll to top when clicking 'mark all as read' in the notification dropdown
Fixes #7252

closes #7253
2017-01-10 23:41:35 +01:00
Steffen van Bergerem
fb06d03f49 Close modals at the end of each jasmine spec
closes #7246
2017-01-10 23:32:27 +01:00
Steffen van Bergerem
95ddae86c7 Bump autosize 2017-01-10 23:31:47 +01:00
Steffen van Bergerem
aeb6d2287b Remove unused upload button css
closes #7271
2017-01-10 23:05:02 +01:00
Frédéric Bolvin
7cc4b46d7e
Replaced fileuploader-custom with FineUploader
closes #7083
2017-01-07 18:32:08 +01:00
flaburgan
8e5d2f5c65
Add links to the aspects and followed tags page on mobile
closes #7265
2017-01-07 03:05:01 +01:00
Dennis Schubert
8709d74c3e Increase the spacing above and below post contents
closes #7267
2017-01-04 02:30:02 +01:00
flaburgan
03db9807d7 Remove Vines mention, fix #7262
closes #7264
2017-01-04 02:23:57 +01:00
flaburgan
747ea161bf Fix year bg color on /notifications
closes #7263
2017-01-03 03:31:47 +01:00
Dennis Schubert
db97ff7a25
Merge branch 'master' into next-minor 2016-12-14 00:11:31 +01:00
Dennis Schubert
241c17a814
Merge branch 'release/0.6.2.0' 2016-12-14 00:10:57 +01:00
Dennis Schubert
a1331aa3b1
Merge branch 'release/0.6.2.0' into next-minor 2016-12-13 18:51:33 +01:00
Dennis Schubert
ea35061feb
updated 121 locale files [ci skip] 2016-12-13 18:51:19 +01:00
Benjamin Neff
7ce3982b6d Merge branch 'release/0.6.2.0' into next-minor 2016-12-08 03:19:23 +01:00
Flaburgan
f785de7484 Reformulate CSRF e-mail
closes #7241
2016-12-08 03:16:19 +01:00
Dennis Schubert
991b047be7
Start 0.6.3.0 cycle 2016-12-04 20:12:00 +01:00
Benjamin Neff
6c37171f9f
Change last sentence and fix specs
closes #7238
2016-12-04 20:10:13 +01:00
SansPseudoFix
61300dab59
CSRF mail 2016-12-04 20:09:45 +01:00
Senya
dd9bda24f4 Remove user_methods require line
No need to explicitly require user_methods.rb since it is already required in spec_helper.rb

closes #7236
2016-12-02 03:24:36 +01:00
cmrd Senya
31a31ecbe1
pass "state" parameter back to openid client 2016-12-01 03:16:50 +01:00