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

7141 commits

Author SHA1 Message Date
Błażej Pankowiak
255b8c02a2 Set top margin only on the body element 2014-08-07 00:15:17 +02:00
Jonne Haß
0421d9336a Merge pull request #5100 from Faldrian/feature/add_help_keyboard_shortcuts 
added keyboard shortcut help topic
 2014-08-03 20:12:15 +02:00
Faldrian
9636f372a4 inserted line breaks and wrote a test for app.views.Content.smallPhotos 2014-08-03 17:17:12 +02:00
Faldrian
7a4dbc8b67 fixed ugly comment 2014-08-03 16:00:11 +02:00
Faldrian
a3811f767c style fixes for prev / next buttons 2014-08-03 15:53:38 +02:00
Faldrian
172bc80ec1 thumbnails scroll to currently selected image smoothly 2014-08-03 15:32:57 +02:00
Faldrian
f9215ce7dd images are shown in a single row and can be scrolled using buttons on sides 2014-08-03 14:41:12 +02:00
Faldrian
9d02b0a586 remove first thumbnail; duplicate of big photo 2014-08-03 12:47:44 +02:00
Faldrian
a2a37742e4 added keyboard shortcut help topic 2014-08-01 22:13:55 +02:00
Jonne Haß
344cb55b06 Merge pull request #5083 from theatre-x/patch-3 
Change end year
 2014-07-30 19:11:05 +02:00
Jonne Haß
ddb80ad366 Merge pull request #5077 from svbergerem/bootstrap-people-search 
Port people search to Bootstrap

Conflicts:
	app/assets/stylesheets/application.css.sass
 2014-07-30 19:07:35 +02:00
Jonne Haß
6c6efd6e9a Merge pull request #5069 from TeamOmniaExtares/bugfix_remove_bootstrap_for_SPV_comments 
Bugfix remove bootstrap for spv comments Issue #4425
 2014-07-30 19:02:10 +02:00
theatre-x
bf479f6715 Change end year 
Changed to 1910. So people like THIS: https://en.wikipedia.org/wiki/Jacque_Fresco#Early_life can actually use Diaspora.
 2014-07-20 20:31:14 -04:00
Steffen van Bergerem
f615ad3115 Port people search to Bootstrap 2014-07-20 18:21:13 +02:00
lyzellis
bdc5c1f958 changes border color to dark grey and removes box shadow for textareas and text inputs on focus 2014-07-18 17:27:41 -07:00
Utah Kate Newman
a282a37a8c revised argument order and changed colors to color variables defined in colors.css.scss 2014-07-08 17:45:52 -07:00
Jonne Haß
fe1d1bd7a8 Merge pull request #5056 from arlogn/login-podname-size-flexible 
Flexible font-size for huge text in sign_in page
 2014-07-07 09:03:48 +02:00
arlogn
2394c3df39 flexible font-size for sign_in podname huge text 2014-07-06 19:18:21 +02:00
Mikael Nordfeldth
65e7840085 Publish salmon endpoint URL in Webfinger XRD 
Specification in Panzer draft for Salmon, paragraph 3.3 mentions:
   "The 'salmon' link relation may specify a Salmon endpoint used to notify
    a resource, typically a user account, about external mentions of that
    resource. For a user account, the salmon mention link SHOULD appear in
    the Webfinger [Webfinger] XRD document for the user account."

Source:
http://salmon-protocol.googlecode.com/svn/trunk/draft-panzer-salmon-00.html#SMLR
 2014-07-06 15:05:51 +02:00
Jonne Haß
265691b47b Merge pull request #5061 from blase/feature/4466-port-getting-started-page-to-bootstrap 
Remove text shadow from the button
 2014-07-06 13:29:33 +02:00
Błażej Pankowiak
a9b0412982 Remove text shadow from the button 2014-07-06 13:03:26 +02:00
Dennis Schubert
4a2836b108 Remove stylesheet tag from mobile sign_up template 2014-07-05 00:39:39 +02:00
Błażej Pankowiak
0d0ed4db28 Port Getting Started page to Bootstrap 2014-07-04 18:06:49 +02:00
Jonne Haß
0515c33769 Use double quotes when embeding translations in JS 
Translations commonly include single quotes, which closes
the JavaScript string unexpectedly. Closes #5055
 2014-07-03 22:57:42 +02:00
