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

3009 commits

Author SHA1 Message Date
Dennis Schubert
92cd4e6b78 Use camo for Markdown images 
just a quick proof of concept
 2014-11-08 05:14:18 +01:00
Dennis Schubert
9024d1a9b7 Add Camo configs 2014-11-08 05:14:18 +01:00
Steffen van Bergerem
25e4e558c5 Ask for confirmation when leaving a submittable publisher 2014-11-02 01:49:33 +01:00
Jonne Haß
3c808142fb let default sidekiq config actually process the maintenance queue 2014-10-22 23:23:14 +02:00
goobertron
4b7761e52a Clarify explanation of account deleteion process 2014-10-20 20:15:38 +01:00
goobertron
797f7eae8d Reword account removal email notification 2014-10-17 14:49:25 +01:00
Jason Robinson
69c3566958 Maintenance feature to remove old users 
Add Sidetiq webview to the Sidekiq monitoring panel

Add rake task maintenance:queue_users_for_removal
This basically just triggers an immediate run of the normal maintenance remove old users functionality that is normally (if enabled) scheduled to run once a day via sidetiq

Add extra safety when checking for user removal due to inactivity.
Now also user.last_seen will also be checked to make sure a user will not be removed in the event that the Devise rememember me login functionality has stopped the users remove_after timestamp from being removed.

Add initializer for maintenance job.
Add warning about mail being disabled if remove_old_users maintenance is enabled.
 2014-10-16 22:53:08 +03:00
Jonne Haß
720ec1c64a make nds and en_valspeak available 2014-10-12 15:20:20 +02:00
Jonne Haß
061dfab00b updated 83 locale files [ci skip] 2014-10-12 15:20:20 +02:00
Sandip Trivedi
d7e8e2ce2c Replaced jquery.textchange.js vendored asset with a bower package #5194 2014-10-06 18:54:50 -04:00
Florian Staudacher
4f87a47d0a Merge pull request #4657 from svbergerem/bootstrap-people-view 
Redesign profile page and port to Bootstrap
 2014-10-06 15:09:08 +02:00
Jonne Haß
eac3f042a4 Reset dynamic configuration after each example in the testsuite 2014-10-04 00:59:03 +02:00
Brandon
805e476c34 Fixed typo 
From "Seams" to "Seems"
 2014-10-01 06:41:25 -04:00
Steffen van Bergerem
976ff0fcda Redesign profile page and port to Bootstrap 2014-10-01 12:28:56 +02:00
Florian Staudacher
c7b4b77ce8 Merge pull request #5209 from jhass/federation_improvements 
Federation improvements
 2014-09-27 16:18:37 +02:00
Jonne Haß
2d2217b677 Monkey patch Sidekiq logger 
Sidekiq 3.0 initialized the logger early before we had a chance
to set the logfile. Then we set a new logfile causing the old
logger to be closed. Since the default logger points to stdout,
it got closed causing all kinds of issues.
 2014-09-20 03:01:43 +02:00
Florian Staudacher
1f724dd123 * add a (hash)tag helper for handlebars 
* re-add stream on profile page
* more controller refactoring
 2014-09-15 01:37:23 +02:00
Florian Staudacher
2572fb77fc * refactored text direction detector into helper (also for handlebars) 
* added handlebars helper for markdown formatting
* finished port of profile sidebar view to handlebars template
* people_controller refactoring
 2014-09-15 01:37:23 +02:00
Florian Staudacher
0092c9c483 * create a handlebars view for the profile header 
* unblock the user via ajax
 2014-09-15 01:37:23 +02:00
Florian Staudacher
fba3092c61 * cleanup people_controller#show, add people_controller#stream for json 
* introduce new presenters and extend the functionality of the BasePresenter
* add a handlebars template for the profile sidebar, render it everytime we need to update
* introduce a 'aspect_membership:update' global event
 2014-09-15 01:37:23 +02:00
Jonne Haß
9c88fde821 Switch Faraday adapter to typhoeus 
It uses curl which has less problems connecting
to a missconfigured IPv6 host (falls back to v4)
 2014-09-07 10:47:47 +02:00
Jonne Haß
aa09f0cbb1 Merge branch 'release/0.4.1.0' into develop 2014-09-03 23:38:27 +02:00
Jonne Haß
e03f7f738b make es-CO available 2014-09-03 23:38:20 +02:00
Jonne Haß
b424b94660 updated 45 locale files [ci skip] 2014-09-03 23:14:23 +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
Steffen van Bergerem
854dcf04db Display new conversation form on conversations/index 2014-08-31 18:02:37 +02:00
Jonne Haß
f1ab434b18 Merge pull request #5153 from svbergerem/redesign-contacts-page 
Redesign contacts page
 2014-08-27 10:01:41 +02:00
Steffen van Bergerem
ff84ee0485 Small style changes, add tests 2014-08-26 22:45:43 +02:00
Steffen van Bergerem
f1408a7a09 Add contacts search and port aspect membership save/destroy to backbone 2014-08-26 21:41:11 +02:00
Steffen van Bergerem
9587961883 Display all contacts in the contact list 2014-08-26 21:41:02 +02:00
jaideng123
1de67281f4 Simplified range check 2014-08-26 14:04:28 -05:00
jaideng123
f53001577e Increase max length of simple_captcha to 12 2014-08-26 13:24:00 -05:00
Jonne Haß
541d5580e0 Fix loading issues in rails_admin 
Properly declare Admin module and explicitly list models to be
display in rails_admin
 2014-08-26 02:57:47 +02:00
