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

14887 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jonne Haß
baacefbd92 look for hashed version of default.css in script/server 
fixes #5254
 2014-09-28 16:37:29 +02:00
Florian Staudacher
c7b4b77ce8 Merge pull request #5209 from jhass/federation_improvements 
Federation improvements
 2014-09-27 16:18:37 +02:00
Jonne Haß
430d5bd2e9 bump configurate 2014-09-26 22:14:09 +02:00
Jonne Haß
9520d06c7b Handle already deleted items gracefully in receive local batch job 2014-09-20 15:26:31 +02:00
Jonne Haß
d6f5368474 Handle already deleted photos gracefully in process photo job 2014-09-20 15:13:14 +02:00
Jonne Haß
499ff6e0f4 Fix receiving a relayable retraction through the public route 2014-09-20 15:03:53 +02:00
Jonne Haß
5ca1c1d295 Raise on 404 during Webfinger 
That's at least readable, return false just causes
silly follow up errors
 2014-09-20 13:47:52 +02:00
Jonne Haß
4b754b51f9 Discard dispatch jobs of already deleted records 2014-09-20 13:39:31 +02:00
Jonne Haß
5133458d30 Start converting IDN emails 2014-09-20 04:05:57 +02:00
Jonne Haß
2d2217b677 Monkey patch Sidekiq logger 
Sidekiq 3.0 initialized the logger early before we had a chance
to set the logfile. Then we set a new logfile causing the old
logger to be closed. Since the default logger points to stdout,
it got closed causing all kinds of issues.
 2014-09-20 03:01:43 +02:00
Jonne Haß
eb7d6083e3 Merge pull request #5232 from taro-k/develop5231 
fix locale of invitation email subject #5231
 2014-09-19 12:38:14 +02:00
taro@diasporajp
93c6159c56 fix locale of invitation email subject #5231 2014-09-19 16:56:55 +09:00
Florian Staudacher
926556c145 fix profile badge too much margin [ci skip] 2014-09-18 22:30:57 +02:00
Jonne Haß
31613e7784 Merge pull request #5227 from jaideng123/5218-fix_deformed_getstarted_popover 
Fixed deformation of getting started popovers
 2014-09-18 12:44:19 +02:00
Jonne Haß
7da6501602 let tags controller spec generate offending query for #5228 2014-09-18 12:39:16 +02:00
jaideng123
b448f92c61 Fixed deformation of getting started popovers 2014-09-17 21:13:22 -05:00
Jonne Haß
538d55dbfc Merge pull request #5180 from Raven24/profile_status 
port profile page to backbone.js
 2014-09-18 01:26:26 +02:00
Florian Staudacher
6e1bd7216d fix /u/[username] route 2014-09-18 00:23:43 +02:00
Florian Staudacher
0bbf304e03 fix the last of the failing cukes (hopefully) 2014-09-17 18:38:27 +02:00
Florian Staudacher
fe0f8df9c9 add a 'css mutex' for cuke failures 2014-09-17 14:36:04 +02:00
Florian Staudacher
300496090b add the publisher back to ones own profile, fix some cukes 2014-09-16 02:16:14 +02:00
Florian Staudacher
a5da2ca48c small fixes and more jasmine specs 2014-09-15 01:37:24 +02:00
Florian Staudacher
10609c3692 fix jasmine and add some specs for direction detection 2014-09-15 01:37:23 +02:00
Florian Staudacher
be86014540 rspec should now be running a green build 2014-09-15 01:37:23 +02:00
Florian Staudacher
89d468cdcc first round of specs and code cleanups/fixes 2014-09-15 01:37:23 +02:00
Florian Staudacher
e4ee28885a make photos page work with backbone 2014-09-15 01:37:23 +02:00
Florian Staudacher
1f724dd123 * add a (hash)tag helper for handlebars 
* re-add stream on profile page
* more controller refactoring
 2014-09-15 01:37:23 +02:00
Florian Staudacher
2572fb77fc * refactored text direction detector into helper (also for handlebars) 
* added handlebars helper for markdown formatting
* finished port of profile sidebar view to handlebars template
* people_controller refactoring
 2014-09-15 01:37:23 +02:00
Florian Staudacher
9a16560d8d * rename profile header view to make name more accurate 
* include 'js-routes' for rails routes in javascript
  (TODO: config options?)
* add handlebars helper for rails routes
 2014-09-15 01:37:23 +02:00
Florian Staudacher
0092c9c483 * create a handlebars view for the profile header 
* unblock the user via ajax
 2014-09-15 01:37:23 +02:00
Florian Staudacher
fba3092c61 * cleanup people_controller#show, add people_controller#stream for json 
* introduce new presenters and extend the functionality of the BasePresenter
* add a handlebars template for the profile sidebar, render it everytime we need to update
* introduce a 'aspect_membership:update' global event
 2014-09-15 01:37:23 +02:00
Florian Staudacher
d00d69814e port profile page to backbone.js 2014-09-15 01:37:23 +02:00
Jason Robinson
cb3db09a5d Merge tag 'v0.4.1.0' into develop 
Release 0.4.1.0
 2014-09-14 21:07:02 +03:00
Jason Robinson
dcb0d8dd58 Merge branch 'release/0.4.1.0' 2014-09-14 21:06:38 +03:00
Jason Robinson
27329ce312 Merge pull request #5219 from jaywink/changelog-0410 
Changelogs for terms and podmin admin mail rake task
 2014-09-14 20:58:05 +03:00
Jason Robinson
afb64ff025 Add changelog text about new rake task for admin mails. 
Related to #5111
 2014-09-14 20:56:11 +03:00
Jason Robinson
658041c412 Changelog entry to explain new terms of service feature. 
Related to #5104
 2014-09-14 20:55:55 +03:00
Jonne Haß
9d421f4108 Merge pull request #5214 from diaspora/update_gems 
Update gems
 2014-09-13 01:37:22 +02:00
Jonne Haß
f964d3793b bump fog-softlayer 2014-09-12 23:55:21 +02:00
Jonne Haß
c555cd29dd bump rspec-core 2014-09-12 23:55:21 +02:00
Jonne Haß
52f3e8d01d bump test_after_commit 2014-09-12 23:55:21 +02:00
Jonne Haß
f3d980ba5d bump sidekiq 2014-09-12 23:55:21 +02:00
Jonne Haß
743fc70999 bump selenium-webdriver 2014-09-12 23:55:21 +02:00
Jonne Haß
ba70f2293e bump mini_magick 2014-09-12 21:57:00 +02:00
Jonne Haß
a6ad721b8e bump handlebars_assets 2014-09-12 21:52:43 +02:00
Jonne Haß
9f125058f7 bump rails 2014-09-12 21:49:09 +02:00
Jonne Haß
d5474c3992 Merge pull request #5208 from jaideng123/5081-truncate_open_graph_data 
Fixed Open Graph db insertion
 2014-09-08 12:31:09 +02:00
jaideng123
d16eabae21 Added test for truncation to gather OG data spec 2014-09-07 20:28:02 -05:00
Jonne Haß
619bc3f537 A reshares root may be already gone when generating the notification 2014-09-07 10:47:47 +02:00
Jonne Haß
777e3123d6 Try fetching missing parent of relayables 
* Extract post fetching logic from Reshare into
  its own module
* raise proper error message when fetching fails
* raise proper error message when parent is still missing

We can't skip fetch failures or missing parents and
still need to retry them in case we're sent the parent
later on
 2014-09-07 10:47:47 +02:00