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

474 commits

Author SHA1 Message Date
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
movilla
ae0ac1c72d css change when you choose aspects before posting -dropdown list- 2012-09-16 17:37:27 +02:00
Florian Staudacher
948b84eca1 WIP backbone-ify publisher, get rid of weird old POJsO 2012-09-16 14:35:59 +02:00
Jonne Haß
f1631084d3 Merge pull request #3579 from movilla/css_modification_counter_tw_fb_tmblr 
css modification on the number of characters twiter, facebook and tumblr...
 2012-09-14 08:28:58 -07:00
movilla
426fe1ab7d css modification on the number of characters twiter, facebook and tumblr -.counter- 2012-09-14 16:45:03 +02:00
Jonne Haß
3dbbbbe979 bump jasmine and handlebars_assets, postfix all handlebars templates with _tpl to avoid name clashes 2012-09-12 21:22:34 +02:00
Jonne Haß
2de0213d6f Revert "Removed a couple missed "new_styles" assets." 
This reverts commit e323d6134e.
 2012-09-12 12:55:57 +02:00
Jonne Haß
2b729059c9 was too long awake last commit, here are the files back we still need 2012-09-12 12:55:57 +02:00
Hans Fase
e323d6134e Removed a couple missed "new_styles" assets. 2012-09-12 04:05:33 -04:00
Jonne Haß
7ec2f8f419 finish beta striping 
A lot of cleanup is still needed, refactoring the CSS to be consistent, removing all sorts of unused stuff etc
 2012-09-12 07:51:19 +02:00
Jonne Haß
ab0ad630df strip last beta leftovers and fix syntax errors, travis is kinda down, lets hope nothing breaks while I sleep 2012-09-12 05:48:12 +02:00
Jonne Haß
ffde639f4d Merge branch 'betastrip' of git://github.com/DeadSuperHero/diaspora 2012-09-12 04:55:10 +02:00
Sean Tilley
49ea8c8563 Strip Beta Features 2012-09-11 21:52:53 -05:00
movilla
10eb26ad2d With mobile click "show" in #nsfw-posts links to top of page Fix: #3564 2012-09-11 16:42:55 +02:00
Florian Staudacher
04a17fd508 Merge pull request #3561 from movilla/NSFW_mobile_will_come_back 
NSFW mobile come back
 2012-09-10 13:08:51 -07:00
movilla
a4a483af90 NSFW mobile come back 2012-09-10 20:48:34 +02:00
Sean Tilley
3deff9327a Merge pull request #3557 from movilla/web_mobile_login_second 
New web mobile login (Jonne suggestion) [ci skip]
 2012-09-08 12:02:15 -07:00
movilla
a564cbff9d New_login_mobile_web_ 2012-09-08 15:30:59 +02:00
Jeremy Huffman
c8f8f6741a let profile tag entry grow to size of input box 
use auto so line-breaks work better
 2012-09-07 23:24:41 -04:00
movilla
b0ecc57631 Fix uncomfortable overflow mobile post 2012-09-05 16:51:27 +02:00
Florian Staudacher
45223fd634 Merge pull request #3520 from movilla/new_mobile_resgistrations_ 
New mobile page registrations, add an error message to registrations page, friendlier design, add placeholders and ().upcase
 2012-08-31 01:17:20 -07:00
movilla
6c6be3e22a New mobile_web registrations 2012-08-29 23:09:52 +02:00
Daniel Grippi
b8f7d025d5 update landing page 2012-08-24 13:45:05 -07:00
movilla
75402bdfa0 Add icons search & contacts mobile 2012-08-21 16:50:37 +02:00
movilla
e41ef3caa5 Small changes in mobile_style 2012-08-20 22:40:52 +02:00
Maxwell Salzberg
2b2e5f1739 Merge pull request #3501 from movilla/private_conversation_new_0 
Added private conversation for mobile - #1397
 2012-08-20 10:52:07 -07:00
movilla
9913f40a38 Added private conversation for mobile 2012-08-20 16:33:05 +02:00
Maxwell Salzberg
54a6ac0c6f add poduptime asset 2012-08-19 17:34:33 -07:00
movilla
9931f39ce0 add mobile conversation 2012-08-12 05:01:42 +02:00
Maxwell Salzberg
f065ba624b Merge pull request #3492 from movilla/footer_mobile 
add padding-top footer mobile [ci skip]
 2012-08-09 11:43:22 -07:00
