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

12846 commits

This branch
This branch
All branches
Author SHA1 Message Date
Fabián Rodríguez
f978a75b8c bootstrap my_aspects data 2013-01-16 19:33:20 -02:00
Fabián Rodríguez
e9031a7bf3 add toSentence support in aspects 2013-01-16 19:33:20 -02:00
Fabián Rodríguez
c0417fab93 add specs for the aspects 2013-01-16 19:33:20 -02:00
Fabián Rodríguez
30a2f0bc33 remove aspect-navigation.js 2013-01-16 19:33:20 -02:00
Fabián Rodríguez
29c48ca557 Add ability to toggle aspects 2013-01-16 19:33:19 -02:00
Fabián Rodríguez
a3162d76dd little refactor in streams_controller 2013-01-16 19:33:19 -02:00
Fabián Rodríguez
2eba28266b remove server side rendering of aspects 2013-01-16 19:33:19 -02:00
Fabián Rodríguez
4a07602ad3 add aspects route to backbone router 2013-01-16 19:33:19 -02:00
Fabián Rodríguez
572e6b5639 render aspects client side 2013-01-16 19:33:19 -02:00
Fabián Rodríguez
62fc9880f9 add aspects_list handlebar template 2013-01-16 19:33:19 -02:00
Fabián Rodríguez
00ef2ce1c0 add aspect\'s handlebar template 2013-01-16 19:33:19 -02:00
Fabián Rodríguez
28b3acf36e add aspects_list_view 2013-01-16 19:33:19 -02:00
Fabián Rodríguez
a9d93beca8 Add aspect_view 2013-01-16 19:33:18 -02:00
Fabián Rodríguez
ae1317dbc0 Add Aspect model and collection to backbone 2013-01-16 19:33:18 -02:00
Jonne Haß
4fc8b52c70 Merge pull request #3785 from diasp/feature/unicorn-log 
Write unicorn stderr and stdout
 2013-01-16 07:04:13 -08:00
Diaspora Europe
fe2a6b5f85 Write unicorn stderr and stdout log 2013-01-16 13:11:33 +01:00
Florian Staudacher
69f0cba5a6 Merge pull request #3822 from diasp/feature/3705-pod-version 
Show pod version in footer #3705
 2013-01-15 10:19:23 -08:00
Diaspora Europe
ac3b2bc99f pod version in footer and updated link to changelog #3705 2013-01-15 16:45:10 +01:00
Tom Scott
e5d027e29e Merge pull request #3839 from asphxia/feature/3837-hovercard-causes-horizontal-scrollbar 
Hovercard no longer causes horizontal scrollbar to appear. Fixes #3837.
 2013-01-13 20:41:32 -08:00
Asphyxia
bcc11b3c41 Issue #3837: Hovercard causes horizontal scrollbar to appear 2013-01-14 00:04:36 -03:00
Tom Scott
575e314cc4 Merge pull request #3834 from asphxia/3833-popups-overlap-header 
Fix popovers overlapping the header topbar on scroll.
 2013-01-12 07:50:45 -08:00
Tom Scott
abce12f274 Merge pull request #3831 from marpo60/fix-reshare 
Remove the 'Reshare' link on posts if the user has already reshared the post, and displays an error in case a user tries to reshare a post they have already reshared.
 2013-01-12 07:06:05 -08:00
Asphyxia
df8f46b5af fix .popover overlapping header 2013-01-12 10:51:31 -03:00
Asphyxia
cd6bd0e28f fix after sign-up popups overlaping header 2013-01-12 07:41:16 -03:00
Fabián Rodríguez
af6db5c043 update changelog 2013-01-12 04:52:59 -02:00
Fabián Rodríguez
aabbea6ee2 fix issue #3671 reshare a post multiple times 2013-01-12 04:52:56 -02:00
Jonne Haß
4793ee5d5a Merge pull request #3821 from diasp/feature/notification-images 
Add images to notifications
 2013-01-11 03:59:10 -08:00
