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

13214 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jonne Haß
fd069af2c6 Merge branch 'activity_more' of git://github.com/movilla/diaspora into movilla-activity_more 
Conflicts:
	Changelog.md
 2013-04-13 12:53:31 +02:00
Jonne Haß
7a0d1c647a Merge pull request #4096 from RoonyH/3897-submit_a_comment_by_shift+enter 
3897 submit a comment by shift+enter
 2013-04-13 03:49:40 -07:00
Jonne Haß
ac7bccfe4c bump sidekiq 2013-04-13 11:27:26 +02:00
Jonne Haß
bef05c14d7 Merge branch '3681-infinite-scroll-on-contact-page' of git://github.com/asphxia/diaspora into develop 
Conflicts:
	Changelog.md
 2013-04-10 18:24:47 +02:00
Jonne Haß
15418eae67 Merge pull request #4112 from marpo60/issues_4017_4107_fixes 
close issues #4017 and 4107 by including jquery.textchange
 2013-04-10 07:58:30 -07:00
Juan Manuel Azambuja
01d91e02d4 Add changelog entry for #4017 & #4107 2013-04-10 11:17:40 -03:00
Jonne Haß
f272c7ed03 Merge branch 'brauliomartinezlm-4058_redirect_to_downcase_version_of_tags' into develop 2013-04-10 10:20:18 +02:00
Braulio Martinez
c651cbab78 Always redirect user to downcase version of tags on UTF-8 encoding 2013-04-10 00:08:58 -03:00
Juan Manuel Azambuja
5a85fd71f1 close issues #4017 and 4107 by including jquery.textchange 2013-04-09 16:21:19 -03:00
Aruna Herath
b0879dd256 added same feature to publisher 2013-04-08 19:29:36 +05:30
Aruna Herath
5f6ce87a23 added shift+enter key from new comment box to submit the comment. 2013-04-08 19:08:29 +05:30
movilla
bc87b501f2 Fix show more post in my activity mobile page. Close #4108 2013-04-08 00:04:42 +02:00
Florian Staudacher
06d67bf854 Merge pull request #4099 from svbergerem/feature/post-preview 
Preview posts in stream
 2013-04-07 11:38:11 -07:00
Steffen van Bergerem
6e724fc1d4 preview posts in stream 2013-04-07 17:43:27 +02:00
Jonne Haß
0ca40d0abc ignore warning about .ruby-version 2013-04-07 11:13:58 +02:00
Jonne Haß
65ce91bbd1 Merge pull request #4106 from jaywink/4057-bookmarklet-post-cannot-be-edited 
Include missing javascript in bookmarklet to fix uneditable post content
 2013-04-06 14:41:34 -07:00
Jason Robinson
9c0c5a7258 Include missing javascript in bookmarklet, regression introduced in commit ffc6c1102e. Fixes #4057 2013-04-07 00:06:02 +03:00
Jonne Haß
6fae984e5a Merge pull request #4101 from brunomachado/feature/3796-convert-stylesheets-to-scss 
Convert some stylesheets to SCSS
 2013-04-06 12:52:08 -07:00
Bruno Machado
1e50d1465a Convert some stylesheets to SCSS #3796 2013-04-06 15:34:15 -03:00
Jonne Haß
0149dbf9ad Merge pull request #4102 from movilla/fixed_navbar 
Mobile buttons are only clickable when scrolled to the top. Close #3847
 2013-04-05 11:25:38 -07:00
movilla
33ecc50fbc Mobile buttons are only clickable when scrolled to the top 2013-04-05 19:16:15 +02:00
Jonne Haß
0f05506f8d Merge pull request #4098 from embs/feature/3795-fix-default-profiles-image-url 
Fix default image url in profiles table. Closes #3795
 2013-04-04 15:54:15 -07:00
embs
16cf699d4b Fix default image url in profiles table. Closes #3795 2013-04-04 19:22:43 -03:00
Jonne Haß
be470784c5 add app directory to the autoload paths so that the worker files are loaded in development mode too 2013-04-04 23:32:11 +02:00
Florian Staudacher
19f94fb169 Merge pull request #4095 from embs/feature/3064-add-services-explanation 
Add explanation to services index page. Closes #3064
 2013-04-04 12:38:50 -07:00
