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

14549 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jonne Haß
80a0a9f999 Merge pull request #5108 from blase/feature/5107-set-top-margin-on-body 
Set top margin only on the body element
 2014-08-07 10:59:38 +02:00
Błażej Pankowiak
255b8c02a2 Set top margin only on the body element 2014-08-07 00:15:17 +02: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
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
Jonne Haß
bd388d61e7 Merge pull request #5102 from Faldrian/feature/4474-fix_lightbox_thumbnails 
Feature/4474 fix lightbox thumbnails
 2014-08-03 20:10:20 +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
d52737664b removed non-english translations 2014-08-03 12:55:43 +02:00
Faldrian
9d02b0a586 remove first thumbnail; duplicate of big photo 2014-08-03 12:47:44 +02:00
Faldrian
207b351049 added test for help section keyboard shortcuts 2014-08-02 10:30:17 +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
Jonne Haß
9518ff34da Merge pull request #5097 from MrFrety/patch-2 
Minor edit: Plural s
 2014-08-01 17:16:25 +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
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
Jonne Haß
7bf9fab143 Merge pull request #5089 from Gallaecio/develop 
Updated the Galician (gl) translation
 2014-07-28 19:53:38 +02:00
Adrián Chaves Fernández (Gallaecio)
125a60f9f5 Updated the Galician (gl) translation 2014-07-27 09:33:50 +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
Jonne Haß
9edf581bde Merge pull request #5080 from theatre-x/patch-2 
Fixed a typo
 2014-07-20 18:33:33 +02:00
Steffen van Bergerem
f615ad3115 Port people search to Bootstrap 2014-07-20 18:21:13 +02:00
theatre-x
d348f59d5d Fixed a typo 
From "gurantee" to "guarantee".
 2014-07-20 03:40:54 -04: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
Jason Robinson
ead86d3353 Add changelog entries for #5006 & #5009 [ci skip] 2014-07-14 22:12:26 +03: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
Jason Robinson
d26f9cfae7 Add changelog for mobile sign-in fix [ci skip] 2014-07-06 18:49:44 +03:00
Jonne Haß
25fac9a90f Merge pull request #5062 from mmn/develop 
Publish salmon endpoint URL in Webfinger XRD
 2014-07-06 16:56:34 +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
Jonne Haß
2fcb16de99 Merge pull request #5057 from blase/feature/4466-port-getting-started-page-to-bootstrap 
Port Getting Started page to Bootstrap
 2014-07-04 19:31:53 +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
Jonne Haß
e4246b6fdd Bump Rails to 3.2.19 
Rails 3.2.19 fixes a possible SQL-Injection when using the PostgreSQL
adapter. However this is only exploitable when using the "bit" type,
which we don't.
 2014-07-02 22:17:21 +02:00
Jason Robinson
e6086bbcbb Merge pull request #5046 from Raven24/admin_backend 
[ready] admin backend improvements
 2014-07-02 09:22:37 +03: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