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

13837 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jonne Haß
76c75af373 Merge pull request #4556 from Raven24/conversations 
refactor conversation message creation
 2013-10-21 03:46:57 -07:00
Florian Staudacher
1c4ad0986c refactor message creation (conversations) 2013-10-20 22:46:53 +02:00
Jonne Haß
ada6594755 Merge pull request #4551 from Raven24/conversations 
refactor conversations_controller#create
 2013-10-11 01:14:01 -07:00
Florian Staudacher
830747a11e refactor conversations_controller#create 2013-10-10 21:42:46 +02:00
Florian Staudacher
a75a5088ef Merge pull request #4387 from MrZYX/refactor_twitter 
refactor twitter service model
 2013-09-30 09:13:14 -07:00
Jonne Haß
eea9467846 refactor twitter service model 2013-09-30 10:13:14 +02:00
Jonne Haß
4bc28f2285 Merge pull request #4547 from Raven24/conversations 
refactor conversations_controller a bit
 2013-09-30 01:11:33 -07:00
Florian Staudacher
260d86d501 refactor ConversationsController, move query builing to User model 2013-09-30 01:44:57 +02:00
Dennis Schubert
6e62a99732 Merge pull request #4542 from Raven24/empty_publishing 
avoid publishing empty posts
 2013-09-25 13:49:52 -07:00