Movilla
30d5816ae5 add padding-top footer mobile 2012-08-09 17:12:49 +02:00
Florian Staudacher
1a94a24fde fix autolinking links that start with just www... and not a complete http://... 
(fixes #3468)
 2012-08-09 13:09:06 +02:00
Florian Staudacher
6613522097 implement "special symbols" (switch certain strings for utf-8 symbols), fixes #3140 2012-08-08 00:26:20 +02:00
Florian Staudacher
8d512c22ac fix markdown linking of images, also improve tests grammatically 
+ 1 js syntax error
 2012-08-07 23:53:24 +02:00
Florian Staudacher
c6ff849eb9 stream 'reshare' link undeliberately got the same font-size as the container [ci skip] 2012-08-07 19:24:22 +02:00
Maxwell Salzberg
a841d3a839 derp, not everyone wants a cdn from google. if anyone who has this problem wants to fix it, you need to set cross origin headers for your fonts 
if they are hosted from another domain for FF to recognize them. You cant set said header on cloudfront. Revert "fix roboto in firefox""

This reverts commit e87d9af52c.
 2012-08-03 10:46:41 -07:00
Maxwell Salzberg
e87d9af52c fix roboto in firefox" 2012-08-02 23:01:05 -07:00
Florian Staudacher
b9c4e8a02f let the 'toggle mobile' link show in the footer, refactored layout a bit 2012-07-22 15:25:51 +02:00
Florian Staudacher
629277502f Merge pull request #3450 from despora/mobile_messages 
add messages/conversations to mobile
 2012-07-16 15:10:00 -07:00
Florian Staudacher
6efcac48b5 fix flash messages 2012-07-15 19:33:32 +02:00
Lennart Prelle
00032a1649 add messages to mobile 2012-07-14 14:23:03 +02:00
Florian Staudacher
038599bf8f update jquery.mentionsInput to latest version 
+ make some tests a little nicer
 2012-07-10 20:37:57 +02:00
Florian Staudacher
ea8f358a9a use unminified jQuery textchange plugin 2012-07-10 17:58:34 +02:00
Maxwell Salzberg
c2bbe4e466 somehow some dirty state made it into my merge :( 2012-07-02 11:34:31 -07:00
Maxwell Salzberg
190fceaf5c [SECURITY FIX] please update your pod ASAP 
This is a fix for public messages, where a malicious pod could spoof a message from someone a user was connected to, as the verified signatures were not checked that the object was also from said sender.  This hole only affected public messages, and the private part of code had the correct checks
THX to s-f-s(Stephan Schulz) for reporting and tracking down this issue, and props to Raven24(florian.staudacher@gmx.at) for helping me test the patch
 2012-07-02 10:00:12 -07:00
Florian Staudacher
e19d73792d oembed video info 2012-06-25 15:25:09 +02:00
Florian Staudacher
9588169019 fix oembed iframe/thumb width for reshares [ci skip] 2012-06-25 13:09:56 +02:00
Florian Staudacher
1fb016597d remove leftover edges from spinner, remove red bg color (fixes #3338) [ci skip] 2012-06-18 23:40:55 +02:00
Florian Staudacher
64a20793ec don't open comment pane on show page, if a modifier key is pressed 2012-06-18 20:04:20 +02:00
Maxwell Salzberg
d3487c8b7d fix sa mall possible xss in personImage handlebar helpers if the attacker had access to your root domain. fixes #3392 2012-06-16 14:59:51 -07:00
Florian Staudacher
8ca39f5936 show a "post is not public" message when visitor is not logged in 
and tries to access a show page of a non-public post
 2012-06-07 22:16:37 +02:00
Benjamin Neff
769836c221 remove border from reshare link 2012-06-03 18:42:55 +02:00
danielgrippi
9bf60d178a Revert "consolidate mixpanel streams by making Profile one page [ci skip]" 
This reverts commit 5af37fd3da.
 2012-06-01 13:48:51 -07:00
danielgrippi
5af37fd3da consolidate mixpanel streams by making Profile one page [ci skip] 2012-06-01 13:24:01 -07:00
danielgrippi
8e2657d26b more instrumentation [ci skip] 2012-05-30 19:26:07 -07:00
danielgrippi
dac781cb4f array woes. boo [ci skip] 2012-05-30 19:03:23 -07:00
Dennis Collinson
f3d1afcc96 memoize selected frame 2012-05-30 18:09:59 -07:00
Dennis Collinson
374ec73fa4 make it clearer which frame is active, and fixes for scrolling flow. 2012-05-30 18:06:12 -07:00
danielgrippi
1c81e4f587 app.track => app.instrument to be less confusing 2012-05-30 17:56:28 -07:00
Maxwell Salzberg
91db7859d8 Merge pull request #3340 from DeadSuperHero/YouTubeFix 
Fix for YouTube Embeds in Show Pages [ci skip]
 2012-05-30 17:52:50 -07:00