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

533 commits

Author SHA1 Message Date
Jonne Haß
4264804343 Merge pull request #3984 from movilla/frienliar_new_conversation 
Friendlier new conversation mobile
 2013-02-17 06:44:59 -08:00
Florian Staudacher
4cbae601e8 [WIP] aspect membership dropdown Backbone.js rework 
* initial backbone port
* changed AspectMembershipsController#destroy to use aspect_membership_id
* included rudimentary jasmine specs
* more specs, updating the list elements after de-/selection
* update selected aspect count on button
* don't even try to render html in AspectMembershipsController
* more specs for button summary text
* adapt aspect management on contacts page and in the popup boxes
* adapt inline creation of aspects + memberships

TODO
* more tests
 2013-02-17 13:40:10 +01:00
movilla
ce76f12591 friendlier new-conversation mobile 2013-02-16 22:53:43 +01:00
movilla
dfcc8e7c80 Overflow info_author mobile web 2013-02-16 14:51:51 +01:00
movilla
4d6110246e Overflow name author mobile post 2013-02-15 17:44:54 +01:00
Lennart Prelle
2d0abe8309 added a id and a autoscroll to first unread message in conversation (Fix: #3216) 2013-02-11 16:15:01 +01:00
movilla
63f1d1c197 friendlier mobile buttons 2013-02-09 15:23:04 +01:00
movilla
4343914cdb Twitter/Facebook/Tumblr count down characters is hidden by the picture of the post 2013-02-04 21:31:48 +01:00
movilla
0ea7bc5258 Adapt css for search mobile page 2013-02-02 23:23:22 +01:00
Jonne Haß
865152be90 Merge pull request #3949 from movilla/gettins_started 
Add Getting_Started page mobile. Close #3854
 2013-02-02 08:00:16 -08:00
movilla
27813ec5dd Excessive padding with select aspect in mobile publisher 2013-02-02 16:41:14 +01:00
movilla
507e8ee199 Add Getting_Started page mobile 2013-02-02 16:02:19 +01:00
Jonne Haß
b8128d356b Merge branch 'hotfix/0.0.2.4' into develop 
Conflicts:
	Changelog.md
	app/views/people/show.html.haml
	config/defaults.yml
	spec/helpers/layout_helper_spec.rb
 2013-02-01 22:24:37 +01:00
Jonne Haß
7134513b28 Fix XSS vulnerabilities caused by not escaping a users name fields when loading it from JSON. #3948 
From a quick look at the for us available databases this was not actually used in the wild.
 2013-02-01 22:20:31 +01:00
Asphyxia
6df84ed703 Fix wrong message on infinite scroll on contact page 2013-01-31 23:09:51 -03:00
Asphyxia
07ae4e618c Repeated post on stream fails when content is the same 2013-01-31 22:01:09 -03:00
Asphyxia
1ed0318db7 Reshare alert box is appearing twice 2013-01-31 14:52:47 -03:00
Asphyxia
b91ed859a1 Hovering a Timeago-String should show the Timestamp 2013-01-31 13:43:37 -03:00
Asphyxia
389e93a3ae Stream form on profile page 2013-01-31 00:15:27 -03:00
Jonne Haß
4eb98cd7dc Merge branch 'settings_mobile' of git://github.com/movilla/diaspora into movilla-settings_mobile 
Conflicts:
	Changelog.md
 2013-01-29 14:58:11 +01:00
movilla
0010819343 add settings web mobile 2013-01-27 20:38:19 +01:00
Ivan K
549aa29cf1 fix #2339: set unicode-bidi property to prevent username to overlay the pubdate 2013-01-27 18:49:42 +06:00
Jonne Haß
946121f672 Merge pull request #3827 from diasp/feature/1338-links-sidebar 
Show links in sidebar #1338
 2013-01-26 04:09:22 -08:00
Diaspora Europe
6d4e577676 show links in sidebar #1338 2013-01-26 11:59:15 +01:00
Diaspora Europe
e8d86f09bb resize full scaled image to a specific width #3793 2013-01-26 11:36:01 +01:00
movilla
5d3e9f5c3d Excesive padding with "user-controls" in single post view 2013-01-25 17:34:23 +01:00
Jonne Haß
cb640b91b3 Merge pull request #3880 from Ruxton/feature/oembed_providers 
Oembed Update - Added instagram, better display for rich/photo
 2013-01-25 07:50:24 -08:00
Asphyxia
f2c67b0d8a Overflow comment textarea 2013-01-24 22:52:14 -03:00
Ruxton
89042078ca Oembed Update - Added instagram, better display for rich/photo 2013-01-22 22:37:36 +08:00
Asphyxia
7f34c7af7a Issue #3874: Distorted profile thumbnail 2013-01-21 22:43:48 -03:00
Asphyxia
1af0f4bf2d Issue #3828: Unify hide and ignore options 2013-01-18 16:08:02 -03:00
Asphyxia
d6a9818632 Issue #3851: Profile pictures not centered 2013-01-18 15:51:59 -03:00
Asphyxia
284c40b4da Issue #3840: Fix extra blank on streams 2013-01-18 15:25:01 -03:00
Asphyxia
c0dd888e61 Issue #3832: Logged-out users stream options 2013-01-18 15:10:13 -03:00
Fabián Rodríguez
d7574a9efb add locale to aspects 2013-01-16 19:59:10 -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
e9031a7bf3 add toSentence support in 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
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
Tom Scott
51db25e333 Fix .close img looking off-center. 2013-01-13 23:47:15 -05: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
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
aabbea6ee2 fix issue #3671 reshare a post multiple times 2013-01-12 04:52:56 -02:00
Diaspora Europe
c8ddba6b3e add images to notifications 2013-01-11 12:30:12 +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
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
movilla
ceace52762 Add progress percentage to upload images 2012-12-20 21:24:09 +01:00
movilla
763a893829 Add flash warning to conversation mobile, unification of flash warning with login and register mobile, and add support for flash warning to Opera browser 2012-12-08 14:59:01 +01:00
Jonne Haß
0677459ff9 Merge branch 'css_mobi_notif' of git://github.com/movilla/diaspora into develop 2012-12-08 13:47:13 +01:00
Florian Staudacher
2c7f2d6fbb Merge branch 'feature/3779-hide-post-icon-alignment' of https://github.com/Flaburgan/diaspora into Flaburgan-feature/3779-hide-post-icon-alignment 
[ci skip]
Conflicts:
	Changelog.md
 2012-12-07 17:47:19 +01:00
movilla
491c2a537c Add feature contact pod admin 2012-12-06 15:26:49 +01:00
Flaburgan
aee6068412 Resize deletelabel and ignoreuser images to align them 2012-12-02 13:20:24 +01:00
Liam
c9559b93f5 Update cat image so it's secure - new image from khanb1 on flickr. 2012-12-02 10:31:45 +00:00
David McMullin
0873ae9ab7 improve behaviour of deselect all 2012-11-25 17:38:19 +00:00
David McMullin
f6b32fd13a rename the JS so the magic can return 2012-11-25 17:38:19 +00:00
Jonne Haß
7b548fd571 Merge pull request #3713 from davecocoa/feature/3630-backbone-ify-followed-tags 
port tagFollowings to BackBone
 2012-11-25 09:30:47 -08:00
Jonne Haß
5f6e03cfe5 Merge pull request #3714 from marpo60/refactor 
Housekeeping
 2012-11-22 01:06:05 -08:00
movilla
3fa0254876 add simple background for unread messages/conversations mobile 2012-11-13 19:58:25 +01:00
David McMullin
97664cb880 port tagFollowings to BackBone 2012-11-12 21:37:00 +00:00
Sean Tilley
7dfa6299ec Merge branch 'reshares_count_stream' of https://github.com/movilla/diaspora into movilla-reshares_count_stream 
Conflicts:
	Changelog.md
 2012-11-07 21:04:52 -06:00
Braulio Martinez
36c7c00550 Remove unused posts#new action from Backbone 2012-11-07 23:15:38 -02:00
Fabián Rodríguez
3d061d92c6 remove unused templates 2012-11-06 21:39:35 -02:00
movilla
5a2b22ff0c reshares_count come back! 2012-11-06 21:05:48 +01:00
Jonne Haß
a78cacb799 Merge pull request #3687 from movilla/add_icon_mobile_my_activity 
Add My Activity icon mobile. Close #3680
 2012-11-06 09:02:46 -08:00
movilla
e943a1cab6 Fix overflow button in mobile reset password 2012-10-31 23:31:24 +01:00
movilla
880b16f530 Add My Activity icon mobile 2012-10-29 12:14:19 +01:00
movilla
c9b58c9ff6 Add My Activity icon mobile 2012-10-26 22:47:43 +02:00
Sean Tilley
4b372cfca9 Merge pull request #3669 from DeadSuperHero/feature/remove-alpha-logo 
Remove Alpha logo from branding [ci skip]
 2012-10-19 11:49:38 -07:00
Sean Tilley
e2a2767a74 remove alpha from branding 2012-10-19 13:47:27 -05:00
Florian Staudacher
2694c930a5 Merge pull request #3645 from Raven24/fix-link-regex 
simplify link regex and fix #3553
 2012-10-19 02:24:24 -07:00
Jonne Haß
107b7b1cba let closelabel.png and loading.gif respect the asset host 2012-10-16 16:56:08 +02:00
movilla
ebd1b28b2d Fix problem javascript with read-unread notifications on notifications popup 2012-10-13 15:16:06 +02:00
Fabián Rodríguez
40f5314184 adds password_confirmation field to registration page 2012-10-11 19:45:52 -02:00
Florian Staudacher
ded69477ba replace the monstrous link regex with a slightly less complicated one, 
based on the one from the markdown parser, fixes #3553
adding a list of urls for testing the regex in the specs
 2012-10-11 23:39:44 +02:00
Jonne Haß
8febcfac9c Merge pull request #3635 from movilla/fix_checkbox_select_profiles 
Edit Profile issue with misaligned elements - Fix #3599
 2012-10-08 06:51:04 -07:00
movilla
509aa3116d Edit Profile issue with misaligned elements - Fix 3599 2012-10-08 15:25:17 +02:00
Florian Staudacher
a9bec8a4ee Merge branch 'hotfix/oembed-selector' into develop 
fix for the click event handler on oembed-ed content
 2012-10-03 19:12:48 +02:00
Florian Staudacher
bf82fc17fe fix oembed onclick behavior + specs 2012-10-03 19:05:17 +02:00
movilla
aa8c89a0e4 css error in post-viewer after update bootstrap 2012-09-29 15:19:39 +02:00
Jonne Haß
0a1be1400d Merge pull request #3603 from movilla/translation_ignore_user_popup 
traslation popup ignore user => /stream
 2012-09-22 13:47:34 -07:00
movilla
812fce7181 traslation popup ignore user /stream 2012-09-22 22:07:17 +02:00
Jonne Haß
3e44808cb2 Merge pull request #3587 from movilla/image_profile_post 
images disappeared user profiles in the publication (/post/) for not having class in css
 2012-09-17 15:43:00 -07:00
movilla
bacb99cd18 images disappeared user profiles in the publication (/ post) for not having class in css 2012-09-17 23:41:46 +02:00
Jonne Haß
42f97db42e Merge branch 'select_aspects_dropdown_list' of git://github.com/movilla/diaspora into develop 2012-09-17 21:36:36 +02:00
Florian Staudacher
8193978fd2 in 'standalone' mode, the close button is hidden 
... publisher is embedded into something, that has its own close button
 2012-09-17 20:46:33 +02:00
Florian Staudacher
1002fe088d split up the various parts of the publisher, 
should probably rather be backbone-subviews ... ?
 2012-09-16 17:38:58 +02:00