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

13161 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jonne Haß
0282782293 bump twitter 2013-01-17 01:02:36 +01:00
Jonne Haß
0c39e2521b bump timecop 2013-01-17 01:02:04 +01:00
Jonne Haß
1d9ecfd22e bump fog 2013-01-17 00:28:57 +01:00
Jonne Haß
ab86423fe9 Merge pull request #3850 from marpo60/port-my-aspects-to-backbone 
Port my aspects to backbone
 2013-01-16 15:13:56 -08:00
Fabián Rodríguez
ed21b327f8 update changelog 2013-01-16 20:14:38 -02:00
Fabián Rodríguez
d7574a9efb add locale to aspects 2013-01-16 19:59:10 -02:00
Fabián Rodríguez
0f499e7c2e make publisher work with backbone 2013-01-16 19:33:20 -02:00
Fabián Rodríguez
68e39e0393 fix specs 2013-01-16 19:33:20 -02:00
Fabián Rodríguez
ed4020b9b3 Update stream's title and publisher's dropdown on aspect selection 2013-01-16 19:33:20 -02:00
Fabián Rodríguez
8d202e481b fix aspect's select_all deselect_all 2013-01-16 19:33:20 -02:00
Fabián Rodríguez
53ba55c9ca adds stream_aspect class 2013-01-16 19:33:20 -02:00
Fabián Rodríguez
3f314cc7bb remove streams-aspects 2013-01-16 19:33:20 -02:00
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
Jordi Mallach
d795ed2e3e Update Catalan translation to 597ab20. 2013-01-09 01:31:58 +01:00
Jordi Mallach
56357ce0bd Updated Catalan translation to 2d3df3e. 2013-01-09 01:22:25 +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
Jonne Haß
eedf32ed9d Merge branch 'hotfix/0.0.2.2' 2013-01-09 00:09:46 +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