Utah Kate Newman
7f2b3d3bf3 replaces blue comment box border and box shadow with gray border and no box shadow 2014-07-02 16:31:29 -07: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
Jonne Haß
5a3d329703 Merge pull request #5049 from kpcyrd/aspect-edit-fix 
Fix broken aspect-edit sidebar update

Conflicts:
	app/assets/javascripts/aspect-edit-pane.js
 2014-07-01 14:49:53 +02:00
Jonne Haß
12c507d6a2 Merge pull request #5048 from kpcyrd/fix-5031 
Fix self-xss issue in contact-group-rename
 2014-07-01 14:44:41 +02:00
Jonne Haß
6fb6a08980 Merge pull request #4945 from hpetru/notifications 
Refactoring Notification#notify
 2014-07-01 14:33:54 +02:00
Jonne Haß
f86b19efee Merge pull request #5047 from pablocubico/feature/user-menu-styles-minor-fix 
[4703] Minor style fix for user menu
 2014-07-01 14:17:04 +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
Pablo Cuadrado
14fbd7b205 help page ported to bootstrap 2014-07-01 05:56:49 -03:00
kpcyrd
6833ca46bb Fix broken aspect-edit sidebar update 2014-07-01 00:33:17 +02:00
kpcyrd
20ffa8fa13 Fix another self-xss issue 2014-07-01 00:12:26 +02:00
kpcyrd
fb4898c4fa Fix self-xss issue in contact-group-rename 2014-06-30 21:32:46 +02:00
Pablo Cuadrado
4232d830ee left padding added, unnecesary cursor pointer removed 2014-06-29 18:24:54 -03:00
Pablo Cuadrado
7aa1028cbe minor style fix for user menu 2014-06-29 15:12:30 -03:00
Jason Robinson
c9552c2cd9 Merge pull request #5030 from hpetru/5029-hide-poll-input-after-post-submit 
Fix hiding poll publisher for close action
 2014-06-27 11:12:52 +03:00
Jason Robinson
831af6507d Merge pull request #5006 from taratatach/4940-mention-notification-not-marked-as-read-when-viewing-post 
Set mention notification as read when viewing post
 2014-06-27 10:17:01 +03:00
Jason Robinson
c6f2691cc3 Merge pull request #5009 from taratatach/4951-sharing-notification-not-marked-as-read-when-visiting-profile 
Set sharing notification as read
 2014-06-27 10:16:17 +03:00
Hincu Petru
1d09978440 Fix hidding of poll publisher for close action 2014-06-25 10:54:00 +00:00
Jason Robinson
e776beed11 Merge pull request #5020 from Zauberstuhl/reports_email_notification_bug 
[Bug] Reports email notification; wrong recipient
 2014-06-24 22:17:25 +03:00
Jason Robinson
80075c13f4 Use different user.construct_public_followings_sql query depending on database backend. 
This is done for performance reasons as a temporary fix for problems with 0.4.0.0 on MySQL. This madness is explained in issue https://github.com/diaspora/diaspora/issues/5014.
 2014-06-24 17:07:40 +03:00
Lukas Matt
01a45ccf40 Reports email notification; wrong recipient 
The mailer uses the person_id to find a user
which cannot work on a production environment.

I haven't used a remote user on my test setup.
 2014-06-23 15:54:25 -04:00
Jonne Haß
96fa96b88c Merge pull request #5007 from jaywink/revert-mobile-bookmarklet-fix 
Revert "Fix toggling services for mobile bookmarklet"
 2014-06-22 15:01:34 +02:00
Jason Robinson
126ced4383 Fix broken bookmarklet if params have encoded linefeeds. 
Closes #4994
 2014-06-22 11:48:24 +03:00
Erwan Guyader
f92dd85748 Set sharing notification as read 
Fix issue #4951

  If the displayed user (on her profile) started sharing with the
current user, mark the notification as read
 2014-06-20 10:55:17 +02:00
Erwan Guyader
126252d47a Add test for mention notifications 2014-06-20 01:23:53 +02:00
Jason Robinson
e4e9f40b2c Revert "Fix toggling services for mobile bookmarklet" 
This fixed the toggling of services, but broke the actual
bookmarklet :)

This reverts commit 1bd7989045.
 2014-06-19 21:47:34 +03:00