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

13973 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jonne Haß
7461cfad8a bump database_cleaner 2014-01-13 12:23:05 +01:00
Jonne Haß
7eb60dfd42 bump cucumber-rails 2014-01-13 12:23:05 +01:00
Jonne Haß
77e989dc8a bump client_side_validations 2014-01-13 12:23:05 +01:00
Jonne Haß
b1c9cec265 bump unicorn 2014-01-13 12:23:05 +01:00
Jonne Haß
9be498bce8 bump nokogiri 2014-01-12 23:27:16 +01:00
Jonne Haß
358076c14f bump mobile-fu 2014-01-12 23:27:16 +01:00
Jonne Haß
d706932db0 bump mysql2 2014-01-12 23:27:16 +01:00
Jonne Haß
2036a9a80f bump strong_parameters 2014-01-12 23:27:16 +01:00
Jonne Haß
4648654e03 bump typhoeus 2014-01-12 23:27:16 +01:00
Jonne Haß
ab7cbcc4cc bump timecop 2014-01-12 23:27:16 +01:00
Jonne Haß
4339d69f1e bump sidekiq 2014-01-12 23:27:16 +01:00
Jonne Haß
0db8086916 Add compatibility layer for old rubyzip 
https://github.com/rubyzip/rubyzip#important-note
 2014-01-12 23:27:15 +01:00
Fabian Rodriguez
08acd6e5bf bump Timecop 
Time.now remains the same inside the block, outside of the block it
returns
 2014-01-12 23:27:15 +01:00
Jonne Haß
42f790fa13 Merge pull request #4666 from jaywink/signup-form-error-redirect 
Instead of redirect on signup form validation, render new
 2014-01-11 14:08:18 -08:00
Jonne Haß
7608319787 Merge pull request #4665 from svbergerem/fix-500-conversations 
fix bug in conversations view causing server error
 2014-01-08 23:55:09 -08:00
Jonne Haß
42d2d7cb01 Merge pull request #4677 from arlogn/bookmarklet-publisher-more-usable-mobile 
bookmarklet publisher more usable mobile
 2014-01-08 23:50:23 -08:00
arlogn
31177e6bdb bookmarklet publisher more usable mobile 2014-01-09 02:33:47 +01:00
Jonne Haß
ca9e2e24ea Merge pull request #4670 from arlogn/bookmarklet-publisher-more-usable 
bookmarklet publisher more usable
 2014-01-07 11:29:50 -08:00
Jonne Haß
70f74dc972 Merge pull request #4659 from jaywink/simple-captca-for-signup-page 
Simple captca for signup page
 2014-01-06 14:48:59 -08:00
Jason Robinson
35ece9d65f Instead of redirect on signup form validation, render new with submitted data. 2014-01-06 22:12:07 +02:00
Jason Robinson
db71c9c50b Add mobile signup page captcha. Add test for user.sign_up method. Rewrite simple_captcha views to haml. Revert .rvmrc, fix indentation in config examp$ 2014-01-06 22:00:53 +02:00
maruf
c17a474142 Simple captcha for signup page 2014-01-06 22:00:37 +02:00
Jonne Haß
867b0a7b79 Enable Ruby 1.9.3 on Travis 
https://www.loomio.org/discussions/10519?proposal=6611
 2014-01-06 11:54:16 +01:00
Jonne Haß
7c9460d5b0 Merge pull request #4667 from Flaburgan/fix-markdown-display 
Fix markdown indication in the publisher when the user upload an image
 2014-01-06 02:22:21 -08:00
Jonne Haß
7b5ea69d8a Merge pull request #4668 from ZBarg/feature/remove-location-when-publisher-cleared 
Fix: remove location when publisher is cleared by user
 2014-01-06 02:16:50 -08:00
arlogn
61bfbc82e0 bookmarklet publisher more usable 2014-01-06 01:07:05 +01:00
Damien Monet
b849d6c641 Fix: remove location when publisher is cleared by user 2014-01-05 11:09:03 +01:00
flaburgan
f758163f2e Fix markdown indication in the publisher when the user upload an image 2014-01-04 15:58:20 +01:00
Florian Staudacher
9be0b075ac add changelog entry for #4623 [ci skip] 2014-01-04 01:58:41 +01:00
Steffen van Bergerem
2e50a16567 fix bug in conversations view causing server error 2014-01-04 01:54:45 +01:00
Florian Staudacher
78d712b926 Merge pull request #4623 from Flaburgan/bump-selenium 
Bump selenium, close #4621
 2014-01-03 16:18:06 -08:00
flaburgan
3174310ba0 Bump selenium, close #4621 2014-01-03 23:12:26 +01:00
Jonne Haß
2734471feb Merge pull request #4653 from svbergerem/3119-change-more-comments-link 
Change more comments link
 2014-01-02 01:14:33 -08:00
Florian Staudacher
d32bd8100a Merge pull request #4644 from svbergerem/conversations-participants 
Remove participants popover (- will be back in a different way)
 2014-01-01 14:09:46 -08:00
Steffen van Bergerem
55b967caf9 remove participants popover + improve conversations menu 2014-01-01 21:58:56 +01:00
Fabian Rodriguez
54def634a7 Merge pull request #4648 from arlogn/4446-webkit-search-spinner-overlaps 
4446 webkit search spinner overlaps
 2014-01-01 09:15:53 -08:00
Steffen van Bergerem
ef128575ae Change more comments link 2013-12-30 13:20:58 +01:00
arlogn
ae3b50080c Fix spinner overlapping in webkit search box (#4446) and replace deprecated pseudo class :-moz-placeholder 2013-12-29 17:16:56 +01:00
Jonne Haß
5d83402dc3 Merge pull request #4628 from jaywink/4627-twitter-truncation-problem 
Fix posting to Twitter by correctly catching over limit exception
 2013-12-22 14:14:30 -08:00
Fabian Rodriguez
78c923de89 Merge pull request #4197 from MrZYX/bump_sidekiq 
Update Sidekiq
 2013-12-21 05:20:54 -08:00
Fabian Rodriguez
12ab9004c4 Merge pull request #4636 from MrZYX/bump_ruby 
bump recommended ruby version to 2.0.0
 2013-12-21 05:09:05 -08:00
Jonne Haß
4dcc712ea1 bump recommended ruby version to 2.0.0 2013-12-21 09:28:03 +01:00
Jonne Haß
b3ebe1a408 Merge pull request #4622 from svbergerem/improve-conversations-view 
Improve conversations view, port to bootstrap
 2013-12-16 12:55:48 +01:00
Steffen van Bergerem
a96611c259 use bootstrap labels 2013-12-16 00:46:55 +01:00
Steffen van Bergerem
206e3f9422 fix mobile 2013-12-15 23:40:08 +01:00
Jason Robinson
e665ebdab1 Fix posting to Twitter by correctly catching over limit exception (#4627). Also when doing a retry, make smaller cuts to max characters 2013-12-15 22:01:09 +02:00
Steffen van Bergerem
24310fe5a9 change layout 2013-12-15 20:14:55 +01:00
Steffen van Bergerem
5ab777f8cb remove unused code 2013-12-15 18:01:32 +01:00
Steffen van Bergerem
c24cfb432d fix facebox in conversations view 2013-12-15 14:20:47 +01:00
Steffen van Bergerem
c11b744a7f port conversations view to bootstrap 2013-12-15 13:01:24 +01:00