Steffen van Bergerem
97f1c286f4
improve reshared posts
2014-01-31 22:48:40 +01:00
Adrián Chaves Fernández (Gallaecio)
672686a72d
Fixed typo: ‘[…] your password, If it was […]’ → ‘[…] your password. If it was […]’.
2014-01-25 08:56:55 +01:00
Adrián Chaves Fernández (Gallaecio)
e9b5da1741
Updated the Galician (gl) translation.
2014-01-25 08:55:13 +01:00
Steffen van Bergerem
7519fcc255
Remove unused cubbies code
2014-01-24 08:58:47 +01: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
Jason Robinson
93b30dcda4
start new development cycle
2014-01-19 22:47:56 +02:00
Jason Robinson
edbed6c44a
bump to 0.3.0.0
2014-01-19 22:38:10 +02:00
Jonne Haß
18a2b6c0d3
updated 158 locale files [ci skip]
2014-01-19 19:18:14 +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
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
Jonne Haß
15b1dae362
update devise to 3.2
2014-01-15 12:59:59 +01: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
goobertron
a1ac848d62
Change NSFW explanation on profile settings page (and stop altering of text depending on NSFW setting)
2014-01-12 20:02:33 +00: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
flaburgan
6aced29bb6
Add expand the publisher test
2013-12-13 17:55:33 +01:00
flaburgan
923a4f2ab4
Add indication about markdown formatting in the publisher
2013-12-13 16:02:39 +01:00
Jonne Haß
c660c90091
Merge pull request #4612 from diaspora/drop_spv_old_code
...
Drop spv old code
2013-12-11 07:41:51 -08:00
Fabian Rodriguez
6c8c4fc99e
remove template picker functionality
2013-12-03 20:53:00 -02:00
Jason Robinson
2c83d0e846
Statistics route with general info, some user and total posts stats. By default statistics off, enabled in settings.
2013-12-02 22:35:18 +02:00
Jonne Haß
1ce027eb2c
Merge pull request #4605 from manwithtwowatches/feature/4509-image-upload-response-errors
...
Feature/4509 image upload response errors
2013-12-02 00:10:25 +01:00
Jonne Haß
d3f41a97c5
Merge pull request #4548 from diaspora/remove_acts_as_taggable_on_from_admin_panel
...
Remove acts as taggable on from admin panel
2013-12-01 14:48:02 -08:00
Adrián Chaves Fernández (Gallaecio)
a590fbfc5f
Updated the Galician (gl) translation.
2013-12-01 12:16:26 +01:00
Jonne Haß
6c77df6ecb
Fix wrong pluralization key in en.yml
2013-11-30 15:44:43 +01:00
Richard
1b83b6942b
Merge branch 'develop' into feature/4509-image-upload-response-errors
2013-11-28 21:46:01 +11:00
Richard
3671f09b1d
checking file upload response error and giving an error alert if there is one.
2013-11-28 12:26:30 +11:00
Fabian Rodriguez
e7ee7892ee
Add ActsAsTaggableOn::Tag to excluded models in rails_Admin
...
Fixes #4538
2013-11-24 11:51:39 -02:00
Fabian Rodriguez
5ed5b1f8ce
remove trailing whitespaces and indent rails_adimn initializer
2013-11-24 11:51:39 -02:00
Jonne Haß
05fa086caa
replace ugly 'followed by' grammar assumption at tags#show with proper version
2013-11-20 23:47:50 +01:00
flaburgan
1833edfd67
Add actions to contacts/index.html page
2013-11-12 19:10:00 -08:00
flaburgan
3df0fdc09b
Improve the management of the contacts visibility settings in an aspect
2013-11-07 12:55:35 -08:00
Jonne Haß
1da6664712
updated 44 locale files [ci skip]
2013-09-24 13:46:59 +02:00
flaburgan
02ef9e08f6
Remove the (now useless) last post link from the user profile.
2013-09-20 17:37:34 -07:00
Jonne Haß
d4504589c9
add translation for connect to wordpress
2013-09-20 18:54:13 +02:00
Jonne Haß
a2b6740fed
pluralize admins.user_search.you_currently
2013-09-20 13:21:33 +02:00
Jonne Haß
ad20a8487b
bump ruby-oembed
2013-09-19 23:39:13 +02:00
flaburgan
0c8adb2070
Add link to the faq in the right panel
2013-09-18 15:53:04 -07:00
Jonne Haß
5a821efa18
hardcode default(=fallback) language
2013-09-18 22:14:47 +02:00
Fabian Rodriguez
1dbf9642c8
Merge pull request #4515 from fubik/develop
...
Disables submit button in sign up form after submission to avoid email already exists error
2013-09-12 14:32:55 -07:00
Jonne Haß
f65671b29e
updated 73 locale files [ci skip]
2013-09-12 22:52:23 +02:00
Titouan Lorieul
26a3f56c22
Disables submit button in sign up form after submission to avoid email already exists error
2013-09-11 20:49:23 +02:00
sjain1107
5223a2d906
Adding ignore user icon
...
Adding ignore user icon
Added jquery
Changed profile.js
2013-09-04 14:47:23 +02:00
Jonne Haß
991a505439
Merge pull request #4485 from colindean/rename_bitcoin_wallet_id
...
change bitcoin_wallet_id to bitcoin_address
2013-09-01 19:24:44 +02:00
Jonne Haß
58e8df4455
Remove automatic setting of the DB variable from script/server
...
* It's broken for those that would benefit from it (postgres users)
* It's broken in the design: Reading it from the config requires bundle exec ruby, which requires it being set properly
2013-09-01 19:08:44 +02:00
Colin Dean
a4ce4404ff
change bitcoin_wallet_id to bitcoin_address
...
It is better to call it an address than a wallet ID, because the latter may
confuse Bitcoin users who conflate the two. They are not the same.
Also adds convenience method to handle the deprecated variable.
2013-08-31 20:16:23 -04:00
Nils Vogels
a3f3bcf6ef
Adjusting the description of the 404 message, in order to avoid having
...
to specify why users got a 404, and possibly leaking information while doing this
See discussion in #3717 for rationale on not implementing specific HTTP codes
This solves around #3717 and #3728
Adjusting travis breakage
2013-08-30 14:42:19 +02:00
Jonne Haß
625159c8ad
start new development cycle
2013-08-27 09:59:46 +02:00
Jonne Haß
2919c7c73f
bump to 0.2.0.0
2013-08-27 09:57:46 +02:00
Jonne Haß
38f01b9cd5
remove extra is in help section [ci skip]
2013-08-27 09:42:34 +02:00
