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

13503 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jonne Haß
db8b137899 bump warden 2013-08-01 22:21:50 +02:00
Jonne Haß
cc5addf7e2 bump sass 2013-08-01 22:21:50 +02:00
Jonne Haß
af749b2a72 bump redcarpet 2013-08-01 22:21:50 +02:00
Jonne Haß
f85f7e0840 bump mysql2 2013-08-01 22:21:50 +02:00
Jonne Haß
b5c2578af5 bump pg 2013-08-01 22:21:50 +02:00
Jonne Haß
f5015f27a7 bump nokogiri 2013-08-01 22:21:50 +02:00
Jonne Haß
6d53f989f3 bump fog 2013-08-01 22:21:50 +02:00
Jonne Haß
bbe8f6373c bump faraday 2013-08-01 22:21:49 +02:00
Jonne Haß
b22cb395b7 bump asset_sync 2013-08-01 22:21:49 +02:00
Jonne Haß
b98710bc63 bump net-scp 2013-08-01 22:21:49 +02:00
Jonne Haß
5d602a2774 bump font-awesome-rails 2013-08-01 22:21:49 +02:00
Jonne Haß
229be9e140 bump bcrypt-ruby 2013-08-01 21:59:36 +02:00
Jonne Haß
1bb2485c33 bump webmock 2013-08-01 21:59:36 +02:00
Jonne Haß
a3dba71809 bump foreigner 2013-08-01 21:59:36 +02:00
Jonne Haß
2fcc6bfc5a bump fixture_builder 2013-08-01 21:59:36 +02:00
Jonne Haß
3c9e3853e8 bump addressable 2013-08-01 21:59:36 +02:00
Jonne Haß
d113538171 bump remotipart 2013-08-01 21:59:36 +02:00
Jonne Haß
e3de9ad52d bump guard 2013-08-01 21:59:36 +02:00
Jonne Haß
b9d130f962 bump cucumber 2013-08-01 21:59:36 +02:00
Jonne Haß
70d1384cb1 bump omniauth-twitter 2013-08-01 21:59:36 +02:00
Jonne Haß
b2e7eb4e2b bump twitter 2013-08-01 21:59:36 +02:00
Jonne Haß
f76cd9c596 bump rails-i18n 2013-08-01 17:54:55 +02:00
Jonne Haß
7310375c77 bump i18n-inflector 2013-08-01 17:54:55 +02:00
Jonne Haß
beda9b2a1a bump carrierwave 2013-08-01 17:54:55 +02:00
Jonne Haß
6672b1c941 bump unicorn 2013-08-01 17:53:50 +02:00
Jonne Haß
5026eccc6a Refactor and reorder backbone app initialization, fixes hovercards 
Also added cucumber feature for hovercards
 2013-08-01 12:52:16 +02:00
Jonne Haß
7057f77924 fix ActivityStreams::Photo migration 2013-07-31 20:57:01 +02:00
Jonne Haß
2916b8b216 hide other flash messages before showing a new one 2013-07-31 20:17:31 +02:00
Jonne Haß
46ab67beed stabilize features/reshare_mobile.feature 2013-07-31 19:05:54 +02:00
Jonne Haß
3ae2d2e43c stabilize features/signs_up.feature 2013-07-31 17:00:13 +02:00
Jonne Haß
14a3251d3b Merge branch 'L3MNcakes-4163-user-sharing' into develop 2013-07-31 15:21:30 +02:00
Plurrtard
6900146852 fix #4163 - Now updating correct contact attribute on retraction 
Added test case for Issue #4163
 2013-07-31 15:20:57 +02:00
Jonne Haß
7729b1e8e0 Merge branch 'Team-D-feature/4144-convert_ActivityStreamSPhoto_to_StatusMessages' into develop 2013-07-31 15:18:28 +02:00
carolina
f6fe74aeae Migration to turn ActivityStreams::Photo to StatusMessage 
deletes ActivityStream model and all it's references

update migration with the without_protection option to disable mass assignment protection
 2013-07-31 15:15:08 +02:00
Jonne Haß
4710144b02 Merge pull request #4293 from Team-D/feature/4274-error_message_vanishes_too_fast 
fixes issue 4274 flash-messages stay longer
 2013-07-31 15:12:44 +02:00
Jonne Haß
7ea2888c6d Merge branch 'tsrivishnu-publisher_autoclose' into develop 2013-07-31 15:09:23 +02:00
Sri Vishnu Totakura
f5c8ebcb90 publisher closes when clicked anywhere outside its division after opening 
fixed app.publisher undefined error

app view removed and click event binder added in the publisher view initializer.

removed unwanted console log

attempted to fix this.el undefined error
 2013-07-31 15:04:57 +02:00
Jonne Haß
77c94bf4c2 Merge branch 'ZBarg-feature/improve-post-title' into develop 2013-07-31 15:01:44 +02:00
Damien
f4b3f2fd1e Consider Markdown header content as post title 
clarify regexp and correct some bad backtracking

add specs

rewrite regex

convert mardown style title to plain text title

fix bad indentation

add jasmine test for post-viewer.js

tries to fix bad jasmine test
 2013-07-31 14:59:02 +02:00
Jonne Haß
d5fbeff03b Merge branch 'Ruxton-develop' into develop 2013-07-31 14:27:08 +02:00
Ruxton
3c605c47e0 Fix error in facebook service delete_post 
Add spec coverage for FB delete_post
 2013-07-31 14:23:13 +02:00
Florian Staudacher
fd748b314c Merge pull request #4332 from MrZYX/bump_cabybara 
Update capybara
 2013-07-31 05:03:58 -07:00
Jonne Haß
300752fc87 bump capybara 
* removed wait_until where possible
* replaced wait_until with DOM obersavtions
* added match: :first to all finders that assumed getting the first element
* replaced evaluate_script with execute_script where possible
* replaced a few execute_script with DOM observations through Capybara
* removed sleep where possible
* replaced sleep with DOM obersvations
* replaced "wait for ajax" with DOM obersavations
* replaced alert confirmation with new selenium API
* bump selenium webdriver
* made any other fixes to get green again
 2013-07-31 01:47:23 +02:00
Jonne Haß
cdc29e449d Move facebox configuration into the initialization of the Backbone app 
Facebox is already called from some Backbone views very early, making its icons 404 otherwise.
 2013-07-29 12:20:05 +02:00
Jonne Haß
3627f46b2d Merge pull request #4309 from jflemingprod/feature/4068-logout-delete-request 
Log out should be a DELETE request
 2013-07-17 21:56:15 +02:00
J. Fleming
b75bb8dc0a Change devise config and templates to make logout a delete request. 2013-07-17 21:00:18 +02:00
Jonne Haß
4d196c5453 Merge pull request #4289 from rivendale2010/patch-2 
fix link to background image
 2013-07-09 19:23:06 +02:00
carolina
8ba60853e9 fixes issue 4274 flash-messages stay longer 2013-07-09 14:35:35 +02:00
rivendale
f2481b0f55 fix link to background image 2013-07-07 18:06:01 -03:00
Jonne Haß
4fb3170f7f Merge branch 'netom-4257-conversations-timeago' into develop 2013-07-07 14:45:45 +02:00