Diaspora Europe
c8ddba6b3e add images to notifications 2013-01-11 12:30:12 +01:00
Jonne Haß
414e29f23e remove merge conflict marker 2013-01-09 00:17:26 +01:00
Jonne Haß
a09a8cbffc Merge branch 'hotfix/0.0.2.2' into develop 
Conflicts:
	Changelog.md
	config/defaults.yml
 2013-01-09 00:11:29 +01:00
Florian Staudacher
b320e50236 bump Rails to 3.2.11 
see:
http://weblog.rubyonrails.org/2013/1/8/Rails-3-2-11-3-1-10-3-0-19-and-2-3-15-have-been-released/
 2013-01-09 00:09:07 +01:00
Florian Staudacher
b97786661d add clarifying message to install script (+ fix typo) [ci skip] 2013-01-08 10:11:50 +01:00
Jonne Haß
c6f92198ba Merge pull request #3813 from Flaburgan/feature/3811-update-and-refactor-default-public-view 
Feature/3811 update and refactor default public view
 2013-01-07 10:31:16 -08:00
Flaburgan
3c84f2e0bd Update and refactor default public view, close #3811 2013-01-07 18:04:51 +01:00
Jonne Haß
38eba6703e add Armenian pluralization rule 2013-01-03 23:32:50 +01:00
Jonne Haß
26139fc2dc Merge branch 'hotfix/0.0.2.1' into develop 
Conflicts:
	Changelog.md
	Gemfile
	Gemfile.lock
	config/defaults.yml
 2013-01-02 23:45:53 +01:00
Jonne Haß
947127bec3 Merge branch 'hotfix/0.0.2.1' 2013-01-02 23:41:58 +01:00
Jonne Haß
11f82c794e Bump to Rails 3.2.10 as per CVE-2012-5664 
https://groups.google.com/group/rubyonrails-security/browse_thread/thread/c2353369fea8c53
 2013-01-02 23:40:46 +01:00
Jonne Haß
beb32ce91f hovercards everywhere (comments, likes, top left sidebar stream summary thingy...) 
Say a word if you think it's getting too much...
 2013-01-01 22:59:12 +01:00
Jonne Haß
fde28e9bea display hovercards in reshares and on the linked name 2012-12-30 15:17:48 +01:00
Jonne Haß
5ff657204a Merge pull request #3809 from archSeer/patch-1 
Load the entire lib folder redux.
 2012-12-30 04:31:48 -08:00
Blaž Hrastnik
d3f5f34fa0 Load the entire lib folder refactor. 
Removed hack, replaced with a proper solution.
 2012-12-30 13:08:16 +01:00
Dennis Schubert
679d119d4d Merge pull request #3802 from Raven24/hovercards 
Bring back the hovercards... backbone style
 2012-12-29 06:41:17 -08:00
Florian Staudacher
0092acd492 re-add hovercards 
* added a presenter for hovercard json
* added new backbone view for handling hovercard JS
* refactoring of PeopleController

* finished the backbone js version of hovercards
* don't try to make people_controller more restfull, out of scope
  just add a new route and use that for hovercard json
* added spec for people_controller#hovercard
* add new exception for "AccountClosed" to be able to raise from anywhere

* removed legacy code, since everything got ported to backbone
  (except the "cache" stuff, but that's not strictly necessary)
 2012-12-28 22:37:13 +01:00
Jonne Haß
42a01f3a38 fix regression in 0.0.3.0 (close #3805) 2012-12-27 17:58:18 +01:00
Florian Staudacher
c2be999395 Merge pull request #3723 from movilla/notice_conversations 
Show error and flash-notice when sending messages to non contacts
 2012-12-26 04:03:32 -08:00
movilla
597ab20715 Show error and flash-notice when sending messages to non contacts 2012-12-26 12:23:37 +01:00
Florian Staudacher
dd8660b12e Merge pull request #3787 from movilla/notications_all 
Mark all unread post-related notifications as read, if one of this gets opened. Close #3665
 2012-12-24 09:56:19 -08:00
movilla
c1b858a877 Mark all unread post-related notifications as read, if one of this gets opened 2012-12-24 00:13:32 +01:00
Florian Staudacher
4587a926ad Merge pull request #3740 from movilla/progress_upload 
Add progress percentage to upload images. Close #3633
 2012-12-22 02:57:03 -08:00