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

17364 commits

This branch
This branch
All branches
Author SHA1 Message Date
augier
c9f87796cc Using Typeahead for mentionning box 2016-03-04 18:02:22 +01:00
Dennis Schubert
e0d6da7ad7 Re-add pg in Gemfile.lock 
Regression during from e596b1d277
 2016-03-04 16:28:18 +01:00
Dennis Schubert
c46c3ef087 Merge branch 'SuperTux88-fix-share_visibilities' into develop 2016-03-04 15:19:42 +01:00
Benjamin Neff
c778fc4232 use plain sql for update_all to fix postgres 
also added a migration model
 2016-03-04 15:14:45 +01:00
Jonne Haß
e596b1d277 Merge branch 'stable' into develop 2016-03-04 15:05:36 +01:00
Dennis Schubert
92fcbfbede Bump mysql2 2016-03-04 15:00:33 +01:00
Dennis Schubert
e00cbf62ae Bump js_image_paths 2016-03-04 14:53:02 +01:00
Dennis Schubert
558094409b Bump js-routes 2016-03-04 14:53:02 +01:00
Dennis Schubert
5eba267db2 Bump autoprefixer-rails 2016-03-04 14:53:02 +01:00
Dennis Schubert
9af3e957f6 Bump rails 2016-03-04 14:50:07 +01:00
Benjamin Neff
7011f2961d Revert "Back out #6723 due to Postgres breakage" 
This reverts commit 84cfbd22fc.
 2016-03-04 14:01:31 +01:00
Dennis Schubert
84cfbd22fc Back out #6723 due to Postgres breakage 
This reverts commit 832a56134b, reversing
changes made to 75c3e6068c.
 2016-03-04 13:33:32 +01:00
Dennis Schubert
832a56134b Merge pull request #6723 from SuperTux88/fix-share_visibilities 
Link share visibilities directly with users
 2016-03-04 12:05:40 +01:00
Benjamin Neff
8929d56dc0 update schema.rb after migration from #6586 2016-03-04 00:11:52 +01:00
Benjamin Neff
e3d1f0fd16 fix order with two posts with the same timestamp for all streams 2016-03-03 21:43:11 +01:00
Benjamin Neff
7583568be8 update queries for new ShareVisibility 
Also:
* remove ShareablesFromPerson evil-query
* improve multi-stream and aspect-stream queries
* fix logging for recieve
* don't add last 100 public posts to users streams after sharing
* delete share visibility when shareable is deleted
 2016-03-03 21:43:11 +01:00
Benjamin Neff
14d45861cb remove old migration spec, because it tries to downgrade later migrations 2016-03-03 21:43:11 +01:00
Benjamin Neff
9657810208 create migration to link share visibility directly with users 
Also:
* remove share visibilities where the shareable is already deleted
* remove share visibilities where the user doesn't exist
* remove `created_at` and `updated_at` to make the table smaller
 2016-03-03 21:43:08 +01:00
Dennis Schubert
75c3e6068c Merge branch 'stable' into develop 2016-03-03 17:58:05 +01:00
Steffen van Bergerem
b98af83c9d Sort tag search result by name 
closes #6734
 2016-03-03 17:57:58 +01:00
Dennis Schubert
7c88fb7936 Merge pull request #6586 from cmrd-senya/drop-signatures 
Remove parent author signature for relayables from the DB
 2016-03-03 17:39:28 +01:00
Steffen van Bergerem
6bf5f0ee9e Add Changelog for #6621 [ci skip] 2016-03-02 22:03:47 +01:00
Steffen van Bergerem
b69361838b Merge pull request #6621 from Fensterbank/6610-improved-gallery 
add a card footer in gallery containing meta data and link to single post view
 2016-03-02 21:47:53 +01:00
Frédéric Bolvin
e8bddcc7a7 add a card footer in gallery containing meta data and link to single post view 2016-03-02 19:50:32 +01:00
Dennis Schubert
091c426004 Merge pull request #6672 from k0kubun/hamlit 
Use Hamlit to render Haml
 2016-03-01 07:16:25 +01:00
