Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-21 05:35:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
12864 commits 7 branches 30 tags 160 MiB
Commit graph

12864 commits

This branch
This branch
All branches
Author SHA1 Message Date
friendica
66cef7531a don't wipe out the item body of a linked item to a photo when doing a normal delete and not forced 2015-01-12 16:36:10 -08:00
friendica
cdc52ba884 change deletion behaviour of linked photo items. Previously deleting the visible item in the conversation deleted the photo as well. Now photos must be deleted in the photos module. Deleting the linked item removes any attached conversation elements (likes, etc.) and sets the conversation item to hidden. This may create an issue in the future if we move the photo tags, title, or other photo elements to the linked item rather than the photo. Noting here so this can potentially be discovered and remembered at that time. 2015-01-12 16:27:27 -08:00
Einer von Vielen
43b877caa1 Test 
...with table of content.
jquery.tableofconent.js works bunt not properly
 2015-01-13 00:06:44 +01:00
friendica
9fc9af87e3 Merge https://github.com/friendica/red into pending_merge 2015-01-12 11:26:11 -08:00
friendica
962c6207ae double perms msg 2015-01-12 11:25:48 -08:00
pafcu
a0134de28a Merge pull request #844 from pafcu/moretagging 
Refactor mention code to make it more reusable
 2015-01-12 21:07:54 +02:00
Stefan Parviainen
adc9564b5c Refactor mention code to make it more reusable 2015-01-12 20:01:07 +01:00
pafcu
55eb6be308 Merge pull request #842 from pafcu/master 
Possibly fix issue with readmore.js collapse
 2015-01-12 18:16:47 +02:00
Stefan Parviainen
cce51f5a49 Possibly fix issue with readmore.js collapse 2015-01-12 17:11:03 +01:00
friendica
580c30f516 another attempt to explain default permissions on connedit page 2015-01-11 21:18:29 -08:00
friendica
a088a8f03c remove extraneous debug file left over from postgres work. 2015-01-11 20:02:24 -08:00
friendica
3f4f3e244a that was not intended to be merged with master yet. Put it under a define 2015-01-11 15:22:58 -08:00
friendica
381f8a1b42 optionally use openssl encryption functions (higher performance over mcrypt, but potentially more likely to have been compromised) 2015-01-11 15:13:45 -08:00
friendica
6f7b1960af allow the use of openssl crypto 2015-01-11 14:58:47 -08:00
friendica
0259051a87 basic backend work for creating consensus items 2015-01-11 14:41:33 -08:00
friendica
b018b39e64 Merge branch 'master' into trinidad 2015-01-11 14:02:27 -08:00
friendica
6599ae052b Merge https://github.com/friendica/red into pending_merge 2015-01-11 14:02:26 -08:00
friendica
152f250d2b revup 2015-01-11 14:02:07 -08:00
RedMatrix
ff01505b36 Merge pull request #840 from cvogeley/master 
Fix for #Issue763
 2015-01-12 09:01:51 +11:00
Christian Vogeley
1e6fd90795 Correction 2015-01-11 22:59:50 +01:00
Christian Vogeley
f6ec519686 Correction 2015-01-11 22:54:16 +01:00
Christian Vogeley
f245a09023 Correction 2015-01-11 22:36:30 +01:00
Christian Vogeley
4e7e555a75 corrcetion 2015-01-11 22:30:59 +01:00
Christian Vogeley
63f189b453 Correct 2015-01-11 22:23:30 +01:00
Christian Vogeley
f2ef89e697 Revert "put back in" 
This reverts commit 5beec923b4.
 2015-01-11 19:47:05 +01:00
Christian Vogeley
1f02700618 Revert "put back in" 
This reverts commit ab07857d9c.
 2015-01-11 19:44:18 +01:00
Christian Vogeley
ab07857d9c put back in 2015-01-11 19:41:22 +01:00
Christian Vogeley
5beec923b4 put back in 2015-01-11 19:38:43 +01:00
Christian Vogeley
c89db830eb . 2015-01-11 19:31:20 +01:00
Christian Vogeley
487d201ea8 . 2015-01-11 19:23:15 +01:00
Christian Vogeley
f957208600 fix accidentally removed file 2015-01-11 19:19:18 +01:00
Christian Vogeley
f0c7612bcd Merge remote-tracking branch 'upstream/master' 
Conflicts:
	doc/html/classRedmatrix_1_1Import_1_1Import-members.html
	doc/html/classRedmatrix_1_1Import_1_1Import.js
 2015-01-11 16:22:59 +01:00
Christian Vogeley
43f143a211 Fix for issue #763 Error creating new channel within the limits of the 
subscription plan
 2015-01-11 16:12:36 +01:00
friendica
4c31598555 Merge branch 'master' into trinidad 2015-01-10 14:59:24 -08:00
friendica
10102ac2ac connection clone issues 2015-01-10 14:59:10 -08:00
friendica
df0f67843e Merge branch 'master' into trinidad 2015-01-10 13:05:04 -08:00
friendica
8c4eb839f9 Merge https://github.com/friendica/red into pending_merge 2015-01-10 13:05:02 -08:00
friendica
c75cdbd304 doc updates 2015-01-10 13:04:43 -08:00
RedMatrix
50bc43733f Merge pull request #839 from einervonvielen/dev_beginning_fix1 
Fixed / Changed step-by-step manual for beginning developers
 2015-01-11 08:03:54 +11:00
Einer von Vielen
bd7aebe272 Changed step-by-step manual for beginning developers. 
- Fixed: Deleted wrong "orign" in push
- Changed: Spellings
- Added: Eclipses GIT plugin "Eclipse Mylyn to GitHub connector"
 2015-01-10 20:45:09 +01:00
Einer von Vielen
52236c8677 Changed step-by-step manual for beginning devolopers. 
- Fixed: Deleted "origin" in push at the end of the document
- Changed: Wordings
- Added: Reference to eclipse GIT plugin "Eclipse Mylyn to GitHub
connector"
 2015-01-10 20:39:05 +01:00
Habeas Codice
0368fe49f3 Fix unescaped image data 2015-01-10 11:08:37 -08:00
git-marijus
72c0bc1169 Merge pull request #838 from f03el/master 
Some updates to the Swedish translation
 2015-01-10 13:02:32 +01:00
git-marijus
884fa8bf9f Merge pull request #837 from git-marijus/master 
basic changes for file activity
 2015-01-10 13:01:02 +01:00
Erik Lundin
3877f4ffd4 Fix typo and rephrase Swedish translation 2015-01-10 11:46:03 +01:00
Erik Lundin
27046aeb7a Update Swedish strings from Transifex 2015-01-10 11:38:09 +01:00
marijus
978d78b953 basic changes for file activity 2015-01-09 15:18:45 +01:00
Paolo T
e1c5cc46f6 Merge pull request #836 from tuscanhobbit/dev 
Updated Italian translation
 2015-01-09 08:59:26 +01:00
Paolo Tacconi
39cfd77583 Updated Italian translation 2015-01-09 08:57:08 +01:00
friendica
072dc6e820 Merge branch 'master' into trinidad 2015-01-08 19:21:27 -08:00