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

3265 commits

Author SHA1 Message Date
Jonne Haß
baadb49ebf Merge pull request #3844 from asphxia/feature/3672-reshare-alert-box-appearing-twice 
Issue #3672: Reshare alert box is appearing twice
 2013-01-31 11:13:13 -08:00
Jonne Haß
01299ee8e8 update spec to match overriden translation 2013-01-31 19:25:30 +01:00
Asphyxia
1ed0318db7 Reshare alert box is appearing twice 2013-01-31 14:52:47 -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
Ruxton
e8decc200e Adding jasmine coverage for oEmbed updates 2013-01-25 23:47:49 +08:00
Ruxton
60024d7e20 Someone isn't a StarWars fan. 2013-01-25 22:43:56 +08:00
Jonne Haß
64b86b27c1 bump rspec-rails and rspec 
fix two specs by not checking for object identity
 2013-01-17 02:00:03 +01:00
Fabián Rodríguez
d7574a9efb add locale to aspects 2013-01-16 19:59:10 -02:00
Fabián Rodríguez
f978a75b8c bootstrap my_aspects data 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
Diaspora Europe
ac3b2bc99f pod version in footer and updated link to changelog #3705 2013-01-15 16:45:10 +01: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
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
597ab20715 Show error and flash-notice when sending messages to non contacts 2012-12-26 12:23:37 +01: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
94760f4c04 update jasmine gem, removed useless spec, + changelog) 2012-12-07 21:21:27 +01:00
Jonne Haß
669dd87b11 extract configruation system to a gem 2012-11-30 13:35:59 +01:00
Jonne Haß
bf698f3882 Do not strip "markdown" in links when posting to services, fix #3765 2012-11-26 14:16:43 +01: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
rschaden
49d4079065 add email validation to invitations 2012-11-25 14:25:20 +01:00
Bobby Wilson
abd4e17daf Fix #3750 2012-11-22 13:00:47 -07:00
Jonne Haß
c59bb35087 Merge pull request #3754 from marpo60/housekeeping 
Housekeeping2
 2012-11-22 01:06:30 -08:00
Jonne Haß
5f6e03cfe5 Merge pull request #3714 from marpo60/refactor 
Housekeeping
 2012-11-22 01:06:05 -08:00
Fabián Rodríguez
be2db47f02 remove unnecesary stuff from specs 2012-11-21 18:26:17 -02:00
Fabián Rodríguez
99abc22403 remove unused methods 2012-11-21 18:26:17 -02:00
David McMullin
97664cb880 port tagFollowings to BackBone 2012-11-12 21:37:00 +00:00
Jason Robinson
c437636131 Fix message_spec test and add tests for private message notification unread count. Update changelog 2012-11-12 22:00:13 +02:00
Jonne Haß
63f2d335a4 Merge branch 'notifications_count' of git://github.com/movilla/diaspora into develop 2012-11-11 15:00:46 +01:00
movilla
554fe40235 Web mobile notificacions count dont change to unread-read when click in link post 2012-11-11 14:45:07 +01:00
Jonne Haß
4fc2cb1cba bump carrierwave 2012-11-11 13:29:40 +01:00
movilla
10aea3ebce add test :unread => true 2012-11-10 23:23:08 +01:00
Jason Robinson
48a332f871 Remove by default markdown formatting from posts done via service, currently only used by Twitter. Remove markdown also from Facebook posts. 2012-11-09 00:04:49 +02: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
ab3a7d991c Remove ugly whitespaces 2012-11-07 23:16:25 -02:00
Braulio Martinez
3260bada38 Remove posts#new action from Rails and related tests 2012-11-07 23:14:35 -02:00
Fabián Rodríguez
4056c0da9e remove unused method #can_add? 2012-11-06 21:39:36 -02:00
movilla
5a2b22ff0c reshares_count come back! 2012-11-06 21:05:48 +01:00
Jason Robinson
7fafabdb60 Only include url to post for twitter when post exceeds maximum length or contains photos 2012-11-03 23:25:19 +02:00
Jonne Haß
2a45470232 Merge branch 'feature/fix-facebook-public-posts' of git://github.com/jaywink/diaspora into feature/fix_services 
Conflicts:
	Changelog.md
	app/models/services/facebook.rb
	spec/models/services/facebook_spec.rb
 2012-11-02 11:31:47 +01:00
Jason Robinson
e974d2934f Always use basic Facebook Graph API to post messages, fixes public posts. Remove unnecessary Facebook opengraph config items 2012-11-02 00:23:33 +02:00
Jonne Haß
5a70311fe7 update and fix services 2012-10-25 17:54:18 +02:00
Jonne Haß
1a93ccd548 don't error out if the root of a reshare of a reshare got deleted, fixes #3546 2012-10-24 19:51:31 +02:00
Dennis Schubert
5ea998a382 Change 'unless' to 'if' again because 'unless' is wrong here. 
Also, add some specs and add it to the changelog.
 2012-10-24 00:27:45 +02:00
Florian Staudacher
0057e9ed46 some small code style changes + final fix for postgres (milliseconds) 
+ updated changelog
 2012-10-21 16:10:27 +02:00
Ruxton
25b57cdd2a trying to stabilize issue with datetime in test suite 2012-10-21 16:08:57 +02:00
Ruxton
a78cb352e6 updated spec to fix to_datetime issue 
Conflicts:
	spec/lib/diaspora/fetcher/public_spec.rb
 2012-10-21 16:08:57 +02: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
Gonzalo
e1756b5b3f Privatize non-action controller methods 2012-10-14 19:32:53 -02:00