Dennis Schubert
51366e287c Merge pull request #6719 from cmrd-senya/pkey_archive 
Include a private key to the user data export archive
 2016-02-26 11:41:04 +01:00
Jonne Haß
b0d983e85c Merge branch 'stable' into develop 2016-02-26 11:27:29 +01:00
Steffen van Bergerem
98d76af318 Remove empty test file, move i18n spec 
closes #6720
 2016-02-26 11:27:17 +01:00
Steffen van Bergerem
70a67e1824 Fix reshare icon style regression from #6709 2016-02-25 17:42:42 +01:00
cmrd Senya
6d9fa06e32 Include a private key to the user data export archive 
In order to allow a user to notify his contacts of his migration
with a trustworthy signature the old private key must be available
to the new pod where we import data.
 2016-02-25 13:38:24 +03:00
Dennis Schubert
51eb3a79fc Merge pull request #6718 from svbergerem/fix-contacts-page-notification-count 
Fix notification count change on contacts page
 2016-02-25 09:26:34 +01:00
Dennis Schubert
477e2572ac Merge pull request #6717 from svbergerem/fix-contacts-page-style-regression 
Fix style regression on contacts page from #6697
 2016-02-25 09:24:42 +01:00
Dennis Schubert
de37bbbed0 Merge pull request #6712 from svbergerem/spv-avatar-alignment 
Improve interaction avatar alignment for SPV
 2016-02-25 09:24:28 +01:00
Steffen van Bergerem
dafafcd680 Fix notification count change on contacts page 2016-02-24 23:56:01 +01:00
Steffen van Bergerem
5692190f09 Fix style regression on contacts page from #6697 for notification dropdown and no contacts well 2016-02-24 22:46:47 +01:00
Steffen van Bergerem
410ddc3cb7 Merge pull request #6715 from cmrd-senya/rm-unused-div 
Remove #publisher_photo_upload from haml
 2016-02-24 22:11:37 +01:00
cmrd Senya
8683067ace Remove #publisher_photo_upload from haml 
It seems like #publisher_photo_upload is relict of blueprint.
It was removed from CSS in 0c7d319fdc and
probably was unused even before. So remove it from publishers.
 2016-02-24 13:47:45 +03:00
Steffen van Bergerem
f9fe64da23 Improve interaction avatar alignment for SPV 2016-02-23 22:15:43 +01:00
Dennis Schubert
5e02dd0864 Merge pull request #6709 from svbergerem/unify-spv-ui 
Adjust the SPV design
 2016-02-23 11:47:09 +01:00
Steffen van Bergerem
d9e3f3a734 Merge branch 'stable' into develop 2016-02-23 09:38:53 +01:00
Dennis Schubert
9f2e5b1868 Only mark unread notifications as read otherwise, the UPDATE statement would update all the notifications... 
closes #6711
 2016-02-23 09:38:34 +01:00
Steffen van Bergerem
c7e3f2fc19 Adjust the SPV design 2016-02-23 09:20:54 +01:00
Dennis Schubert
a967fe1f48 Merge pull request #6708 from svbergerem/pending-person-stream-spec 
Activate "Stream::Person returns the most recent posts" spec
 2016-02-23 06:36:09 +01:00
Dennis Schubert
dbdf352a6b Merge branch 'stable' into develop 2016-02-23 06:35:26 +01:00
Steffen van Bergerem
0392549702 Add footer on conversations page 
closes #6710
 2016-02-23 06:35:15 +01:00
Dennis Schubert
4cb0d18a63 Merge branch 'stable' into develop 2016-02-22 11:27:45 +01:00
Dennis Schubert
fbabc541ae updated 111 locale files [ci skip] 2016-02-22 11:26:04 +01:00
Dennis Schubert
11420c20e3 Merge branch 'stable' into develop 2016-02-22 05:00:18 +01:00
Dennis Schubert
523197e779 Merge branch 'master' into stable 2016-02-22 05:00:12 +01:00
Dennis Schubert
56ebcc7600 Remove version number padding 
[ci skip]
 2016-02-22 04:58:36 +01:00