jaideng123
406397988b
Made wording more clear, refactored read_all
2014-08-17 11:16:30 -05:00
Jason Robinson
e58f0b2ad4
Terms of service and privacy policy feature.
...
If enabled, terms of service link will be shown in sign up page.
2014-08-17 17:44:44 +03:00
Florian Staudacher
4fd9bae056
refactor global event broker and user blocking from stream posts
2014-08-17 14:05:56 +02:00
op48
66fcfcfcbc
Ignoring validation for last poll answer input
...
last input field is only deleted if there are more than three input fields and the last one is empty
poll is validated only if the last input is empty, and the first three have been filled
Removed duplicate remove last answer.
Dont need to check that the last value is populated as we are ignoring last value
Fixing poll step
Placeholder text edited
Fixed translations for poll answer placeholder text
Removed numbers on publisher option
Removed numbers in placeholder for poll answers
2014-08-13 13:40:14 +01:00
Faldrian
d52737664b
removed non-english translations
2014-08-03 12:55:43 +02:00
Faldrian
6be6d6d504
corrected english translation
2014-08-02 00:34:02 +02:00
Faldrian
a2a37742e4
added keyboard shortcut help topic
2014-08-01 22:13:55 +02:00
MrFrety
686a8776a5
Minor edit: Plural s
2014-08-01 17:13:38 +02:00
Adrián Chaves Fernández (Gallaecio)
125a60f9f5
Updated the Galician (gl) translation
2014-07-27 09:33:50 +02:00
Florian Staudacher
13b716a449
allow admins to close user accounts from the backend
...
* thanks to @maxwell for the initial work on this
port admin pages to bootstrap
* improve user view on admin search page
* add 'close account' link to each user in the search results
* keep the same blue color for the admin menu
some refactoring of the routes and the admin code
* try to be more RESTful (possibly)
* use a 'UserSearch' model for search parameters and querying
add changelog entry
2014-07-01 23:33:15 +02:00
Pablo Cuadrado
45d04a44ea
added title_header key for the Help header, only for EN lang so far
2014-07-01 06:19:29 -03:00
Jonne Haß
d3ac1dbf90
updated 77 locale files [ci skip]
2014-06-22 15:08:40 +02:00
Jason Robinson
ad0982f35e
Remove custom bookmarklet error message.
...
Flash error is shown on bookmarklet post error. On error, return post_something message to form
2014-06-01 15:37:54 +03:00
Jason Robinson
6fd4894997
Add error flash message to publisher on error from server
2014-06-01 13:21:45 +03:00
Jonne Haß
bdaa32e70d
updated 83 locale files [ci skip]
2014-05-17 11:52:31 +02:00
Lukas Matt
6d6ebd297e
Do not try to render posts/comments which are not present
...
refs diaspora/diaspora#4959
2014-05-16 09:48:14 -04:00
Lukas Matt
7ef802127e
Added confirm-dialog to report-delete-button
...
* changed button description
* replaced links with buttons
2014-05-15 07:23:44 -04:00
Lukas Matt
1a0c9f5983
Make report-type translatable
2014-05-15 07:23:43 -04:00
Lukas Matt
26d0c81dae
Added the ability to disable report-email-notification
...
Podmin can see a extra checkbox in Settings > Account
for disabling report-email-notification
2014-05-15 07:23:43 -04:00
Lukas Matt
ed96ddac98
Display status when the user send a report
2014-05-15 07:23:43 -04:00
Lukas Matt
1748d3b940
It is now possible to report comments
...
* Renamed PostReport to Report
* Added report button to SPV
* Updated rspec
refs diaspora/diaspora#4732
refs diaspora/diaspora#4710
refs diaspora/diaspora#4711
refs diaspora/diaspora#4517
2014-05-15 07:23:43 -04:00
Florian Staudacher
0d51bba959
port bookmarklet to Backbone.js, use gon for params ( fixes #4931 )
2014-04-19 17:41:21 +02:00
goobertron
63abe9055b
Reorder items on settings page and improve wording
...
Update cukes to be text-independent
Update changelog
2014-04-08 00:28:25 +01:00
Hincu Petru
2d3933ccd8
Rewrite poll creation inputs
2014-04-06 15:01:18 +00:00
Jonne Haß
6ba6ecf3f2
updated 138 locale files [ci skip]
2014-04-03 20:12:30 +02:00
Jannik Streek
6f3844b73b
fixed language files, added rails cache counter for poll answer, fixed bug with same poll input for form
2014-03-31 18:14:08 +02:00
Jannik Streek
4174b88987
percentage result round + minor language fix
2014-03-31 18:14:08 +02:00
Jannik Streek
9c24365fde
changed poll result + some minor text improvements
2014-03-31 18:14:07 +02:00
Jannik Streek
12fabe2fb9
finalized voting design + some design fixes + improved code
2014-03-31 18:14:07 +02:00
Jannik Streek
d0a77ce6b3
design for poll participation implemented, saving works as well
2014-03-31 18:14:07 +02:00
Jannik Streek
18a43295b7
poll form completed
2014-03-31 18:14:06 +02:00
Jannik Streek
8a4f833d1d
added more tests for the poll federation + fixed broken rspec tests
2014-03-31 18:14:06 +02:00
Jannik Streek
dfbe17d046
Poll input fields and data model now available
...
question field of poll now in db
fixed merge issues
2014-03-31 18:14:06 +02:00
Sharif Olorin
fc394c3981
Patch grammar in admin interface
2014-03-25 02:36:10 +11:00
Steffen van Bergerem
4fc9c6416e
Port notifications to Bootstrap
2014-03-19 18:45:52 +01:00
Steffen van Bergerem
f217a5bc11
Add filters to notifications controller
2014-03-19 17:54:22 +01:00
flaburgan
027650e856
Add handle indication on search page, improve design
2014-03-13 23:01:42 +01:00
Steffen van Bergerem
0cc3b10b1f
port publisher and bookmarklet to bootstrap
2014-03-10 15:15:40 +01:00
Jonne Haß
e5465728d7
Merge pull request #4809 from Gallaecio/gl
...
Updated the Galician (gl) translation
2014-02-23 16:21:30 +01:00
Adrián Chaves Fernández (Gallaecio)
b37d008849
Updated the Galician (gl) translation
2014-02-23 16:06:33 +01:00
goobertron
3c2b0a44d4
Update English locales to diaspora* instead of Diaspora.
2014-02-20 17:48:17 +00:00
goobertron
2a145e67ab
Update design of forgot_password and change_password forms
...
Fix redirect to stream, make labels lower-case
Fix cuke
2014-02-09 15:48:06 +00:00
goobertron
7bcea07b99
Standardise - code refs to 'messages' to 'conversations'
2014-02-09 15:44:12 +01:00
goobertron
c12efdf5e6
Changing text messages -> conversations
2014-02-09 15:44:10 +01:00
Jonne Haß
ecd8a8200b
Merge pull request #4754 from svbergerem/small-improvements-spv
...
SPV small improvements
2014-02-09 14:26:41 +01:00
Jonne Haß
d27c6a8305
updated 31 locale files [ci skip]
2014-02-09 12:31:00 +01:00
Steffen van Bergerem
97f1c286f4
improve reshared posts
2014-01-31 22:48:40 +01:00
Steffen van Bergerem
655fbfcd79
Fix timeago on mobile devices. Fix missing space
2014-01-30 10:15:14 +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
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
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
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ß
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
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
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
flaburgan
0c8adb2070
Add link to the faq in the right panel
2013-09-18 15:53:04 -07: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
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ß
38f01b9cd5
remove extra is in help section [ci skip]
2013-08-27 09:42:34 +02:00
Steffen van Bergerem
324b09a72a
add help page
2013-08-26 15:26:18 +02:00
Jonne Haß
748b38434f
update plural rules and make bosnian available
2013-08-26 13:16:51 +02:00
Jonne Haß
5238004eff
updated 58 locale files [ci skip]
2013-08-26 11:06:29 +02:00
Jonne Haß
348a7b6c5b
update branding
2013-08-25 18:21:14 +02:00
Jonne Haß
0d1bf85931
drop outdated hints from right sections
2013-08-25 18:21:14 +02:00
Steffen van Bergerem
0cf50838e1
Add 'no comments' message to SPV
2013-08-23 01:36:58 +02:00
Steffen van Bergerem
7fe972555a
profile message and mention icons
2013-08-21 23:05:42 +02:00
Jonne Haß
eea3818c45
streamline new profile sidebar elements
...
* titlecase "Photos"
* Pull "See all" to the left (to match up with "View all")
* Replace "See all" with "View all"
2013-08-19 14:26:14 +02:00
Steffen van Bergerem
f22b4d7da7
Change contact list on profile page
2013-08-19 14:02:08 +02:00
Dennis Schubert
051cceaf34
Merge pull request #4371 from MrZYX/bump_devise
...
Update devise
2013-08-16 14:13:13 -07:00
Sean Tilley
7eb4707606
Merge pull request #4382 from goobertron/develop
...
Update javascript.en_1337.yml
2013-08-10 00:41:26 -07:00
goobertron
00a63d381a
Update javascript.en_1337.yml
...
Corrected a couple of spelling mistakes (don't ask me what I was doing looking in the 1337 file...!)
2013-08-10 00:45:59 +01:00
Jonne Haß
769bc5ce90
update devise to 2.2.4
2013-08-08 15:40:46 +02:00
Jonne Haß
54311cb226
Merge pull request #4359 from goobertron/4357-locator-typo
...
Correct grammar error in Locator feature - fix 4357
2013-08-07 00:23:42 -07:00
goobertron
005e12c3f7
My first attempt at a commit. Simply correcting a grammatical error in the Locator feature - 'Near from' becomes 'Posted from'.
...
I hope I have done this correctly. Please forgive me if not.
2013-08-06 20:13:48 +01:00
Oliver Azevedo Barnes
55a58713a5
Issue #4124 Check write access before authorizing Twitter
2013-08-05 13:52:19 -05:00
Fábián Tamás László
6e178af551
Disable invite button after sending invite
2013-07-01 10:19:56 +02:00
Jonne Haß
30dff802d5
Merge pull request #4243 from davexunit/feature/2948
...
Show the user if a contact is sharing with them when viewing their profile page
2013-06-29 10:16:41 +02:00
Jonne Haß
92d3bb9c69
Merge pull request #4252 from Raven24/diasp-feature/1283-coppa-admin
...
Admin: find users under the age of 13 (COPPA)
2013-06-29 10:03:59 +02:00
Jonne Haß
0bc1cb7177
make wolof and western frisian available
2013-06-28 16:10:35 +02:00
