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

17389 commits

This branch
This branch
All branches
Author SHA1 Message Date
Benjamin Neff
b67b7cf8c6 write specs for StatusMessageCreationService 2016-03-07 05:52:54 +01:00
Benjamin Neff
5a46da47c3 refactoring StatusMessageCreationService 
* move parameter normalization back to controller, because this is
  frontend-specific.
* if the StatusMessage is public, save also public photos
 2016-03-07 00:00:27 +01:00
Jonne Haß
bc72851ef9 Merge pull request #6743 from SuperTux88/fix-pod-migration 
fix pod table migration if someone deleted a user (owner) manually
 2016-03-06 23:57:12 +01:00
Benjamin Neff
10af3a8b11 fix pod table migration if someone deleted a user (owner) manually 2016-03-06 23:55:28 +01:00
Dennis Schubert
e90f72ff37 Merge pull request #6739 from svbergerem/convert-cukes-to-rspec 
[WIP] Convert some cukes to rspec
 2016-03-05 13:41:39 +01:00
Steffen van Bergerem
9d591c6433 Move some multi stream and person stream cukes to rspec 2016-03-05 11:18:55 +01:00
Steffen van Bergerem
6e6a5c1e29 Move multiple participations test to rspec 2016-03-05 11:18:55 +01:00
Steffen van Bergerem
6ef4345dae Remove activity stream sorting cuke 
already tested in spec/lib/evil_query_spec.rb
 2016-03-05 11:18:49 +01:00
Jonne Haß
39ae5e741e Merge pull request #6732 from SuperTux88/cleanup-aspect_visibilities 
Cleanup aspect visibilities
 2016-03-05 11:05:55 +01:00
Dennis Schubert
91d636b9f6 Merge pull request #6727 from SuperTux88/improve-pod-check 
Improve pod check
 2016-03-05 06:03:20 +01:00
Dennis Schubert
cc5a3997d2 Merge pull request #6728 from svbergerem/mentions-typeahead 
Rewrite mentions input using typeahead.js
 2016-03-05 04:55:38 +01:00
Benjamin Neff
acb91c79d2 improve pod connection check 
* use port for check
* respect entries in /etc/hosts
* test /.well-known/host-meta
* don't allow redirects to other domains
 2016-03-05 02:57:11 +01:00
Benjamin Neff
b1a6516474 add migration for pods-table 
* add port to pods
* remove url from person and link people with pod-table
 2016-03-05 00:12:54 +01:00
Steffen van Bergerem
f556a5210e Refactor js search views 2016-03-04 22:55:39 +01:00
Benjamin Neff
0c8d9e1907 delete aspect_visibilities when deleting the shareable 2016-03-04 20:13:52 +01:00
Benjamin Neff
f913128967 don't add public shareables to aspect_visibilities 2016-03-04 20:13:52 +01:00
Benjamin Neff
54ff7ee278 migration to cleanup aspect_visibilities 
* remove all for public posts
* remove all for deleted posts
 2016-03-04 20:13:52 +01:00
Steffen van Bergerem
bf17205c17 Fix some publisher.scss scss-lint errors 2016-03-04 18:02:22 +01:00
Steffen van Bergerem
f06ff01c9e Remove jquery.hotkeys 2016-03-04 18:02:22 +01:00
Steffen van Bergerem
bee08daca6 Remove jquery-elastic 2016-03-04 18:02:22 +01:00
Steffen van Bergerem
f948120ba6 Refactor keycodes 2016-03-04 18:02:22 +01:00
Augier
e34960392c Code simplifications and typo 2016-03-04 18:02:22 +01:00
Augier
8f021be20b Do not instanciate publisher if not publisher element is present 2016-03-04 18:02:22 +01:00
augier
b1d60d7c9a Jasmine tests 2016-03-04 18:02:22 +01:00
augier
f1e8c57c26 CSS guidestyle 2016-03-04 18:02:22 +01:00
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