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

17925 commits

This branch
This branch
All branches
Author SHA1 Message Date
Steffen van Bergerem
db7ce50b6f
Fix links in Changelog [ci skip] 2016-08-11 03:08:11 +02: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
Jonne Haß
bd74eea140
Merge pull request #6962 from svbergerem/fix-mentioning-modal 
Fix mentioning model being broken when reopening it
 2016-08-11 01:05:39 +02:00
Jonne Haß
218de300bd
Merge pull request #6963 from svbergerem/contacts-page-fixes 
Contacts page fixes
 2016-08-11 01:05:24 +02:00
Steffen van Bergerem
11f6ed2b9a
Fix community spotlight styles 2016-08-10 23:13:18 +02:00
Steffen van Bergerem
e152dc6549
Get rid of inline javascript on contacts page 2016-08-10 23:13:18 +02:00
Steffen van Bergerem
d60862c3c6
Fix mentioning model being broken when reopening it 2016-08-10 23:09:49 +02:00
Jonne Haß
0704a8ca90 Merge pull request #6961 from svbergerem/update-markdownit-sanitizer 
Update markdown-it-sanitizer
 2016-08-10 22:13:00 +02:00
Steffen van Bergerem
7985f95db5
Update markdown-it-sanitizer 2016-08-10 19:07:27 +02:00
Jonne Haß
049b607b35 Merge pull request #6960 from svbergerem/escape-input-mentions-box 
Escape HTML in mentions box
 2016-08-10 17:55:22 +02:00
Steffen van Bergerem
0a8573e00b
Add cuke for #6953 2016-08-10 17:21:10 +02:00
Steffen van Bergerem
d9746a8461
Escape HTML in mentions box 2016-08-10 17:19:58 +02:00
Benjamin Neff
86e75a02bb fix privacy settings form submit 2016-08-10 13:16:59 +02:00
Benjamin Neff
37837b3f73 fix style on registration-page after errors 2016-08-10 13:16:59 +02:00
Jonne Haß
edd568007d Merge pull request #6954 from svbergerem/refactor-osm-in-spv 
Refactor locations in the SPV
 2016-08-10 12:10:17 +02:00
Jonne Haß
90abad0152 Merge pull request #6950 from cmrd-senya/consolidate-queues 
Consolidate queues
 2016-08-10 11:46:09 +02:00
Steffen van Bergerem
a591ae781a
Refactor tileLayer creation 2016-08-10 11:30:48 +02:00
Steffen van Bergerem
3fb7b420eb
Always show expanded map in SPV 2016-08-10 11:30:48 +02:00
cmrd Senya
89b12345bb Rake task for legacy sidekiq queues 2016-08-10 08:51:22 +00: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
Jonne Haß
c1bd072e76 Merge pull request #6953 from svbergerem/fix-typeahead-mentions 
Fix typeahead mentions
 2016-08-10 01:16:42 +02:00
Steffen van Bergerem
0bc5ec4bb4
Make customsearch filter async results for typeahead.js 2016-08-10 00:41:07 +02:00
Steffen van Bergerem
5865314172
Use typeahead.js version from github 2016-08-10 00:41:07 +02:00
Steffen van Bergerem
f1772a86b3
Configure pronto to ignore files in vendor and consolidate comments 2016-08-10 00:40:48 +02:00
Jonne Haß
8e887f884e
Merge pull request #6951 from svbergerem/contacts-search 
Modify search to include contacts
 2016-08-09 19:51:46 +02:00
Steffen van Bergerem
cefffc6082
Move contacts search to contacts#index 2016-08-09 19:20:40 +02:00
Steffen van Bergerem
9f28b935b9
Drop contacts.json 2016-08-09 19:20:40 +02:00
Steffen van Bergerem
f1e9c99866
Add contacts search 2016-08-09 19:20:40 +02:00
Steffen van Bergerem
73ce521bb3
Modify search to include contacts 2016-08-09 15:12:44 +02: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
Jonne Haß
6495845de6 Merge pull request #6949 from svbergerem/refactor-photos-css 
Refactor photo css
 2016-08-09 11:13:32 +02:00
Jonne Haß
380b180705
guard against some data inconsistency case in the signature tables migration 2016-08-09 10:44:29 +02:00
Steffen van Bergerem
9cbc7b6050
Refactor photo css 2016-08-09 10:20:34 +02:00
Jonne Haß
2afb0b95ff Merge pull request #6948 from svbergerem/fix-photos-page 
Fix other user's profile photos stream
 2016-08-09 10:06:49 +02:00
Denys Kurets
ef729425b4
6776 remove unused routes 2016-08-09 10:00:51 +02:00
Steffen van Bergerem
09aff30648
Fix hovercards on profile edit page 2016-08-09 01:14:24 +02:00
Steffen van Bergerem
020f8c51b4
Fix other user's profile photos stream 2016-08-09 00:33:12 +02:00
Steffen van Bergerem
dc236b8b9d
Merge pull request #6838 from Flaburgan/masonry-photo 
Set fixed height of tile in photos stream, fix #6809
 2016-08-08 23:46:23 +02:00
Flaburgan
eac051ffaa Set fixed height of tile in photos stream, fix #6809 2016-08-08 23:28:19 +02:00
Steffen van Bergerem
89e6fd7ea5
Merge pull request #6942 from Flaburgan/ruby-2.3 
Recommend Ruby 2.3, keep Ruby 2.1 as supported
 2016-08-08 22:57:46 +02:00
Jonne Haß
5c62af2821 Merge pull request #6946 from SuperTux88/6786-fix-participation-counter-migration 
Rewrite migration for participation counter
 2016-08-08 21:59:16 +02:00
Benjamin Neff
88c7c1568d Rewrite migration for participation counter 
This migrations runs only if the old 20150404193023_participation_counter
migration has not been run.

The new migration is a lot faster, because it runs after the
participation-cleanup migration has been run, so the participation table
is now a lot smaller for people upgrading from 0.5.x to 0.6.x.

It also doesn't remove manually created participations (without likes,
comments or poll participations on the same post).

Fixes #6786
 2016-08-08 20:56:47 +02:00
Jonne Haß
ca2dd532af
Merge pull request #6940 from SuperTux88/cleanup-posts-table 
Cleanup posts table
 2016-08-08 20:53:24 +02:00
Jonne Haß
e738f40d8f Merge pull request #6947 from svbergerem/fix-inviter-avatar 
Various frontend fixes for the getting started page
 2016-08-08 20:10:52 +02:00
Benjamin Neff
d3edbfd829 remove pending flag from posts 2016-08-08 19:37:10 +02:00
Benjamin Neff
83db0a8f3e remove activity_streams, because it was always false ... 2016-08-08 19:37:10 +02:00
Benjamin Neff
ecd13fc713 cleanup old attributes from code 2016-08-08 19:37:09 +02:00
Benjamin Neff
7ff18d92fb remove old unused data_conversion fixtures 2016-08-08 19:37:09 +02:00