Florian Staudacher
e614562470 avoid publishing empty posts (fixes #4401) 
invalidate empty posts when created by a local user

add changelog entry
 2013-09-24 21:57:22 +02:00
Jonne Haß
5aa13adfb1 Do not fail when environment.sidekiq.retry is set to false, closes #4545 2013-09-24 13:59:07 +02:00
Jonne Haß
1da6664712 updated 44 locale files [ci skip] 2013-09-24 13:46:59 +02:00
Jonne Haß
41733eab72 Merge pull request #4543 from Flaburgan/regression-404 
Fix regression in 404.html
 2013-09-23 03:19:57 -07:00
Jonne Haß
981fbc6a85 Merge pull request #4544 from ssrihari/fix-green-color-regression 
Removing the conflicting green in colors
 2013-09-23 03:19:05 -07:00
Srihari Sriraman
c379fb351e Removing the conflicting green in colors 
- This was a regression from pull request #4541
- Moved the red color to the section above to separate it from the rgb
  colors that aren't used
 2013-09-23 09:48:45 +05:30
flaburgan
635f83b240 Fix regression in 404.html 2013-09-22 20:29:35 -07:00
Jonne Haß
141fc814ba Merge pull request #4541 from ssrihari/merge-variables-to-colors 
Moving colors in variables.scss to colors.scss
 2013-09-22 04:31:10 -07:00
Srihari Sriraman
91d9d5aea5 Removing the comment regarding the source of the lines 
MrZyk pointed out that this information is preserved in git.
 2013-09-22 15:31:27 +05:30
Srihari Sriraman
034361154f Moving colors in variables.scss to colors.scss 
- Fixed the conflicting red color
- Currently using the darker red
 2013-09-22 14:40:56 +05:30
Florian Staudacher
39810e6196 decode URLs before processing them (fixes #4507) 2013-09-21 15:23:30 +02:00
Jonne Haß
134c7faf45 Merge pull request #4540 from Flaburgan/remove-last-post-link 
Remove last post link
 2013-09-21 03:10:25 -07:00
flaburgan
02ef9e08f6 Remove the (now useless) last post link from the user profile. 2013-09-20 17:37:34 -07:00
Jonne Haß
d4504589c9 add translation for connect to wordpress 2013-09-20 18:54:13 +02:00
Jonne Haß
a2b6740fed pluralize admins.user_search.you_currently 2013-09-20 13:21:33 +02:00
Fabian Rodriguez
abc06686ce Merge pull request #4523 from Flaburgan:improve-getting-started 
Conflicts:
	Changelog.md
 2013-09-19 19:37:54 -03:00
Jonne Haß
363103cdaf Make sure there always was a call to Diaspora.I18n.loadLocale before running a jasmine spec 2013-09-20 00:21:16 +02:00
Jonne Haß
ad20a8487b bump ruby-oembed 2013-09-19 23:39:13 +02:00
Jonne Haß
68da48f0d6 Merge pull request #4079 from Flaburgan/patch-3 
Fix #4078 by refactoring 404.html
 2013-09-19 14:34:34 -07:00
Jonne Haß
2296489704 Merge pull request #4532 from Flaburgan/add-help-link 
Add help link
 2013-09-19 14:33:39 -07:00
Jonne Haß
ac13e79225 Merge pull request #4529 from Flaburgan/fix-timeago-color 
Change .timeago color and align notification, fix #4502
 2013-09-19 23:32:32 +02:00
Jonne Haß
e6be888707 Merge pull request #4522 from fubik/transparent_background 
Add a white background to images displayed in the lightbox

Conflicts:
	Changelog.md
 2013-09-19 23:27:57 +02:00
Jonne Haß
540d233052 Merge branch 'PallaviTS-fix-commenting' into develop 2013-09-19 23:23:16 +02:00
Florian Staudacher
96f80c8cab cleanup jasmine tests 
and added changelog entry for bugfix #4005
 2013-09-19 23:22:49 +02:00
PallaviTS
5caa46cc83 fixing commenting 
Added jamisne tests for comments

Added 2 jasmine tests for fixing commenting

Bugfix: #4005 added changelog entry
 2013-09-19 23:22:48 +02:00
flaburgan
126e7bdc9c Refactor getting_started page, test if facebook is available, fix #4520 2013-09-18 22:06:47 -07:00
Antoine D
48dcea0746 Fix #4078 by refactoring 404.html 
I moved 404 to the assets to avoid loading font and images from joindiaspora.

 #- Can I move the design to a 404-style.css file which will be in the public repository too ?
 #- This pull request proposes to insert the two font files and the cat image, do you agree ? Depend of amazon seems really bad for me.
 2013-09-18 15:55:46 -07:00
flaburgan
0c8adb2070 Add link to the faq in the right panel 2013-09-18 15:53:04 -07:00
Jonne Haß
5a821efa18 hardcode default(=fallback) language 2013-09-18 22:14:47 +02:00
flaburgan
fcad95109f Change .timeago color and align notification, fix #4502 2013-09-17 14:50:32 -07:00
Titouan Lorieul
b53c207477 Add a white background to ALL the images in the navigation bar of the lightbox 2013-09-16 18:35:38 +02:00
Titouan Lorieul
1aca1e1e51 Add a white background to the images shown in the navigation bar of the lightbox 2013-09-16 14:18:37 +02:00
Jonne Haß
5598cd803a Merge pull request #4510 from diaspora/improve_tests2 
Improve tests2
 2013-09-14 14:47:58 -07:00
Jonne Haß
e6adb8a7ad Merge pull request #4526 from movilla/comment_mobile_test 
Add mobile test: logged out user mobile
 2013-09-14 11:24:17 -07:00
Jonne Haß
e2825e6ba7 Merge pull request #4525 from marekjm/bugfix/issue-4499 
Fix issue #4499: changed :width in .item_count to :min-width
 2013-09-14 20:23:26 +02:00
Jonne Haß
f76f35c097 Merge branch 'WebSpider-remove_s3_dependency' into develop 2013-09-14 20:17:28 +02:00
Nils Vogels
27c4b01350 Adding media files from Joindiaspora's S3 storage 
Changing 404 message to no longer use Joindiaspora's media on S3
 2013-09-14 20:16:16 +02:00
movilla
7d8f4578a4 add mobile test for comment mobile 2013-09-14 19:38:47 +02:00
Fabian Rodriguez
9d5d0aaf73 remove repeated step and stop using the publisher to create posts when is not necessary 2013-09-14 13:46:41 -03:00
Fabian Rodriguez
f341e1e0e6 remove commented test and fix typo 2013-09-14 13:46:41 -03:00
Fabian Rodriguez
7b65fdf77c add missing shoulds 2013-09-14 13:46:41 -03:00