nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
6935 commits 2 branches 55 tags 148 MiB
Commit graph

6935 commits

This branch
This branch
All branches
Author SHA1 Message Date
friendica 675aa56b02 rev update - prevent messages with no parent from being counted as unseen, because they cannot ever be cleared 2012-10-10 15:57:40 -07:00
friendica 49ec50b36e Merge https://github.com/friendica/friendica into pull 2012-10-09 17:04:13 -07:00
friendica 987b8b4880 tinymce tag complete - only replace tagged text 2012-10-09 17:03:00 -07:00
friendica 17679152d5 rev update 2012-10-09 17:00:29 -07:00
Thomas Willingham d9e2dd0523 Typo 2012-10-09 23:25:51 +01:00
Thomas Willingham 8dd10940d6 Add a link to the wiki from the install guide for nginx, MariaDB, etc 2012-10-09 20:46:51 +01:00
fermionic 76c1fec196 Merge pull request #509 from fermionic/frost-0.3 
frost style improvements; various tweaks
 2012-10-09 09:07:13 -07:00
Zach Prezkuta 0d56f82efa frost style improvements; various tweaks 2012-10-09 09:44:56 -06:00
Tobias Diekershoff c0c8869f89 CS: update to the strings 2012-10-09 08:23:52 +02:00
friendica 6df274006c Merge https://github.com/friendica/friendica into pull 2012-10-07 15:29:13 -07:00
friendica e24fd2410d rev update 2012-10-07 15:28:05 -07:00
fabrixxm d804e2ceb9 Merge pull request #506 from hmeine/master 
Add link to issue tracker to README
 2012-10-07 01:29:09 -07:00
Tobias Diekershoff 1fa88bb79e DE/PT-BR: update to the strings 2012-10-06 10:43:14 +02:00
Thomas Willingham ffe7209114 Darkzero - make "visible to" legible. 2012-10-06 01:18:03 +01:00
Hans Meine 1b43ef9205 Add link to issue tracker to README 
Since the README is shown on the GitHub page, this makes the issue tracking
more accessible (at least) from there.
 2012-10-05 16:48:45 +02:00
friendica c4b3ea3a73 Merge https://github.com/friendica/friendica into pull 2012-10-05 02:10:48 -07:00
friendica 52062ac9e0 rev update 2012-10-05 02:09:55 -07:00
fermionic 4d029e891a Merge pull request #505 from fermionic/nets-broken-in-themes 
update themes for new All Networks option
 2012-10-04 19:00:48 -07:00
Zach Prezkuta 5f2826f84e update themes for new All Networks option 2012-10-04 19:59:30 -06:00
Thomas Willingham d33abe2de9 Dispy - selecting any network and then switching back to "all networks" 
didn't work.  Remove nets.tpl to make it use the default one.
 2012-10-04 23:19:50 +01:00
pixelroot ceb8b8b77f new file: view/theme/smoothly/file.gif 
modified:   view/theme/smoothly/search_item.tpl
	modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
 2012-10-04 16:37:02 +02:00
Tobias Diekershoff ef9eec5561 DE: update to the strings 2012-10-04 10:33:49 +02:00
friendica 0bfca14048 Merge https://github.com/friendica/friendica into pull 2012-10-03 18:28:27 -07:00
friendica 1e93c85a49 rev update 2012-10-03 18:26:53 -07:00
fermionic eeb184df80 Merge pull request #503 from CyberDomovoy/valid_html 
Use saved_searches_aside.tpl in search.php
 2012-10-03 08:36:32 -07:00
Tobias Diekershoff 65b52878c4 CS: update to the strings 2012-10-03 09:00:59 +02:00
Tobias Diekershoff 122cf96ffd FR: update to the strings 2012-10-03 07:56:29 +02:00
Tobias Diekershoff d651291916 DE: update to the strings 2012-10-03 07:56:12 +02:00
Thomas Willingham 86f907d715 Merge pull request #504 from cvogeley/master 
bring back BB-Code in cleanzero comments
 2012-10-02 13:27:58 -07:00
Christian Vogeley 44acbb25e4 Bring back BB-Code in comments 2012-10-02 21:29:00 +02:00
Domovoy 8e50b3f9ce Use saved_searches_aside.tpl in search.php 2012-10-02 16:03:20 +02:00
fermionic d6226a5337 Merge pull request #502 from fermionic/frost-categories-update 
frost suport for categories and folder updates
 2012-10-01 13:25:36 -07:00
Zach Prezkuta e850e0c6d5 frost suport for categories and folder updates 2012-10-01 14:22:32 -06:00
fermionic 9daafe7489 Merge pull request #501 from fermionic/network-remember-filters 
don't set a date as a group
 2012-10-01 13:08:48 -07:00
Zach Prezkuta c6061d598f don't set a date as a group 2012-10-01 14:07:32 -06:00
fabrixxm 9d4fdee65d Merge pull request #500 from fabrixxm/quattro-fontsoptions 
Quattro fixes
 2012-10-01 07:05:58 -07:00
Fabrixxm 864d022468 editpost: add short jot action text to edit post form 2012-10-01 10:00:25 -04:00
Fabrixxm c7a4c08081 quattro: fix jot "video link" tooltip 2012-10-01 09:59:55 -04:00
Fabrixxm 871f182414 quattro: add quattro-lilac to theme Makefile 2012-10-01 09:53:02 -04:00
Fabrixxm ca34d89482 quattro: fix post tags style, add icons for mentions, folders and categories 2012-10-01 09:38:25 -04:00
Fabrixxm 9d738570ee quattro: options for posts and textareas font size 2012-10-01 08:58:05 -04:00
friendica 112fafcc81 consistent handling of scaled images when using imagick 2012-09-30 03:25:20 -07:00
friendica 84199e6e71 Merge https://github.com/friendica/friendica into pull 2012-09-30 02:08:56 -07:00
friendica 0f09cb46ab rev update 2012-09-30 02:08:01 -07:00
friendica a620d5d9f3 Merge pull request #493 from fermionic/toggle-mobile-all-themes 
Toggle mobile all themes
 2012-09-30 01:58:51 -07:00
friendica e0dbd2e8e4 Merge pull request #494 from fermionic/diaspora-contact-lookup-fails 
look for DFRN contacts as well
 2012-09-30 01:58:37 -07:00
friendica e60c729b51 Merge pull request #495 from fermionic/email-optimization 
send less messages to server; remove delete option
 2012-09-30 01:58:07 -07:00
friendica 35905ebf1c Merge pull request #496 from fermionic/deleted-group-stays-in-default-permissions 
remove groups from default permissions when removed; bug in group_add_member
 2012-09-30 01:57:52 -07:00
friendica d93e34b2ae Merge pull request #497 from fermionic/permission-denied-to-allowed-contact 
allow contact if in allowed group, even if not in non-empty allowed contacts
 2012-09-30 01:57:02 -07:00
friendica c9536ac056 Merge pull request #498 from fermionic/more-robust-tag-conversion 
allow tagging of people by name or nickname
 2012-09-30 01:55:23 -07:00