Benjamin Neff
bc6c8a0598
disable registration with invite-code when invitations are closed
...
also display message if the user has no invitations left and refactored
InvitationsController spec and remove unused message parameter
2016-08-13 13:51:28 +02:00
Benjamin Neff
3b1a5c6bdf
don't reduce number of invites when registration is open
...
otherwise the counter goes into negative ;)
also reset all negative counters
2016-08-13 13:51:02 +02:00
Benjamin Neff
e749bbef15
don't reduce number of available invites if there were errors.
2016-08-13 01:47:27 +02:00
Benjamin Neff
2a553940d4
small design fixes for invites
2016-08-13 01:47:27 +02:00
Benjamin Neff
66b7b7e27a
Cleanup legacy invitations from code
...
Fixes #5116
2016-08-13 01:47:27 +02:00
Jonne Haß
7fa299b7ad
Merge pull request #6959 from cmrd-senya/devise-upgrade
...
Upgrade devise to 4.2
2016-08-11 12:08:42 +02:00
cmrd Senya
4ae26e1ded
Upgrade devise to 4.2
2016-08-11 12:25:36 +03:00
Benjamin Neff
71ed7446c1
Fix user settings style after submit
...
Fixed:
* wrong url
* broken navigation
* broken design
after saving the user settings
Fixes #5847
2016-08-11 01:58:47 +02:00
Steffen van Bergerem
cefffc6082
Move contacts search to contacts#index
2016-08-09 19:20:40 +02:00
Steffen van Bergerem
9f28b935b9
Drop contacts.json
2016-08-09 19:20:40 +02:00
Steffen van Bergerem
f1e9c99866
Add contacts search
2016-08-09 19:20:40 +02:00
Steffen van Bergerem
79117d1a46
Merge pull request #6944 from AugierLe42e/bump-jquery-2
...
Bump to jQuery 2
2016-08-09 13:00:39 +02:00
SaiVardhan
18dbf02181
[FIX] #6642 Strip Markdown from conversation title
...
closes #6642
2016-08-08 19:23:17 +02:00
cmrd Senya
a3f208c380
Notifications and search page backend updates
...
Updates introduce support for preloading contacts to Gon in order
to support client-side rendering of aspect membership dropdown box.
2016-08-08 17:21:38 +03:00
cmrd Senya
82ac611396
Client-side rendering of aspect dropdown for hovercards
2016-08-08 17:21:30 +03:00
cmrd Senya
923fb8a763
Refactor app.views.AspectMembership
...
in order to support adding new aspect to a dropdown without full
page reload
2016-08-08 17:21:14 +03:00
cmrd Senya
15e0f88758
Rename photos[:count] to photos_count in gon
2016-08-08 17:19:26 +03:00
Augier
2e175c4be5
Bump to jQuery 2
2016-08-07 16:14:52 +02:00
Benjamin Neff
df9874b73a
remove raw_message
...
This was only an alias for "text", and "raw_message" is also not used
for federation anymore, so we can drop it.
2016-07-17 01:40:00 +02:00
Steffen van Bergerem
f8d8089cb6
Add more specs for the admins controller
2016-07-09 12:30:19 +02:00
Steffen van Bergerem
b01ca5d3bc
Add basic help controller spec
2016-07-09 10:55:59 +02:00
Steffen van Bergerem
b296e73c36
Add basic terms controller spec
2016-07-09 10:55:59 +02:00
Benjamin Neff
9a3f653c45
fix sender for messages for old pods
...
Send a second message to remote recipients with conversation-author
as salmon author if the conversation-author is local.
The first dispatch will fail on old pods. New pods will ignore the
second message, if the guid already exist.
2016-06-26 14:05:52 +02:00
Benjamin Neff
70f378a1c1
don't participate own posts on creation
2016-06-26 06:21:02 +02:00
Benjamin Neff
57dbcc0e67
add root author to reshare subscribers
2016-06-26 06:21:02 +02:00
Benjamin Neff
03123f1c4d
remove more unused code and cleanup
2016-06-26 06:21:01 +02:00
Benjamin Neff
ae05d4e928
use Diaspora::Federation::Dispatcher everywhere
2016-06-26 06:21:01 +02:00
Benjamin Neff
ecbf5fa3e7
enable some skipped tests again
2016-06-26 06:21:00 +02:00
Benjamin Neff
7184d4334e
remove after_dispatch hook
...
handle photos in StatusMessageCreationService
2016-06-26 06:21:00 +02:00
Benjamin Neff
20dabbd15f
remove user parameter from subscribers method
2016-06-26 06:21:00 +02:00
Benjamin Neff
581f8d7226
don't force remove contact on block
...
this creates inconsistent states, if you remove the block in the future
2016-06-26 06:21:00 +02:00
Benjamin Neff
4fb34139b0
cleanup notifications and fix tests
2016-06-26 06:20:59 +02:00
Benjamin Neff
b1d30aa9cc
add more "diaspora to federation entity" methods
...
move it to Diaspora::Federation::Entities and use it in some tests, but most of the tests can be removed later.
2016-06-26 06:20:58 +02:00
Steffen van Bergerem
b1943f1e46
Redesign default.haml and add a podmin welcome page
2016-06-20 02:03:53 +02:00
Steffen van Bergerem
629e6382ec
Use Poltergeist instead of Selenium
2016-06-19 01:53:18 +02:00
Dennis Schubert
53808847a2
Merge branch 'stable' into develop
2016-05-07 18:52:34 +02:00
Ralin Chimev
1773e3e35d
Do not change notification timestamp when making it read or unread.
...
Marking a notification as unread resets the timeago stamp causing
the times to look wrong. It can be reproduced by marking an old
notification as unread. Using the update_column instead of
update_attribute will not touch the updated_at attribute, and
thus will not affect the updated time ago in the view.
Fixes #6798 .
closes #6821
2016-05-07 18:52:27 +02:00
theworldbright
bb3849e4b1
Fix API privilege scope escalation
2016-03-11 17:18:21 -08:00
Benjamin Neff
d94eae0d45
refactoring PostService
...
* move presenters back to controllers, this is view-logic
* use PostService in CommentService
* remove iframe route, this is not used anymore
* id/guid limit at 16 chars, hex(8) is 16 chars long
2016-03-07 05:52:54 +01:00
Benjamin Neff
b398b115bc
refactoring CommentService
2016-03-07 05:52:54 +01:00
Benjamin Neff
b67b7cf8c6
write specs for StatusMessageCreationService
2016-03-07 05:52:54 +01:00
Benjamin Neff
5a46da47c3
refactoring StatusMessageCreationService
...
* move parameter normalization back to controller, because this is
frontend-specific.
* if the StatusMessage is public, save also public photos
2016-03-07 00:00:27 +01:00
Jonne Haß
39ae5e741e
Merge pull request #6732 from SuperTux88/cleanup-aspect_visibilities
...
Cleanup aspect visibilities
2016-03-05 11:05:55 +01:00
Benjamin Neff
acb91c79d2
improve pod connection check
...
* use port for check
* respect entries in /etc/hosts
* test /.well-known/host-meta
* don't allow redirects to other domains
2016-03-05 02:57:11 +01:00
Benjamin Neff
b1a6516474
add migration for pods-table
...
* add port to pods
* remove url from person and link people with pod-table
2016-03-05 00:12:54 +01:00
Benjamin Neff
f913128967
don't add public shareables to aspect_visibilities
2016-03-04 20:13:52 +01:00
Dennis Schubert
535057aca4
Merge branch 'stable' into develop
2016-02-21 04:26:25 +01:00
Steffen van Bergerem
374679c093
Add rspec test for reset_authentication_token without current_user
...
closes #6707
2016-02-21 04:26:12 +01:00
Steffen van Bergerem
f8f05371e0
Merge pull request #6394 from AugierLe42e/mobile-js-refactor
...
Mobile JS refactor
2016-02-15 22:22:35 +01:00
Augier
28c509baeb
Add jasmine specs for mobile view
2016-02-15 12:14:35 +01:00
