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

14887 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jonne Haß
9c88fde821 Switch Faraday adapter to typhoeus 
It uses curl which has less problems connecting
to a missconfigured IPv6 host (falls back to v4)
 2014-09-07 10:47:47 +02:00
Jonne Haß
c225bb17ce add pry and pry-debundle to the Gemfile 
If you now install pry-byebug and pry-stackexplorer,
you'll get a nice debugger
 2014-09-06 23:13:53 +02:00
jaideng123
642e5ab45b Fixed Open Graph db insertion 2014-09-06 14:49:34 -05:00
Jonne Haß
01e0127287 Ignore embedded photos if invalid 
For example if they're already present
Also refactor StatusMessage XML specs
 2014-09-06 04:52:18 +02:00
Jonne Haß
476376dcb0 Don't retry Diaspora::AuthorXMLAuthorMismatch 
They're not healable and seem to only occur on
Friendica posts
 2014-09-06 03:26:07 +02:00
Jonne Haß
b35eb70975 Merge pull request #5204 from diaspora/update_gems 
Update gems
 2014-09-06 02:39:18 +02:00
Jonne Haß
dac5bbbd96 bump fog-brightbox 2014-09-06 00:19:53 +02:00
Jonne Haß
0af37d5d0b bump celluloid 2014-09-06 00:18:20 +02:00
Jonne Haß
fb058609e3 bump test_after_commit 2014-09-06 00:17:36 +02:00
Jonne Haß
3a7b0db67b bump rails-i18n 2014-09-05 23:52:17 +02:00
Jonne Haß
ef501f755c bump jquery-rails 2014-09-05 23:51:33 +02:00
Jonne Haß
9870069c56 bump rspec 2014-09-05 23:46:56 +02:00
Jonne Haß
aa09f0cbb1 Merge branch 'release/0.4.1.0' into develop 2014-09-03 23:38:27 +02:00
Jonne Haß
e03f7f738b make es-CO available 2014-09-03 23:38:20 +02:00
Jonne Haß
b424b94660 updated 45 locale files [ci skip] 2014-09-03 23:14:23 +02:00
Jonne Haß
4e5fa6cc7e Merge branch 'release/0.4.1.0' into develop 2014-09-03 15:53:58 +02:00
Jonne Haß
2d9c6a945d Don't let the dropdown indicator flow into the user name in the user 
menu
 2014-09-03 15:53:01 +02:00
Jonne Haß
d4dc20f59c Merge branch 'release/0.4.1.0' into develop 2014-09-03 11:17:04 +02:00
Jonne Haß
b5de6cded9 Merge pull request #5200 from jhass/static_user_menu 
Prevent user menu from moving
 2014-09-03 11:16:06 +02:00
Jonne Haß
5bbf8cd341 Merge branch 'release/0.4.1.0' into develop 2014-09-02 14:27:07 +02:00
Steffen van Bergerem
a627f65ef9 Correct default rails environment 2014-09-02 14:25:51 +02:00
Jonne Haß
12dc9cbc23 prevent user menu from moving 2014-09-02 01:17:18 +02:00
Jonne Haß
291a2f31df Merge branch 'release/0.4.1.0' into develop 2014-09-01 19:40:40 +02:00
Florian Staudacher
36e92b322f fix hovercard aspect selectio z-index by moving it out of the stream element 
- create handlebars template for hovercards
- fix notifications-dropdown (workaround) to remain open when aspect
  selector is clicked
 2014-09-01 19:39:23 +02:00
Jonne Haß
6445487936 Merge pull request #5193 from svbergerem/conversations-redirect-new 
Redirect conversations/new to conversations
 2014-09-01 18:39:22 +02:00
Steffen van Bergerem
ba0bccbef1 Redirect conversations/new to conversations 2014-09-01 17:11:56 +02:00
Jonne Haß
1ae0085d64 instruct to clear cache in changelog [ci skip] 2014-09-01 14:07:53 +02:00
Jonne Haß
f3ad3c93a3 Merge pull request #5190 from jhass/bump_handlebars 
bump handlebars_assets

Conflicts:
	Gemfile
 2014-09-01 13:53:16 +02:00
Jonne Haß
1209bea03c Merge pull request #5191 from jhass/bump_jquery 
bump jquery-rails
 2014-09-01 13:52:07 +02:00
Jonne Haß
7c6776c280 bump jquery-rails 2014-09-01 12:15:01 +02:00
Jonne Haß
5da86def06 bump handlebars_assets 2014-09-01 11:44:34 +02:00
Jonne Haß
1a5bcec394 bump omniauth 2014-09-01 11:11:06 +02:00
Jonne Haß
9d9472cc0b bump fog 2014-09-01 11:08:24 +02:00
Jonne Haß
ff0d158b6a bump coffee-script-source 2014-09-01 11:07:58 +02:00
Jonne Haß
7508300193 bump sidekiq 2014-09-01 11:03:53 +02:00
Jonne Haß
ef1cbda8c9 bump acts-as-taggable-on 2014-09-01 11:02:48 +02:00
Jonne Haß
d4a2d5708c Hide welcome to diaspora after all popovers are closed 
As a side effect stabilizes signs up cuke
 2014-08-31 21:29:46 +02:00
Jonne Haß
34bdcb889a Merge pull request #5178 from svbergerem/new-conversations 
Display new conversation form on conversations/index
 2014-08-31 19:22:25 +02:00
Steffen van Bergerem
854dcf04db Display new conversation form on conversations/index 2014-08-31 18:02:37 +02:00
Jonne Haß
d8e264231e Merge pull request #4979 from jhass/bump_sidekiq 
Bump sidekiq
 2014-08-31 02:19:29 +02:00
Jonne Haß
2b2f4e44e5 bump sidekiq 2014-08-31 00:11:23 +02:00
Jonne Haß
bb0d24eab4 Merge pull request #5181 from jhass/bump_ruby 
drop Ruby 1.9 support, recommend Ruby 2.1
 2014-08-30 23:59:20 +02:00
Jonne Haß
62ce1c3a43 Merge pull request #5185 from goobertron/mobile_features 
Add sign-up tests for mobile version
 2014-08-30 22:17:27 +02:00
Jonne Haß
99de61fdfa Merge branch 'release/0.4.1.0' into develop 2014-08-30 22:15:56 +02:00
Jonne Haß
6df79f6983 so turns out whether an id is serialized to a json integer or string 
depends on the DB backend
 2014-08-30 22:15:05 +02:00
Jonne Haß
1515848120 Merge branch 'release/0.4.1.0' into develop 
Conflicts:
	app/controllers/conversations_controller.rb
	spec/controllers/conversations_controller_spec.rb
 2014-08-30 20:09:08 +02:00
Jonne Haß
5d549f553b Escape person name in contacts json 
jQuery autoSuggest uses .html to insert it into the DOM
 2014-08-30 20:06:03 +02:00
goobertron
a90627467b Add sign-up tests for mobile, minor adjustments to other mobile tests 2014-08-30 18:35:10 +01:00
Jonne Haß
201b590423 drop Ruby 1.9 support, recommend Ruby 2.1 2014-08-29 22:56:47 +02:00
Jonne Haß
1c9f030f7f Merge pull request #5173 from remcohh/develop 
Consolidate migrations
 2014-08-29 17:42:33 +02:00