Jonne Haß
cb6c79a885 Merge pull request #5151 from khall/issue_5090 
Fix for issue 5090
 2014-08-26 01:14:45 +02:00
Jonne Haß
8de29bc28d bump faraday and faraday_middleware. closes #4950 2014-08-25 19:16:55 +02:00
khall
a9fd16db3e Fix for issue 5090: Changing error message wording and providing more information to user when status message is too long. 2014-08-24 13:28:57 -07:00
Jonne Haß
2619beb157 Merge pull request #4481 from diaspora/rails4 
Port to Rails 4
 2014-08-24 13:42:31 +02:00
Jonne Haß
a1e547f8d7 Merge pull request #5105 from goobertron/jquery_default 
Change default for jQuery CDN to false
 2014-08-24 13:36:57 +02:00
Jonne Haß
5c60f10022 start new development cycle 2014-08-24 13:28:02 +02:00
Jonne Haß
527fb559e5 Bump version to 0.4.1.0 2014-08-24 13:17:29 +02:00
Jonne Haß
d6d65cd0fd apply rails 4 todos and fix specs after rebase 2014-08-23 16:47:57 +02:00
Jonne Haß
397606bc44 turn parameter wrapping for AR::B#to_json back on 2014-08-23 16:38:57 +02:00
Jonne Haß
d75632401b make everything boot again 2014-08-23 16:34:00 +02:00
Jonne Haß
59d60ff947 remove strong_parameters initializer 2014-08-23 16:34:00 +02:00
Jonne Haß
ec877e3784 Merge pull request #4978 from jhass/bump_acts_as_taggable_on 
Bump acts-as-taggable-on
 2014-08-18 12:20:19 +02:00
Jonne Haß
ae24495c7d Merge pull request #5127 from Raven24/hpetru-2875-ignore-user-posts 
Remove ignored peoples posts without refresh (II)
 2014-08-18 11:35:56 +02:00
Jonne Haß
ec02f54613 Merge pull request #5122 from jaideng123/5113-mark-as-read-by-filter 
Added Mark all in filter as read feature
 2014-08-18 11:30:18 +02:00
jaideng123
406397988b Made wording more clear, refactored read_all 2014-08-17 11:16:30 -05:00
jaideng123
6456a441fe Modified behavior of mark all as read button 2014-08-17 10:12:23 -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
Steffen van Bergerem
022bc1007d Remove unused code 2014-08-16 11:47:31 +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
goobertron
93a2b36405 Change default for jQuery CDN to false. 2014-08-05 23:32:45 +01:00
Jonne Haß
3f21593111 Merge pull request #5088 from goobertron/defaults 
Clarify explanations and defaults in diaspora.yml.example
 2014-08-05 21:52:09 +02: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
goobertron
18a9e15022 Revert so defaults are now placed in commented out settings 2014-07-31 12:05:06 +01:00
goobertron
a4140499c1 Removed stats hub address, other minor tweaks 2014-07-31 11:53:35 +01:00
goobertron
49be5b82fe Clarify explanations and defaults in diaspora.yml.example 2014-07-31 11:42:18 +01:00
Adrián Chaves Fernández (Gallaecio)
125a60f9f5 Updated the Galician (gl) translation 2014-07-27 09:33:50 +02:00
theatre-x
d348f59d5d Fixed a typo 
From "gurantee" to "guarantee".
 2014-07-20 03:40:54 -04:00
arlogn
2394c3df39 flexible font-size for sign_in podname huge text 2014-07-06 19:18:21 +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
Maxwell Salzberg
cc53e1762b A podmin can now disable a spam account from the interface. 2014-07-01 17:51:39 +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
Jason Robinson
c475a3985e start new development cycle 2014-06-22 19:32:23 +03:00
Jason Robinson
51ecae1b77 bump to 0.4.0.0 2014-06-22 19:01:31 +03:00
Jonne Haß
d3ac1dbf90 updated 77 locale files [ci skip] 2014-06-22 15:08:40 +02:00
Jonne Haß
72d1ed8f7d bump acts-as-taggable-on 2014-06-01 18:42:51 +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ß
1e09814b13 Enable Rails autoloading in rake tasks 
Then environment task disables, eager loading breaks with Devise
and requiring all needed files would be a mess
 2014-05-26 23:58:31 +02: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
Oliver Azevedo Barnes
aec0c700b3 Add account_deleter.rb to load_libraries initializer 2014-05-07 14:36:18 -05:00
Florian Staudacher
0d51bba959 port bookmarklet to Backbone.js, use gon for params (fixes #4931) 2014-04-19 17:41:21 +02:00
Jason Robinson
356096a7eb Merge pull request #4836 from MrZYX/message_renderer 
Introduce message renderer
 2014-04-13 15:00:46 +03:00
Jason Robinson
ee3a9f9be0 Merge pull request #4912 from goobertron/settings 
Reorder items on settings page and improve wording
 2014-04-12 21:37:52 +03:00
Jason Robinson
6947a1945c Merge pull request #4883 from MrZYX/uuid 
Use uuids for guid generation
 2014-04-11 16:40:57 +03: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
Mehmet Atif Ergun
a3fd746f15 Fix tr 
The translation 'türk' is ethnicity / nationality. change to language, türkçe.
 2014-04-03 20:31:00 -04: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