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

14604 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jonne Haß
ccae3a1c64 lock nokogiri to 1.6.1, closes #4996 2014-06-18 11:44:46 +02:00
Erwan Guyader
3ebc0f0387 Test returned path for Show More on mobile 
- Added test when the currant page is Aspects Stream
  - Modified test for the Stream page to account for the new possibility
    (i.e current page is Aspects Stream)
 2014-06-17 21:36:38 +02:00
Erwan Guyader
e804f30823 Code style + allow aspects to be nil 
- Only use old hash style
  - Don't replace the aspect ids list with an empty array if it's nil
 2014-06-17 21:19:17 +02:00
Lukas Matt
10117b81b3 Hide report icon on SPV if author is current user 2014-06-17 12:23:54 -04:00
Lukas Matt
dec7ef667e Hide SPV controls unless authenticated 
* cleaned and removed dead code

refs diaspora/diaspora#4711
 2014-06-17 11:31:16 -04:00
Erwan Guyader
499eb6a9bb Load right stream with Show More on mobile 
- Load aspects stream if user is on this stream instead of loading the
    activity stream
 2014-06-16 18:13:05 +02:00
Jonne Haß
f23fb6b6cb Actually allow false as a value for sidekiq.backtrace in our Sidekiq 
middleware
 2014-06-13 16:04:40 +02:00
Jonne Haß
fadd707ae0 Merge pull request #4985 from jaywink/fix-mobile-bmarklet-services 
Fix toggling services for mobile bookmarklet
 2014-06-03 00:07:27 +02:00
Jason Robinson
1bd7989045 Fix toggling services for mobile bookmarklet 2014-06-02 23:29:47 +03:00
Jonne Haß
72d1ed8f7d bump acts-as-taggable-on 2014-06-01 18:42:51 +02:00
Jonne Haß
b20712e1ad Merge pull request #4976 from jaywink/4949-post-submit-actions 
Hint that something is happening when user submits status message via publisher
 2014-06-01 17:36:11 +02:00
Jonne Haß
1a3b4561a5 Merge pull request #4977 from diaspora/update_gems 
Update gems
 2014-06-01 15:31:25 +02:00
Jason Robinson
ad0982f35e Remove custom bookmarklet error message. 
Flash error is shown on bookmarklet post error. On error, return post_something message to form
 2014-06-01 15:37:54 +03:00
Jason Robinson
f130ab3842 Remove double setButtonsEnabled in publisher error 2014-06-01 15:17:16 +03:00
Jason Robinson
6cf484c9a3 Make sure publisher is totally hidden in bookmarklet after post success 2014-06-01 15:02:40 +03:00
Jonne Haß
94375cdc18 bump zip-zip 2014-06-01 13:55:59 +02:00
Jonne Haß
e5f8b5fc57 bump sinon-rails 2014-06-01 13:55:59 +02:00
Jonne Haß
34fc681bc4 lock rails-timeago to 2.4.0 2014-06-01 13:55:59 +02:00
Jonne Haß
e3fd3520f2 bump webmock 2014-06-01 13:55:59 +02:00
Jonne Haß
55f496cb66 bump unicorn 2014-06-01 13:55:59 +02:00
Jonne Haß
38ee2f5faf bump uglifier 2014-06-01 13:55:58 +02:00
Jonne Haß
dda4e52aac bump typhoeus 2014-06-01 13:55:58 +02:00
Jonne Haß
50778e5b8b bump test_after_commit 2014-06-01 13:55:58 +02:00
Jonne Haß
91eb92180b bump strong_parameters 2014-06-01 13:55:58 +02:00
Jonne Haß
48a38231af bump selenium-webdriver 2014-06-01 13:55:58 +02:00
Jonne Haß
bc9eaed382 bump rspec-rails 2014-06-01 13:55:58 +02:00
Jonne Haß
4aaeb5f40f bump redcarpet 2014-06-01 13:55:57 +02:00
Jonne Haß
bc6ac28841 bump rb-inotify 2014-06-01 13:55:57 +02:00
Jonne Haß
08610f1b52 bump rack-cors 2014-06-01 13:55:57 +02:00
Jonne Haß
b749603d1e bump omniauth-wordpress 2014-06-01 13:55:57 +02:00
Jonne Haß
ef62fb8c89 bump omniauth 2014-06-01 13:55:57 +02:00
Jonne Haß
75107080c4 bump nokogiri 2014-06-01 13:55:57 +02:00
Jonne Haß
c25705a7e3 bump mysql2 2014-06-01 13:55:56 +02:00
Jonne Haß
dca5a6d8f3 bump markerb 2014-06-01 13:55:56 +02:00
Jonne Haß
241c584a0d bump guard-rspec 2014-06-01 13:55:56 +02:00
Jonne Haß
bb3fc500b1 bump gon 2014-06-01 13:55:56 +02:00
Jonne Haß
7b3abb1f11 bump fuubar 2014-06-01 13:55:56 +02:00
Jonne Haß
1704d71b22 bump fog 2014-06-01 13:55:51 +02:00
Jason Robinson
8fead54ab6 Make publisher spinner also work in bootstrap publisher 2014-06-01 14:52:59 +03:00
Jason Robinson
128be9204c Refactor UI hint on status message submit. 
Now we close the publisher on submit and reopen it on error. The spinner is shown while submission is in progress. Fixes #4949
 2014-06-01 14:25:34 +03:00
Jonne Haß
e8999332bf bump factory_girl_rails 2014-06-01 13:22:08 +02:00
Jonne Haß
85dc46b0de bump entypo-rails 2014-06-01 13:21:25 +02:00
Jonne Haß
5654d5921f bump devise 2014-06-01 13:20:06 +02:00
Jonne Haß
9f54d40428 bump database_cleaner 2014-06-01 13:19:14 +02:00
Jonne Haß
0ba9df6989 bump cucumber-rails 2014-06-01 13:18:24 +02:00
Jonne Haß
061373d2d4 bump compass-rails 2014-06-01 13:17:59 +02:00
Jonne Haß
cad043bfd7 bump carrierwave 2014-06-01 13:16:43 +02:00
Jonne Haß
f0b6f9315d bump backbone-on-rails 2014-06-01 13:15:16 +02:00
Jonne Haß
418c8d653d bump addressable 2014-06-01 13:11:57 +02:00
Jason Robinson
6fd4894997 Add error flash message to publisher on error from server 2014-06-01 13:21:45 +03:00