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

14820 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Florian Staudacher
47bfd59729 Merge pull request #5179 from svbergerem/rounded-contact-search-form 
Rounded contact search input
 2014-08-29 15:29:40 +02:00
Remco Huijdts
edae905859 Add correct schema 2014-08-29 14:55:40 +02:00
Steffen van Bergerem
0ca59e828a Rounded contact search input 2014-08-29 14:45:16 +02:00
Jonne Haß
79e1a9aafd port notify local users worker spec to doubles 2014-08-29 01:42:16 +02:00
Jonne Haß
7c28921ec7 Merge pull request #5138 from svbergerem/bootstrap-tags-view 
Port tags page to Bootstrap
 2014-08-28 23:12:32 +02:00
Jonne Haß
32c3adc197 Merge pull request #5175 from jhass/js_assets 
Dynamic asset paths everywhere
 2014-08-28 23:11:06 +02:00
Jonne Haß
462198799b Dynamic asset paths everywhere 
* Use asset pipeline aware helpers in CSS files
* Add js_image_paths to push image asset names to the client side JS
 2014-08-28 21:04:29 +02:00
Steffen van Bergerem
3f3087c77f Port tags page to Bootstrap 2014-08-28 18:02:02 +02:00
Remco Huijdts
858551387f correct initial schema 2014-08-28 13:23:24 +02:00
Remco Huijdts
28a71a46aa Consolidate migrations 2014-08-28 12:28:06 +02:00
Jonne Haß
31328e4722 Merge pull request #5172 from jhass/skip_assets 
skip assets precompilation
 2014-08-28 01:11:31 +02:00
Jonne Haß
1b0de7f7cc skip assets precompilation for cucumber run 2014-08-27 18:38:43 +02:00
Jonne Haß
3387bbca74 skip assets precompilation for regular run 2014-08-27 18:37:14 +02:00
Jonne Haß
0675337dab bump fog-core 2014-08-27 18:34:00 +02:00
Jonne Haß
bb51752d33 bump font-awesome-rails 2014-08-27 18:33:14 +02:00
Jonne Haß
6fef1cf990 bump gon 2014-08-27 18:32:50 +02:00
Jonne Haß
de9acef27f add changelog entry for rspec 3 port 2014-08-27 18:25:28 +02:00