Florian Staudacher
0c5c17f5e2
fix regression in conversations causing an infinite recursion ( fix #4715 )
...
(cherry picked from commit 5c059b2925
2014-01-20 23:39:19 +02:00
Florian Staudacher
5c059b2925
fix regression in conversations causing an infinite recursion ( fix #4715 )
2014-01-20 22:00:26 +01:00
Jonne Haß
d87e8cbb3a
Merge pull request #4712 from Ruxton/feature/move_timeago_outside_of_assets_group
...
Moves rails-timeago into the root of Gemfile, it's used in views + assets
2014-01-20 08:59:58 -08:00
Ruxton
49800ece87
Moves rails-timeago into the root of Gemfile, it's used in views + assets
2014-01-20 21:25:15 +08:00
Jonne Haß
9ea6e9c166
Merge pull request #4517 from Zauberstuhl/report_post_feature
...
Added post reporter feature
Conflicts:
Changelog.md
app/assets/stylesheets/application.css.sass
db/schema.rb
2014-01-20 10:03:45 +01:00
Jonne Haß
0e291fd9c4
Merge pull request #4281 from Ruxton/feature/use_rails_timeago_gem_instead_of_vendored_js
...
Switched to using rails-timeago to make keeping on top of new versions o...
2014-01-20 09:57:10 +01:00
Ruxton
a3113cce7c
Switched to using rails-timeago to make keeping on top of new versions of plugin easier
2014-01-20 09:33:35 +08:00
Jason Robinson
93b30dcda4
start new development cycle
2014-01-19 22:47:56 +02:00
Jason Robinson
4d5a55d8a1
Merge branch 'release/0.3.0.0' into develop
2014-01-19 22:38:35 +02:00
Jason Robinson
234ce10cf5
Merge branch 'release/0.3.0.0'
2014-01-19 22:38:20 +02:00
Jason Robinson
edbed6c44a
bump to 0.3.0.0
2014-01-19 22:38:10 +02:00
Jonne Haß
cb482b89e1
Merge pull request #4709 from Flaburgan/update-changelog-gems
...
Add gems upgrade in the changelog
2014-01-19 12:00:27 -08:00
flaburgan
565aba5036
Add gems upgrade in the changelog
2014-01-19 20:58:17 +01:00
Jonne Haß
18a2b6c0d3
updated 158 locale files [ci skip]
2014-01-19 19:18:14 +01:00
goobertron
19c9c0f394
new version of white2x
2014-01-19 14:53:52 +00:00
goobertron
2fb5098be2
Submitted new images with blurred edges
2014-01-19 14:42:34 +00:00
goobertron
97b5c723af
Updated image branding and files with refs to them
2014-01-18 13:03:59 +00:00
Jonne Haß
ed971fc96d
Merge branch 'develop' of github.com:diaspora/diaspora into develop
2014-01-18 13:11:23 +01:00
Jonne Haß
6949292995
bump recommended rubygems version
2014-01-18 13:11:02 +01:00
Jonne Haß
1231248d19
Merge pull request #4700 from qmaruf/absolute-path-for-favicon-ico
...
Absolute path added for favicon.ico
2014-01-18 03:11:40 -08:00
Steffen van Bergerem
20e1626453
add permalinks for comments
2014-01-17 22:11:17 +01:00
Jonne Haß
dae69f9558
Merge pull request #4662 from Raven24/update_underscore-backbone
...
update backbone.js and underscore.js
2014-01-17 03:24:46 -08:00
Jonne Haß
3b7a8992e4
Merge pull request #4698 from goobertron/remove_alpha_refs
...
Remove alpha refs from devise.en.yml
2014-01-16 15:32:39 -08:00
Florian Staudacher
1924c40d38
replace vendored backbone.js/underscore.js with 'backbone-on-rails' gem
...
- updates underscore to 1.5.2 and backbone to 1.1.0
backbone had some breaking changes:
- fix url/urlRoot handling in models & collections
- options are no longer attached to the view by default
- collections reset when 'fetch' is called, tell it to keep the existing
models
other changes:
- fix some events triggering multiple times in connection with deleting
a model
- use document fragments instead of an element array for stream entries
- adapt jasmine and cucumber specs to the changed code
* no longer test the backbone router as part of our code
* jasmine factory already returns model instances, no need to wrap
that again
2014-01-16 23:23:30 +01:00
goobertron
0b0d0000fe
Remove alpha references to invites and buggy software
2014-01-16 18:51:39 +00:00
Quazi Marufur Rahman
b7b595d640
Absolute path added for favicon.ico
2014-01-17 00:31:02 +06:00
Dennis Schubert
6fc5ccb9f9
Merge pull request #4511 from MrZYX/bump_devise
...
update devise to 3.2
2014-01-15 13:17:48 -08:00
Jonne Haß
d97fd8089b
Merge pull request #4688 from ivanzotov/develop
...
Fix after_create to after_commit
2014-01-15 11:47:23 -08:00
Jonne Haß
15b1dae362
update devise to 3.2
2014-01-15 12:59:59 +01:00
Fabian Rodriguez
23c24e170d
Merge pull request #4635 from diaspora/update_gems
...
Update gems
2014-01-15 03:15:53 -08:00
Lukas Matt
5c9a3aaf3e
Added post report feature
...
You can report a single post by clicking the correct icon in the controler section
Workflow:
* Report a post as offensive
* Trigger alerts to every pod-admin
* Pod-admin can review it in the admin interface
* Delete the post or mark it as reviewed
2014-01-14 15:00:55 -05:00
Ivan Zotov
a4ce6e267a
Fix after_create to after_commit
2014-01-14 22:35:29 +04:00
Jonne Haß
80acf6b057
Merge pull request #4692 from svbergerem/header-fix-badge-background
...
Remove background from badges in header
2014-01-14 06:03:25 -08:00
Steffen van Bergerem
580068ed7c
Remove background from badges in header
2014-01-14 15:00:36 +01:00
Jonne Haß
88e0580982
Merge pull request #4682 from goobertron/NSFW_profile_text
...
Change NSFW explanation on profile settings page
2014-01-13 14:13:35 -08:00
goobertron
29a98ddc29
Remove duplicate test steps
2014-01-13 18:47:47 +00:00
goobertron
706b11b14d
Now with passing Cucumber tests
2014-01-13 18:14:43 +00:00
Jonne Haß
cb048a2785
bump pg
2014-01-13 12:26:57 +01:00
Jonne Haß
108a4776d2
bump sass
2014-01-13 12:26:23 +01:00
Jonne Haß
e523583d61
bump orm_adapter
2014-01-13 12:26:23 +01:00
Jonne Haß
073f9db9a1
bump kaminari
2014-01-13 12:26:23 +01:00
Jonne Haß
25988ff04c
bump webmock
2014-01-13 12:26:23 +01:00
Jonne Haß
d3221b396a
bump chunky_png
2014-01-13 12:26:23 +01:00
Jonne Haß
bf1d92cd50
bump bcrypt-ruby
2014-01-13 12:26:22 +01:00
Jonne Haß
f107a3145d
bump will_paginate
2014-01-13 12:26:22 +01:00
Jonne Haß
84c4e68a73
bump rack-rewrite
2014-01-13 12:26:22 +01:00
Jonne Haß
e712bec498
bump json
2014-01-13 12:26:21 +01:00
Jonne Haß
196bb5e4c1
bump i18n-inflector-rails
2014-01-13 12:25:39 +01:00
Jonne Haß
f7759f2177
bump haml
2014-01-13 12:25:39 +01:00
Jonne Haß
92a153edaf
bump guard-rspec
2014-01-13 12:25:39 +01:00
