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

15777 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jonne Haß
61c890f274 Merge branch 'release/0.5.0.0-RC' into develop 2015-04-21 22:02:28 +02:00
Steffen van Bergerem
6bb5e0a29b Only render hovercard if the mouse is still on the username 2015-04-21 22:02:18 +02:00
Jonne Haß
c8f990359d Merge branch 'release/0.5.0.0-RC' into develop 2015-04-21 20:50:27 +02:00
Steffen van Bergerem
a14713b985 Update markdown-it, disable fuzzy links 2015-04-21 20:50:16 +02:00
Jonne Haß
9a9cf6f6a5 Merge branch 'release/0.5.0.0-RC' into develop 2015-04-21 20:48:41 +02:00
Steffen van Bergerem
2d3c0680ea Fix uppercase registration/login labels and btn style 2015-04-21 20:48:30 +02:00
Jonne Haß
9d4916709b Merge branch 'release/0.5.0.0-RC' into develop 2015-04-20 22:40:12 +02:00
Jonne Haß
ae8735c2a3 Merge pull request #5870 from SuperTux88/fix-not_public-page 
fix not_public page
 2015-04-20 22:40:00 +02:00
Jonne Haß
37ec00f80b Merge pull request #5854 from svbergerem/remove-managing-services-standalone 
Remove 'manage services' link in standalone mode
 2015-04-20 22:36:11 +02:00
Jonne Haß
d959dd725b Merge pull request #5850 from svbergerem/modal-for-new-aspect 
Use Bootstrap modal for new aspect form
 2015-04-20 22:34:51 +02:00
Benjamin Neff
128cfb247c fix not_public page 
body was rendered in the head
 2015-04-20 22:32:32 +02:00
Jonne Haß
9b3bf62e66 Merge branch 'release/0.5.0.0-RC' into develop 2015-04-20 22:06:40 +02:00
Steffen van Bergerem
fc8e92b67a Bump markdown-it 2015-04-20 22:06:00 +02:00
Jonne Haß
e996bd7e36 Merge branch 'release/0.5.0.0-RC' into develop 2015-04-20 21:49:55 +02:00
Jonne Haß
6fe06f6d3c Merge pull request #5868 from SuperTux88/fix-service-icons 
fixed service-icons in sidebar
 2015-04-20 21:49:46 +02:00
Benjamin Neff
13a6b1389d fixed service-icons in sidebar 
recovered css from old application.scss

was removed in e188782a9a
 2015-04-20 21:49:36 +02:00
Jonne Haß
a06448447a Merge branch 'release/0.5.0.0-RC' into develop 2015-04-20 21:19:49 +02:00
Jonne Haß
7ff2536369 Merge pull request #5867 from SuperTux88/align-control-icons 
fix control icon alignment in chromium browser
 2015-04-20 21:19:38 +02:00
Benjamin Neff
0211da4116 fix control icon alignment in chromium browser 2015-04-20 21:06:17 +02:00
Jonne Haß
3a8724bf0b Merge branch 'release/0.5.0.0-RC' into develop 2015-04-19 16:22:34 +02:00
Jonne Haß
fa7a7c5d59 Merge pull request #5865 from SuperTux88/fix-mysql_to_unicode_mb4-migration 
use "CONVERT TO" to change the encoding for the table and all character columns
 2015-04-19 16:21:35 +02:00
Jonne Haß
85c376e591 Merge branch 'release/0.5.0.0-RC' into develop 2015-04-19 15:58:41 +02:00
goobertron
a75ec75ec7 Update aspect edits text, reorder posting section 
First iteration to update Help section

Changes from Fla
 2015-04-19 15:57:21 +02:00
Benjamin Neff
4be8a0bed9 change TEXT columns back to TEXT 
mysql changes the type of TEXT columns to MEDIUMTEXT with "CONVERT TO",
but we don't want this, so change this columns back to TEXT.

see: https://bugs.mysql.com/bug.php?id=31291
 2015-04-19 15:45:20 +02:00
