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

6419 commits

Author SHA1 Message Date
Jonne Haß
ccedb6eff0 delegate parent_author to the target of a RelayableRetraction 2013-02-28 17:01:58 +01:00
Jonne Haß
df1abefc1c Merge pull request #4015 from movilla/upload_photo_1 
Fix css and js error with upload photo mobile
 2013-02-27 17:11:04 -08:00
movilla
9b2d3c66bf fix css and js error with upload photo mobile 2013-02-28 01:09:40 +01:00
Jonne Haß
b1cdc30367 Merge pull request #4004 from movilla/upload_photo 
Upload photo mobile. Close #3324
 2013-02-26 15:30:09 -08:00
movilla
76b1e9b0dc Add the ability to upload photos from the mobile site 2013-02-26 23:25:58 +01:00
Jonne Haß
cf9659de4a fix XSS vulnerability in conversations#new, closes #4010 2013-02-26 19:09:30 +01:00
pestrada
3f3409a0a5 avoid posting empty comments 
fix Jasmine test

updated changelog with bugfix #3836

fix changelog update

remove wrong bug fix line
 2013-02-25 18:27:46 -06:00
Jonne Haß
0cf1c2d020 Sort tag followings alphabetically, not in reverse, fixes #3986 2013-02-24 16:22:01 +01:00
Fabián Rodríguez
c1eb986f5b remove unnecessary code from people_controller#contacts and use #each in view 2013-02-23 22:36:04 -02:00
Fabián Rodríguez
e76935daaf remove inline styles from views/people/show 2013-02-23 22:36:04 -02:00
Fabián Rodríguez
7472642bd1 Refactor: 
*people_controller#show
  *photos_controller#index
  *views/people/show both html and mobile
 2013-02-23 22:36:03 -02:00
Jonne Haß
19b9b0edb8 Merge pull request #3990 from movilla/mismatch_author_name 
Wrap text if too long in mobile notifications
 2013-02-22 07:51:20 -08:00
movilla
c52a878e86 Wrap text if too long in mobile notifications 2013-02-22 16:15:25 +01:00
Florian Staudacher
f788f3426a Merge pull request #3946 from MrZYX/feature/1781-include-reshares-in-user-feed 
Include reshares in the public user feed, closes #1781
 2013-02-21 13:37:29 -08:00
movilla
e0d0d0f668 Fixed removing images from publisher on the profile and tags pages 2013-02-21 22:19:24 +01:00
Jonne Haß
35350d1ceb Include reshares in the public user feed, closes #1781 2013-02-21 14:32:28 +01:00
Jonne Haß
0fd3bcb397 move custom splash page login into the controller, fixes #3991 2013-02-21 13:46:04 +01:00
movilla
5769abcc32 Include our custom fileuploader on the mobile site too 2013-02-20 16:01:08 +01:00
Jonne Haß
1f4787aa6d Merge pull request #3980 from L3MNcakes/feature/facebook_delete 
Feature/facebook delete
 2013-02-18 11:17:51 -08:00
L3MNcakes
1120cba5f0 Issue #3939: Posts to Facebook do not delete 2013-02-18 18:21:59 +00:00
Jonne Haß
35ba082ab5 Merge branch 'overflow_mobile_post' of git://github.com/movilla/diaspora into develop 
Conflicts:
	Changelog.md
 2013-02-17 15:48:34 +01:00
Jonne Haß
40b10dc0d9 Merge branch 'overflow_author_infor' of git://github.com/movilla/diaspora into develop 
Conflicts:
	Changelog.md
 2013-02-17 15:47:20 +01:00
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
Ruxton
60f5173c77 Spec coverage for changelog_url and adjustment to behaviour 2013-02-04 11:00:57 +08:00
Ruxton
ff7308685a Add a changelog_url helper so that pods can report a more correct changelog 2013-02-04 09:45:36 +08: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
07ae4e618c Repeated post on stream fails when content is the same 2013-01-31 22:01:09 -03:00
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ß
1aa8b6e9f2 do not display the publisher on the profile photos page 2013-01-31 19:25:30 +01: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ß
d398365641 Merge branch 'movilla-settings_mobile' into develop 2013-01-29 15:13:19 +01: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
Fabián Rodríguez
8b4aab0780 change #count to #size in notifications_helper to reduce queries 2013-01-29 10:01:09 -02:00
Fabián Rodríguez
d4d3bf8af6 fix translation in contacts_helper 2013-01-29 10:01:08 -02:00
Fabián Rodríguez
649844ea6a Refactor contacts/index 2013-01-29 10:01:08 -02:00
Fabián Rodríguez
4fa04e88ac don't join the tags table here, it makes the query slower 2013-01-28 18:57:26 -02:00