embs
4ef37c64be Add explanation to services index page. Closes #3064 2013-04-04 15:51:11 -03:00
Jonne Haß
92a2a9189d bump sidekiq and cleanup unicorn.rb 2013-04-04 20:42:41 +02:00
Dennis Schubert
3b7bb2c44e Fix the tag number in sidekiq's changelog notes 
... it's been a while ...
 2013-04-04 12:22:50 +03:00
Dennis Schubert
f3b7d57b3a Merge pull request #3993 from MrZYX/sidekiq 
Sidekiq (+ some cleanup)
 2013-04-03 15:19:15 -07:00
Florian Staudacher
f08f4a22f7 Merge pull request #4089 from svbergerem/feature/add-hotkeys 
added hotkeys to navigate in stream
 2013-04-02 13:11:06 -07:00
Steffen van Bergerem
a693a0970b added hotkeys to navigate in stream 2013-04-02 19:24:20 +02:00
Jonne Haß
85ae8e2ac5 Merge pull request #4091 from instrumentio/feature/rubygems-2 
ensure v2 release of rubygems
 2013-04-02 10:10:17 -07:00
Alexander Wenzowski
a2e9711c76 bundler version should not be a hard dependency per #4091 2013-04-02 12:29:18 -04:00
Alexander Wenzowski
5b0d33ade0 ensure v2 release of rubygems 2013-04-01 22:17:25 -04:00
Jonne Haß
4c5a298304 Merge pull request #4088 from brunomachado/feature/2940-remove-borders 
Remove unnecessary dotted CSS borders
 2013-04-01 12:39:20 -07:00
Bruno Machado
29af94ce4e Remove unnecessary dotted CSS borders. Closes #2940 2013-04-01 15:53:27 -03:00
Jonne Haß
704113f896 replace remaining Postzord::Dispatcher.build(self, profile).post with call to the new method 2013-03-31 16:52:18 +02:00
Tom Scott
74690088f2 Update changelog. Apologize for idiocy. 2013-03-30 09:33:42 -04:00
Tom Scott
cdc4e869d1 Merge pull request #3841 from tubbo/fix-close-buttons 
Align close button images

Sorry this took so long to merge in guys, I had this weird feeling that I had already done so. Looks like the 'X' button is coming after the custom popover HTML so this looks OK to merge in.
 2013-03-30 06:29:19 -07:00
Tom Scott
8a7f6c9fdf Merge pull request #4067 from movilla/multiphoto 
Add multiphoto for mobile post. Close #4053
 2013-03-30 06:26:07 -07:00
Tom Scott
af8485f47f Merge pull request #4074 from L3MNcakes/feature/3975-send-profile-update 
Issue #3976: Send a profile update alongside a sharing notification
 2013-03-30 06:07:16 -07:00
movilla
b257939f7e Add multiphoto for mobile post 2013-03-30 10:59:06 +01:00
Jonne Haß
2ebd1a8229 Merge pull request #4084 from marpo60/issue_4082_fix_right_section_mail_icon 
Fix email icon on right section
 2013-03-28 07:28:09 -07:00
Juan Manuel Azambuja
c10aefb30f Fix email icon on right section 2013-03-28 11:16:18 -03:00
Jonne Haß
8c429c5915 Merge pull request #4083 from marpo60/issue_4081_fix_social_media_icons 
Add inline-block directive to social_media_icons on publisher
 2013-03-28 07:02:08 -07:00
Juan Manuel Azambuja
d68aac88f8 Add inline-block directive to social_media_icons on publisher 2013-03-28 10:52:10 -03:00
Jonne Haß
1b71436c63 revert to old behaviour of only having mysql in the Gemfile.lock, fixes #4080 2013-03-28 00:56:54 +01:00
Fabian Rodriguez
18f260a06f Merge pull request #4073 from marceloeloelo/fix_getting_started_confirmation 
Fix confirmation at getting_started page
 2013-03-26 15:05:25 -07:00
Marcelo Casiraghi
b0f76f1764 Fix confirmation at getting_started page 2013-03-25 23:09:38 -03:00
Jonne Haß
f956fca494 make all database adapters available in test env, reensure test related rake tasks are available in development env 2013-03-24 13:48:12 +01:00