realtin
|
0b420d0308
|
adapt templates to allow moderator to view reports
(#5324)
|
2015-09-07 12:29:46 +02:00 |
|
zaziemo
|
b2dc77e1e6
|
change method name for a better understanding of what the befor_filter does
and correct test syntax
#5324
|
2015-09-07 12:24:12 +02:00 |
|
realtin
|
bc75371b7a
|
report controller renders index for the moderator
(#5324)
|
2015-09-07 12:24:12 +02:00 |
|
zaziemo
|
3a3c881735
|
add new role moderator analogue to admin role
#5324
|
2015-09-07 12:24:12 +02:00 |
|
Dennis Schubert
|
81084cde46
|
Merge branch 'master' into stable
|
2015-09-07 04:23:23 +02:00 |
|
Dennis Schubert
|
782c1ef6ee
|
Merge branch 'release/0.5.3.0'
|
2015-09-07 04:22:47 +02:00 |
|
Jonne Haß
|
c0da031e33
|
Merge branch 'release/0.5.3.0' into stable
|
2015-09-06 13:56:10 +02:00 |
|
Jonne Haß
|
f855fb9718
|
updated 60 locale files [ci skip]
|
2015-09-06 13:53:41 +02:00 |
|
sjain1107
|
928576bc88
|
6306-add-spinner-on-initial-stream-load
closes #6384
|
2015-09-05 16:11:09 +02:00 |
|
Jonne Haß
|
ca5fa14376
|
Merge branch 'release/0.5.3.0' into stable
|
2015-09-03 21:39:13 +02:00 |
|
Lukas Matt
|
23c016cf36
|
Update wiki links in diaspora config
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
|
2015-09-03 21:38:56 +02:00 |
|
Dennis Schubert
|
f75a6147a5
|
Bump version number
[ci skip]
|
2015-09-01 03:52:06 +02:00 |
|
Jonne Haß
|
e47be13ae8
|
Merge pull request #6370 from svbergerem/update-rails_admin
Bump rails_admin
|
2015-08-30 22:34:46 +02:00 |
|
Steffen van Bergerem
|
a01cea0b63
|
Bump rails_admin
|
2015-08-30 21:52:52 +02:00 |
|
Jason Robinson
|
0087fefd14
|
Change default autofollow_on_join_user
Due to performance of joindiaspora.com, a decision was made to set up a project pod that hosts the official support and news autofollow account (see https://www.loomio.org/d/tyZdcGNo/diasporahq-account-move-to-a-project-pod). The new account is hq@pod.diaspora.software.
closes #6369
|
2015-08-30 10:17:05 +02:00 |
|
Jonne Haß
|
1223699f76
|
Disable all network requests in Cucumber suite
closes #6368
|
2015-08-30 01:14:49 +02:00 |
|
Steffen van Bergerem
|
1874c37706
|
Fix back-to-top backbone view
closes #6360
|
2015-08-29 21:44:24 +02:00 |
|
Steffen van Bergerem
|
82081af71a
|
Add Code of Conduct
|
2015-08-29 21:38:11 +02:00 |
|
Steffen van Bergerem
|
34319758ed
|
Improve posts from ... page cukes
closes #6367
|
2015-08-29 19:55:03 +02:00 |
|
SansPseudoFix
|
110284626a
|
Fix mobile pagination for notifications view
Fix syntax
Fix syntax
closes #6364
|
2015-08-29 18:13:54 +02:00 |
|
Jonne Haß
|
78e183738e
|
Merge pull request #6366 from jhass/aspect_sorting_cuke
Bump selenium-webdriver, implement aspect sorting cucumber step with …
|
2015-08-29 16:51:04 +02:00 |
|
Jonne Haß
|
bf92a7441e
|
Bump selenium-webdriver, implement aspect sorting cucumber step with selenium API
|
2015-08-29 15:58:08 +02:00 |
|
augier
|
2ce7a1e185
|
Mobile subdomain
closes #6354
|
2015-08-27 21:01:36 +02:00 |
|
Jonne Haß
|
f627919fc4
|
bump uglifier
|
2015-08-27 15:24:18 +02:00 |
|
Jonne Haß
|
8816c7bc84
|
Bump Rails to 4.2.4
|
2015-08-27 05:19:59 +02:00 |
|
Dennis Schubert
|
7bd1795855
|
Merge pull request #6348 from diaspora/6279-backport
6279 backport
|
2015-08-27 05:09:04 +02:00 |
|
Steffen van Bergerem
|
3c370ea56e
|
Remove unused js code (stream widget and dropdowns)
closes #6279
|
2015-08-25 04:26:17 +02:00 |
|
Steffen van Bergerem
|
0df0926739
|
Convert BackToTop to a backbone view
|
2015-08-25 04:17:24 +02:00 |
|
Jonne Haß
|
e614e93aeb
|
Merge pull request #6344 from ruby-ve/es-VE_locale
updating locales es-VE
|
2015-08-24 20:29:56 +02:00 |
|
Johan
|
c3041fd516
|
updating locales es-VE
|
2015-08-23 20:20:17 -04:30 |
|
theworldbright
|
6e74ee7d21
|
Make PostPresenter inherit from BasePresenter
closes #6315
|
2015-08-23 22:49:45 +02:00 |
|
theworldbright
|
335b1c32aa
|
Refactor post presenter
|
2015-08-23 22:49:12 +02:00 |
|
Jonne Haß
|
a1ca45b201
|
Update NodeInfo to final 1.0 schema
closes #6340
|
2015-08-23 14:45:20 +02:00 |
|
Steffen van Bergerem
|
a7287f4f93
|
Disable the handlebars auto-indent feature
closes #6339
|
2015-08-23 11:13:42 +02:00 |
|
Lukas Matt
|
f44bb613b9
|
bump diaspora-vines to v0.2.0-develop
closes #6338
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
|
2015-08-22 21:51:42 +02:00 |
|
Anton Tkachov
|
ef6c8a5448
|
Issue #6180: Update stream faces block if somebody was blocked
closes #6320
|
2015-08-22 01:35:23 +02:00 |
|
Benjamin Neff
|
663835ed3a
|
remove old webfinger/hcard code
closes #6310
|
2015-08-21 14:23:08 +02:00 |
|
Benjamin Neff
|
d28e03f053
|
use discovery from diaspora_federation gem
|
2015-08-21 14:21:43 +02:00 |
|
Benjamin Neff
|
21e5bd8697
|
add save callback for webfinger
|
2015-08-21 14:21:43 +02:00 |
|
Benjamin Neff
|
65b056341c
|
update federation gem
|
2015-08-21 14:21:42 +02:00 |
|
Jonne Haß
|
a7bb6170ab
|
Merge pull request #6333 from Zauberstuhl/bump_jsxc_alpha
Bump jsxc alpha
|
2015-08-21 13:20:23 +02:00 |
|
Lukas Matt
|
afde20f638
|
bump diaspora_jsxc to v0.1.4.alpha
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
|
2015-08-21 13:01:32 +02:00 |
|
Lukas Matt
|
dbc57d9371
|
Load bower dependencies on jsxc initialization
We moved the libraries from jsxc.deb.js
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
|
2015-08-21 12:43:50 +02:00 |
|
Lukas Matt
|
5dd3675258
|
bump diaspora-vines to v0.1.28
closes #6329
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
|
2015-08-20 00:20:04 +02:00 |
|
theworldbright
|
d7c92431ae
|
Extract service from comments controller
closes #6307
|
2015-08-09 18:35:11 +02:00 |
|
Steffen van Bergerem
|
dc576fb0d6
|
Check if person is nil in person_image_tag
closes #6286
|
2015-08-06 22:55:41 +02:00 |
|
Anton Tkachov
|
f1d6e9440b
|
Issue #6281: add url to hovercard avatar
closes #6297
|
2015-08-06 14:42:14 +02:00 |
|
Mikica Ivosevic
|
78b0fbbee6
|
Refactor HomeController#toggle_mobile
closes #6260
|
2015-08-04 10:41:21 +02:00 |
|
Jonne Haß
|
7c611ca509
|
rubocop: skip db/schema.rb [ci skip]
|
2015-08-03 03:11:43 +02:00 |
|
theworldbright
|
cae5f94af0
|
Refactor status messages controller
closes #6280
|
2015-08-02 16:58:01 +02:00 |
|