Benjamin Neff
f4fd77fa7c use "CONVERT TO" to change the encoding for the table and all character columns 
see: https://dev.mysql.com/doc/refman/5.6/en/charset-conversion.html
 2015-04-18 17:54:15 +02:00
Jonne Haß
f11a6b5417 Merge branch 'release/0.5.0.0-RC' into develop 2015-04-15 15:41:41 +02:00
Praveen Arimbrathodiyil
2613896cfd fix for #5862, check for compiled assets 2015-04-15 15:39:19 +02:00
Jonne Haß
b3575ab56f Merge branch 'release/0.5.0.0-RC' into develop 2015-04-14 15:42:33 +02:00
goobertron
a687a8dc01 Update help text for renaming an aspect 2015-04-14 15:40:58 +02:00
Jonne Haß
096fa2ddbb Merge pull request #5852 from margori/3393-activity-stream-keeping-retracted-participations 2015-04-11 20:42:34 +02:00
Dennis Schubert
cfc98d9a2a Merge branch 'hotfix/0.4.1.3' into release/0.5.0.0-RC 2015-04-11 20:15:10 +02:00
Dennis Schubert
f7d1105148 Merge branch 'hotfix/0.4.1.3' into develop 2015-04-11 20:12:13 +02:00
Dennis Schubert
9fc00d0814 Bump Redcarpet to fix OSVDB-120415 2015-04-11 19:51:18 +02:00
Marcelo Briones
6636a89118 Add participation counter 2015-04-11 14:41:17 -03:00
Asphyxia
5fb328864e Activity stream keeping retracted participations 2015-04-10 21:46:42 -03:00
Jonne Haß
5481ddb540 Merge branch 'release/0.5.0.0-RC' into develop 2015-04-10 19:23:00 +02:00
Jonne Haß
ec2a209b68 Lazily initialize Contact proxy in service helper 
This prevents connecting to the database on rake assets:precompile,
which fails in certain build environments.

Running git blame on this and figuring out what in gods name this
is for, is for another time.
 2015-04-10 19:19:16 +02:00
Dennis Schubert
0a2369395c Merge pull request #5855 from svbergerem/no-services-available-message 
Refactor available services settings
 2015-04-09 06:31:47 +02:00
Steffen van Bergerem
895d38de21 Refactor available services settings 2015-04-08 18:43:35 +02:00
Steffen van Bergerem
b885b8583d Remove 'manage services' link in standalone mode 2015-04-08 12:49:05 +02:00
Steffen van Bergerem
75ef9f47d0 Use Bootstrap modal for new aspect form 2015-04-07 10:45:09 +02:00
Jonne Haß
4812dc7a23 Merge pull request #5849 from svbergerem/406-on-people-contacts-json 
Return 406 on people/guid/contacts, format json
 2015-04-06 12:49:46 +02:00
Jonne Haß
f4ed086ae0 Merge branch 'release/0.5.0.0-RC' into develop 2015-04-06 12:30:11 +02:00
Jonne Haß
3fcd0c683c Merge pull request #5853 from svbergerem/update-changelog 
Add link to custom splash page wiki examples
 2015-04-06 12:29:21 +02:00
Steffen van Bergerem
e6cc20d686 Add link to custom splash page wiki examples 2015-04-06 12:26:28 +02:00
Steffen van Bergerem
a6b9c6c057 Return 406 on people/guid/contacts, format json 2015-04-04 03:48:44 +02:00
Jonne Haß
4b841ef076 Merge pull request #5843 from margori/private_post_subject_content 
Limited post content excluded from subject of comment email
 2015-04-04 00:39:40 +02:00
Jonne Haß
cc5bd16eb4 Merge pull request #5848 from svbergerem/migrate-only-sharing 
Fix only sharing flag for contacts that are receiving
 2015-04-04 00:16:37 +02:00
Jonne Haß
b90dc790e5 Merge pull request #5846 from svbergerem/fix-destroying-auto-follow-back-aspect 
Disable auto follow back on aspect deletion
 2015-04-04 00:13:24 +02:00
Jonne Haß
55593bfb86 Start undoing HoundCI derivations from Rubocop defaults 2015-04-04 00:01:22 +02:00