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

13084 commits

This branch
This branch
All branches
Author SHA1 Message Date
movilla
7a8269ebf3 * Add test for mobile page: Edit profile mobile, Conversations mobile, Getting Started mobile 
* Complete the existing: Post mobile.
* Complete some test for no mobile: Edit profile, Post main.
* Fix little error css and js mobile.
* Add file-upload-custom javascripts to mobile.js.
 2013-03-10 15:02:18 +01:00
Jonne Haß
3c29007c39 Merge pull request #4051 from Flaburgan/clean-delete-validation 
Remove duplicate sentence from delete account confirmation pop up
 2013-03-09 05:50:19 -08:00
Flaburgan
98da6a3978 Remove duplicate sentence from delete account confirmation pop up 2013-03-09 14:15:11 +01:00
Florian Staudacher
8829d2a81e zsh doesn't find custom source files otherwise ... [ci skip] 2013-03-08 15:50:42 +01:00
Florian Staudacher
f8513c2005 Merge pull request #3944 from MrZYX/modular_layouts 
Modular layouts
 2013-03-08 02:50:43 -08:00
Jonne Haß
f61ef4069d Merge pull request #4046 from embs/feature/4042-show-timestamp-on-comment-hover 
Show timestamp when hovering on comment time-ago string. Closes #4042
 2013-03-08 02:03:34 -08:00
embs
e7daa978e3 Show timestamp when hovering on comment time-ago string. Closes #4042 2013-03-08 00:33:19 -03:00
Jonne Haß
20484fd3dd Merge pull request #4036 from pestrada/4030-resize-textarea-after-commenting 
reset comment box height after posting a comment
 2013-03-07 12:12:59 -08:00
pestrada
18aeeb052b reset comment box height after posting a comment 
refactor create comment method
 2013-03-07 12:55:03 -06:00
Jonne Haß
55cb070ac9 add header to sign up page 2013-03-06 19:01:07 +01:00
Jonne Haß
ffc6c1102e dry up and modularize layouts 2013-03-06 19:00:34 +01:00
Jonne Haß
43f21d6e55 Pass the real values to stderr_path and stdout_path in unicorn.rb since it runs a case statement on them 2013-03-05 23:37:51 +01:00
Jonne Haß
d02e9b72c2 Merge pull request #4037 from marpo60/avoid_redirect 
Avoid redirect
 2013-03-04 00:41:12 -08:00
Marcelo Dominguez
88e76448b6 Avoid unnecessarily redirect 2013-03-03 23:10:53 -02:00
Marcelo Dominguez
e2ad0cbb81 Remove whitespaces 2013-03-03 23:10:31 -02:00
Jonne Haß
bc0a9c8f89 Merge pull request #4034 from Gallaecio/gl 
Updated the Galician (gl) translation.
 2013-03-03 12:34:34 -08:00
Adrián Chaves Fernández (Gallaecio)
3d84467532 Updated the Galician (gl) translation. 2013-03-03 21:15:07 +01:00
Jonne Haß
ad16451e1f Merge pull request #4006 from afrerich/feature/3899-long-tags-break-the-layout 
fade long tag names - refs diaspora/diaspora#3899
 2013-03-02 12:20:15 -08:00
aaronf
cd78aa5a65 fade long tag names - refs diaspora/diaspora#3899 2013-03-02 13:57:30 -06:00
Jonne Haß
2ac16f41fb Merge pull request #4024 from instrumentio/feature/corrupt-fsck-roxml 
roxml should be loaded from rubygems
 2013-03-01 15:46:42 -08:00
Alexander Wenzowski
98207ed9ea roxml should be loaded from rubygems 2013-03-01 17:36:38 -05:00
Jonne Haß
7a89d8b161 only try to delete a post from a service if we're able to 2013-03-01 18:54:01 +01:00
Jonne Haß
1256fda24b make randomly on postgres failing spec pending for now 2013-03-01 03:54:44 +01:00
Jonne Haß
7b56c2dd52 Do not fail on receiving a SignedRetraction via the public route 2013-03-01 03:38:36 +01:00
Jonne Haß
fa8f4bd0b1 Merge pull request #4018 from instrumentio/feature/bundler 
bundler should communicate with rubygems using ssl
 2013-02-28 16:31:40 -08:00
Alexander Wenzowski
63f9a6f1ba bundler should communicate with rubygems using ssl 2013-02-28 19:05:39 -05:00
Jonne Haß
c5ecc872ce add integration spec for retracting a comment 2013-02-28 17:20:33 +01:00
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
Jonne Haß
1b4f919b5e Merge pull request #4008 from pestrada/3836-avoid-empty-comments 
avoid posting empty comments
 2013-02-26 02:47:33 -08: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ß
3c9ce435e1 Merge branch 'hotfix/0.0.3.1' into develop 
Conflicts:
	Changelog.md
	config/defaults.yml
 2013-02-24 17:26:45 +01:00
Jonne Haß
b487c389bc release 0.0.3.1 2013-02-24 17:25:02 +01:00
Jonne Haß
6bb644f058 Sort tag followings alphabetically, not in reverse, fixes #3986 2013-02-24 17:23:01 +01:00
movilla
5d46baf33e Wrap text if too long in mobile notifications 
Conflicts:
	Changelog.md
 2013-02-24 17:23:01 +01:00
movilla
bfa8b92c57 Fixed removing images from publisher on the profile and tags pages 2013-02-24 17:23:01 +01:00
Jonne Haß
ee0d7b2e8b move custom splash page login into the controller, fixes #3991 2013-02-24 17:23:01 +01:00
movilla
099f4a61e4 Include our custom fileuploader on the mobile site too 2013-02-24 17:23:01 +01:00
Jonne Haß
e232e164e4 exec foreman in script/server 2013-02-24 17:23:00 +01:00
Jonne Haß
ce8b3c89db update changelog; replace "pre" releases with a plain "head" 
Conflicts:
	config/defaults.yml
 2013-02-24 17:22:56 +01:00
Florian Staudacher
c984499d38 Merge pull request #3997 from MrZYX/reversed_tag_followings 
Sort tag followings alphabetically, not in reverse, fixes #3986
 2013-02-24 08:05:26 -08:00
Jonne Haß
0cf1c2d020 Sort tag followings alphabetically, not in reverse, fixes #3986 2013-02-24 16:22:01 +01:00
Jonne Haß
75c67e7d9b Merge pull request #4002 from marpo60/refactor_people_show 
Refactor people show
 2013-02-24 07:09:10 -08:00
Fabián Rodríguez
eb8e777873 update changelog 2013-02-24 12:24:35 -02: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