augier
469521c572
Addin scopes translation and description
2016-01-04 16:49:52 +09:00
augier
b9da104b28
Revoke button on applications page
2016-01-04 16:49:52 +09:00
augier
308170f691
Add applications information page
2016-01-04 16:49:52 +09:00
theworldbright
bc5e5c7420
Fix pronto errors
2016-01-04 16:49:51 +09:00
Augier
c6eb722517
Replace ERB by HAML, added locales, corrected Gemfile
2016-01-04 16:49:49 +09:00
Jonne Haß
1ed904449d
Merge branch 'stable' into develop
2015-12-31 14:21:10 +01:00
Jonne Haß
237445d41b
Drop plurals hack at the contacts key
...
as it's not even used anymore and confuses WTI
2015-12-31 14:20:10 +01:00
Jonne Haß
505071336f
Merge branch 'stable' into develop
2015-12-27 17:51:33 +01:00
Besnik Bleta
680955ad8c
Update for sq translation
2015-12-27 17:49:39 +01:00
Jonne Haß
22711ff7f0
Merge branch 'stable' into develop
2015-12-04 06:55:41 +01:00
Stéphane Guillou
2f4b817c46
Fix missing word in locked account message
...
closes #6577
2015-12-04 06:55:10 +01:00
Jonne Haß
d9c4f6fe07
Merge branch 'stable' into develop
2015-11-22 18:02:47 +01:00
Jonne Haß
bbb348ea5b
updated 32 locale files [ci skip]
2015-11-22 16:02:28 +01:00
Marien Fressinaud
461e4cfd8c
Cleanup the code
...
- Extract JS from HTML
- Remove search link on message
- Remove duplicated invitation modal
2015-10-14 22:31:39 +02:00
fla
da1b0b5666
Add links to add or invite contacts
2015-10-14 22:31:22 +02:00
Steffen van Bergerem
64773d883e
Add permalink for stream elements
2015-10-06 23:29:09 +02:00
Lukas Matt
d1e3e568b9
Report tab; bootstrap3 compatible, add user detail btn
...
The reported_user_details button will redirect you
to admin user_search. This can be useful if the podmin
wants to lock, unlock or delete the account which is
responsible for the reported post
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
2015-10-03 10:58:01 +02:00
Jonne Haß
176b32c815
Merge branch 'stable' into develop
2015-09-07 12:41:36 +02:00
realtin
15b186518c
add moderators to report email recievers
...
and refactor coding style according to pull request comments
(#5324 )
2015-09-07 12:31:25 +02:00
Jonne Haß
6fb6b8dc8a
Merge branch 'stable' into develop
2015-09-06 13:56:25 +02:00
Jonne Haß
f855fb9718
updated 60 locale files [ci skip]
2015-09-06 13:53:41 +02:00
Steffen van Bergerem
7e9a88573b
Merge pull request #6325 from AugierLe42e/add-toggle-mobile-menu
...
Add 'Toggle mobile' item to menu + minor styling
2015-08-27 22:58:00 +02:00
Jonne Haß
a30ba5697e
Merge pull request #6290 from Raven24/pod_test
...
test pods for connectivity
2015-08-27 11:38:18 +02:00
Faldrian
37793f7dbb
beautify ignored people list and add diaspora handle for identification
2015-08-27 09:52:49 +02:00
Florian Staudacher
ea397ffdfb
Add connection test for pods in the network
...
* add a class for checking pod connectivity
* extend pod model to handle new functionality
* add an admin frontend to list pods and re-trigger checks manually
* add a daily worker to run through all the pods
* add unit tests for most of the new code
2015-08-24 22:04:53 +02:00
Jonne Haß
aeea030c9a
Merge branch 'stable' into develop
2015-08-24 20:30:03 +02:00
Johan
c3041fd516
updating locales es-VE
2015-08-23 20:20:17 -04:30
augier
a7bd029526
Add 'toggle mobile' item to menu + minor styling
2015-08-23 13:53:05 +02:00
Dennis Schubert
23c83b9447
Merge branch 'stable' into develop
2015-07-29 12:10:36 +02:00
Steffen van Bergerem
d8505b2ae0
Fix conversations view with no contacts
...
closes #6266
2015-07-29 12:08:35 +02:00
Steffen van Bergerem
6fafa731e6
Display locations on mobile devices
2015-07-23 16:06:28 +02:00
Steffen van Bergerem
5d39461443
Display polls on mobile devices
2015-07-23 14:09:38 +02:00
Steffen van Bergerem
5fd89961c4
Use aria-labelledby for conversations
2015-07-22 13:02:16 +02:00
Jonne Haß
0cbe7ec9a8
Merge branch 'stable' into develop
2015-07-22 10:05:46 +02:00
Steffen van Bergerem
f8bbe71f54
Remove correlations
...
closes #6223
2015-07-22 09:46:52 +02:00
Steffen van Bergerem
8f27e8fae8
Improve wording for admin dashboard
2015-07-21 20:43:18 +02:00
Steffen van Bergerem
484e70a68f
Add dashboard to admin page
2015-07-21 14:36:41 +02:00
Jonne Haß
3d6ae08e84
Merge branch 'stable' into develop
2015-07-20 17:49:01 +02:00
Jonne Haß
c0a0f5e076
updated 24 locale files [ci skip]
2015-07-20 17:45:09 +02:00
Jonne Haß
3a4815996f
Merge branch 'stable' into develop
2015-07-17 20:21:19 +02:00
Rich**
48f5aed63e
Make default conversation subject translatable and properly capitalize it
...
closes #6206 , closes #6205
2015-07-17 20:20:00 +02:00
Jason Robinson
f413d20e27
Merge branch 'stable' into develop
2015-07-14 22:06:26 +03:00
Rich
0c3323088d
Rephrase 'Enter an email'
...
One does not simply 'enter an email' (should I enter a random email from my Inbox?), instead one enters ones own email address.
closes #6191
2015-07-14 22:05:34 +03:00
Jonne Haß
397845161f
Merge pull request #6162 from cmrd-senya/5684-public-additional-profile
...
Allow additional profile fields (previously private profile) to be set public (new updated version)
2015-07-11 10:19:19 +02:00
cmrd Senya
7a5a0a909a
Allow extended profile fields (previously private profile) to be set public ( #5684 ).
...
This adds a new boolean field "public_details" to person model.
By default it is false and represents old behaviour. When it is
set to true, extended profile (bio,location,gender,birthday)
get available to people who didn't log into diaspora and to
people you don't share with (i.e. it is made public).
In UI, a bootstrap-switch added on the profile-edit page in order to
change the setting.
This also changes wording from public/private profile to basic/extended.
The latter could be public and limited.
2015-07-11 04:36:45 +03:00
Jonne Haß
6b240199a8
Merge branch 'stable' into develop
2015-07-04 10:48:42 +02:00
Johan
1e0d81190b
updating es-VE locale
...
closes #6165
2015-07-04 10:48:35 +02:00
Steffen van Bergerem
049c8eb384
Bootstrap header rewrite
2015-06-20 00:38:40 +02:00
Steffen van Bergerem
078e7a722f
Merge branch 'stable' into develop
2015-06-19 21:30:15 +02:00
SansPseudoFix
cce5a98537
Add link to pod statistics in right navigation
...
closes #6117
2015-06-19 21:29:25 +02:00
