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
Oliver Azevedo Barnes
7f4bc5550d
Limit index key length when creating oembed caches
2013-07-31 14:42:49 -05: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
Tamas Laszlo Fabian
37505c5ece
Fixed timago tooltip in conversations
...
Fixed timeago errors
Added cucumber stuff to test timeago at inbox
Show localized date/time in tooltip
Remove title attributes
2013-07-07 14:43:47 +02:00
Jonne Haß
af332b6cab
Fix typo in diaspora.yml.example
2013-07-06 15:45:30 +02:00
Jonne Haß
266f47526f
Merge branch 'fabianfiorotto-patch-1' into develop
2013-07-06 13:11:00 +02:00
fabianfiorotto
3e5b29b289
Fix pagination for people list on the tag stream page
...
Update _index.html.haml
This params broken the pagination of the followers list in tags page
To reproduce try to paginate in
https://joindiaspora.com/tags/diaspora
test for people pagination patch
reducing the per page limit
removing tabs
2013-07-06 13:10:29 +02:00
Jonne Haß
d4b5261ba0
Merge branch 'Ruxton-feature/autofollow_any_user' into develop
2013-07-06 13:03:40 +02:00
Ruxton
dce1531ba6
Changed follow_diasporahq to be configurable to auto follow any user on join.
...
Fixing example config file
Updated changelog
2013-07-06 13:02:27 +02:00
Jonne Haß
405622ba6a
Merge branch 'netom-4028-gon-current-user' into develop
2013-07-06 12:46:46 +02:00
Fábián Tamás László
aa472b25de
Put preloads into gon.preloads
...
Fixed tagFollowing not getting into preloads
2013-07-06 12:45:23 +02:00
Fábián Tamás László
fb9b3e35c3
Put current user into gon
...
Fixed bug in app.js, removed unnecessray test
2013-07-06 12:44:08 +02:00
Jonne Haß
3da9b1bf7f
Merge pull request #4259 from netom/4173-disable-invite-button
...
Disable invite button after sending invite
Conflicts:
Changelog.md
2013-07-06 12:40:05 +02:00
Jonne Haß
9d4377dc23
Merge pull request #4251 from 0TWAIN0/feature/4182-render-markdown-in-mails
...
Feature/4182 render markdown in mails
Conflicts:
Changelog.md
2013-07-06 12:20:09 +02:00
Jonne Haß
d762ca5a43
Merge pull request #4226 from kevivmatrix/ajax_message
...
private message sending changed to ajax
2013-07-06 02:41:24 -07:00
kevivmatrix
6623e86a5a
private message sending changed to ajax
...
added specs for change in controller
one form of hash used in single line of code
rendering create response on sending message
redirect user to conversation page if message sent successfully
removed deprecated way of rendering file
conversations create for mobile fixed
minor code style change
updated changelog
2013-07-06 14:35:09 +05:30
