Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-23 20:15:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
9795 commits 7 branches 31 tags 160 MiB
Commit graph

9795 commits

This branch
This branch
All branches
Author SHA1 Message Date
friendica
efa30f1b03 This would be about the 75th attempt to try and prevent duplicated email notifications for comments. Eventually we'll find something that works. 2014-02-05 15:01:53 -08:00
friendica
e525f045c1 Merge pull request #298 from cvogeley/master 
Other not so elegant way of detecting touch screen devices
 2014-02-06 06:44:41 +11:00
friendica
4a03ae09eb Merge pull request #302 from git-marijus/master 
add a sanitized style tag to bbcode
 2014-02-06 06:39:36 +11:00
marijus
bd1849ddae Merge branch 'upstream' 2014-02-05 14:50:38 +01:00
marijus
419e3b5024 Merge branch 'master' of https://github.com/friendica/red into upstream 2014-02-05 14:48:42 +01:00
marijus
a606fc0ba3 add a sanitized style tag to bbcode 2014-02-05 14:34:25 +01:00
marijus
9e993bb4fd Merge branch 'master' of https://github.com/friendica/red 2014-02-05 13:43:16 +01:00
friendica
0844110f7b preserve system bit when editing menus 2014-02-05 03:44:46 -08:00
friendica
24f32e55c8 bookmarking bugfix 2014-02-05 03:29:02 -08:00
friendica
f30a39f9df bookmark debug logging 2014-02-05 03:15:10 -08:00
friendica
8a11c29413 make links in comments bookmark-able 2014-02-04 19:39:56 -08:00
friendica
9f439c3248 add icon translation for new icon 2014-02-04 17:14:22 -08:00
friendica
aede006970 bookmarks - mop up and go home 2014-02-04 17:12:13 -08:00
friendica
3665bc38ef bookmarking 2014-02-04 16:06:56 -08:00
marijus
4253581733 Merge branch 'master' of https://github.com/friendica/red 2014-02-04 16:19:35 +01:00
friendica
46b9352a84 fix the search for system bookmarks 2014-02-04 01:42:43 -08:00
friendica
50a1ffd244 Merge https://github.com/friendica/red into zpull 2014-02-04 00:53:04 -08:00
friendica
d8f16442a1 bookmark permissions 2014-02-04 00:52:34 -08:00
tobiasd
74298c44ae Merge pull request #301 from tobiasd/20140204 
DE: update to the strings
 2014-02-03 22:52:21 -08:00
Tobias Diekershoff
7ff2c018c5 DE: update to the strings 2014-02-04 07:50:32 +01:00
friendica
1572403e98 photo tagging somewhat working - but can't remove photo tags until we update tagrm 2014-02-03 20:44:42 -08:00
friendica
9ce3dac479 some tagging fixes - including old bugs which were never reported 2014-02-03 19:54:32 -08:00
friendica
876f5d4de0 transmit, receive, and parse bookmarks 2014-02-03 19:38:15 -08:00
friendica
c4d0884596 accept new connection broke yesterday 2014-02-03 14:03:43 -08:00
marijus
2a9baa1f32 Merge branch 'master' of https://github.com/friendica/red 2014-02-03 15:54:50 +01:00
friendica
6c91580716 code cleanup - remove some unused functions 2014-02-03 02:21:06 -08:00
marijus
5c885e91a3 Merge branch 'master' of https://github.com/friendica/red 2014-02-03 08:03:46 +01:00
friendica
ee42079685 The problem with a lot of packages is that it's easier to re-write them than to re-use them. 2014-02-02 21:25:52 -08:00
friendica
c7cad26b41 more wordsmithing 2014-02-02 20:22:41 -08:00
friendica
5cc6efe21f changed order of the privacy macros so that the dangerous settings come last and the preferred settings come first 2014-02-02 20:14:57 -08:00
friendica
54acf5aeac cleanup in preparation for new page 2014-02-02 18:57:21 -08:00
friendica
baf3b052f6 don't load any configs from DB if installing - especially in style.pcss 2014-02-02 18:18:22 -08:00
friendica
38bce48f28 wordsmithing 2014-02-02 18:06:15 -08:00
friendica
ee1580427e don't draw attention to advanced permissions and their corresponding complexity and clearly mark the simple permissions which people are encouraged to use. 2014-02-02 17:54:36 -08:00
friendica
732a4b898a Merge pull request #300 from tazmandevil/master 
added Thomas' additional navbar colours from APW to redbasic
 2014-02-02 17:09:25 -08:00
Tazman DeVille
d2b55f5eea added Thomas' additional navbar colours from APW to redbasic 2014-02-03 02:06:07 +01:00
friendica
3eed73d519 minor text change "can" -> "may" 2014-02-02 16:51:11 -08:00
friendica
2768262f93 Add switch to allow menus to be used as bookmark collections 2014-02-02 16:49:09 -08:00
friendica
abb68e846d remove the text "requires compatible chat plugin" 2014-02-02 16:02:04 -08:00
friendica
67899677db make chat honour the pause key (but we still need to ping the server to maintain the in_room status), also the recent change to pull css out of the template file used classes instead of ids so none of the styles were sticking 2014-02-02 15:50:07 -08:00
marijus
11efafb5d2 Merge branch 'master' of https://github.com/friendica/red 2014-02-02 23:50:21 +01:00
friendica
02e4527de6 better check for setup module 2014-02-02 14:09:09 -08:00
friendica
cf85fec919 Merge https://github.com/friendica/red into zpull 2014-02-02 14:07:33 -08:00
friendica
b39c0d54c0 some windows fixes 2014-02-02 14:06:36 -08:00
marijus
211dc4edd2 Merge branch 'master' of https://github.com/friendica/red 2014-02-02 23:02:34 +01:00
friendica
b7c4f033b5 Merge pull request #299 from toclimb/smilies-fix 
More efficient smilie replacing (see pull request #291)
 2014-02-02 11:49:52 -08:00
marijus
8568eb2873 Merge branch 'master' of https://github.com/friendica/red 2014-02-02 17:50:24 +01:00
Thomas Willingham
96e423dcfc Merge pull request #297 from tazmandevil/master 
link hover colour remains user set link_colour (w/o change default,Mike)
 2014-02-02 08:33:26 -08:00
marijus
9fcc2a18df Merge branch 'master' of https://github.com/friendica/red 2014-02-02 17:31:25 +01:00
Thomas Willingham
5846dc105a Move CSS out of chat template 2014-02-02 16:28:58 +00:00