clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
5,159 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

5159 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas Willingham fade45ca76 Diabook-dark, couple of new icons, and another css fix. 2012-04-24 20:00:49 +01:00
friendica fbdb8fc43a fix tags test with new url 2012-04-24 01:02:22 -07:00
friendica 7923404c83 Merge https://github.com/friendica/friendica into pull 2012-04-23 22:42:48 -07:00
friendica 2064d86cb3 separate tag search from body search 2012-04-23 22:41:32 -07:00
friendica 3299365c76 Merge pull request #260 from mschmitt/master 
Esperanto at 100% again
 2012-04-23 22:22:05 -07:00
Martin Schmitt c85fd87df1 Esperanto at 100% again 2012-04-24 06:52:36 +02:00
friendica 822ecf41bd Merge pull request #259 from beardy-unixer/master 
Diabook-dark
 2012-04-23 21:10:53 -07:00
Thomas Willingham 9443248fad Improvements to diabook-dark 
Still a long way to go, but some icons and a few CSS fixes
 2012-04-24 04:55:39 +01:00
Thomas Willingham 92820c5181 Merge remote-tracking branch 'upstream/master' 
Merge upstream
 2012-04-24 04:54:14 +01:00
friendica 3637534119 move unfriend to standalone function for use in account removal 2012-04-23 19:42:57 -07:00
friendica f265863435 more work on mail2 (introductions), added 'm' (mail) flag to ACL backend for autocomplete of PM recips 2012-04-23 18:28:33 -07:00
Thomas Willingham 8a80ea24d1 Merge remote-tracking branch 'upstream/master' 
Merge upstream
 2012-04-24 02:18:51 +01:00
Tobias Diekershoff af7abcea27 DE strings, correction of a typo 2012-04-23 20:55:48 +02:00
tommy tomson a305cf9f5c diabok-themes: fixed bug in green-wide and dark-wide 2012-04-23 18:42:37 +02:00
tommy tomson c5c419a785 diabook-themes: small fix in nets_aside, group_aside and delete obsolete .tpls in subfolders 2012-04-23 17:22:22 +02:00
tommy tomson d072c12e7d diabook-themes: bugfix in admin-section 2012-04-23 15:47:18 +02:00
friendica e9e4fb664a allow bbcode representation of html symbols such as © by wrapping in bb brackets 2012-04-23 05:42:46 -07:00
friendica 8f0f644295 protect jappixmini/proxy from typo check, more work on email2 connector 2012-04-23 05:16:57 -07:00
friendica 2170df897b bug #388 - notify_comment received after post deleted 2012-04-22 19:19:02 -07:00
friendica 724e1d15d0 Merge https://github.com/friendica/friendica into pull 2012-04-22 16:25:02 -07:00
friendica 00cb7f9efb don't allow non-existent themes as choices 2012-04-22 16:24:29 -07:00
friendica c0dffa7442 Merge pull request #258 from unary/api 
api: add support for StatusNet-style media param to API
 2012-04-22 15:43:24 -07:00
friendica 3c6c5d4749 Merge pull request #257 from CatoTH/master 
Add a hook in mod/ping.php
 2012-04-22 15:41:47 -07:00
tommy tomson e74ae8b031 diabook-themes: bugfix 2012-04-22 23:58:34 +02:00
tommy tomson d6c8a14fb0 diabook-themes: fixed youtube-bug and added "Info/Impressum" to footer 2012-04-22 22:31:44 +02:00
Michael Johnston 76aa9b3037 api: add support for StatusNet-style media param to API 2012-04-22 13:37:25 -04:00
Tobias Hößl 27c23229c4 Merge branch 'master' of git://github.com/friendica/friendica 2012-04-22 13:31:07 +00:00
Tobias Hößl 3116db1a74 Add a hook 2012-04-22 13:28:54 +00:00
Tobias Diekershoff 9434b447f3 DE strings update 2012-04-22 13:13:27 +02:00
tommy tomson c0a377e0de diabook-themes: comment-bbcode-bugfix 2012-04-22 12:59:00 +02:00
Simon 54817f058a Merge pull request #256 from simonlnu/master 
fix tinymce theming
 2012-04-21 22:23:13 -07:00
Simon L'nu 203aa819e2 fix tinymce theming 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-04-22 01:22:29 -04:00
Simon L'nu f99d9e4d7f Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  rev update
  diabook-themes: deleted obsolete diabook-folder & minor bug-fixes

* master:
 2012-04-22 01:17:13 -04:00
friendica d340b80094 Merge https://github.com/friendica/friendica into pull 2012-04-21 19:29:08 -07:00
friendica 371f3e450e rev update 2012-04-21 19:28:45 -07:00
tommy tomson fe6567cb88 diabook-themes: deleted obsolete diabook-folder & minor bug-fixes 2012-04-22 03:15:06 +02:00
Simon L'nu 2d129e7455 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  rev update

* master:
 2012-04-21 04:34:56 -04:00
friendica bdbe068b95 rev update 2012-04-21 01:18:46 -07:00
Simon 7bae290aeb Merge pull request #255 from simonlnu/master 
fix checkboxes and radio buttons for some browsers
 2012-04-20 17:19:49 -07:00
Simon L'nu 7a14f45904 fix checkbox/radio buttons for some browsers 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-04-20 20:18:47 -04:00
Simon L'nu 172aff1c2b Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  diabook-themes: add diabook-dark
  diabook-themes: add diabook-green and some minor css/bug-fixes
  rev update
  escape email template var names. fix bug n385.

* master:
 2012-04-20 20:16:06 -04:00
tommy tomson 8809e96310 diabook-themes: add diabook-dark 2012-04-21 01:06:17 +02:00
tommy tomson e052be606c diabook-themes: add diabook-green and some minor css/bug-fixes 2012-04-20 17:16:42 +02:00
friendica 30bbbf32e5 rev update 2012-04-20 06:31:38 -07:00
Simon 0e25376e4a Merge pull request #254 from simonlnu/master 
add some knobs to comment boxes
 2012-04-20 03:43:55 -07:00
fabrixxm 16c308791f Merge pull request #253 from fabrixxm/master 
fix bug n385
 2012-04-20 03:42:50 -07:00
Simon L'nu 5d2dd5798b fix the buttons. don't hide the buttons once shown 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-04-20 06:42:08 -04:00
Simon L'nu eb9ddb884a optimise imgs; add some comment editing knobs 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-04-20 05:56:54 -04:00
Simon L'nu 1c88a7ef5d Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  XSRF protection and PHPdoc for mod/admin.php
  XSRF protection and PHPdoc for mod/admin.php

* master:
 2012-04-20 05:52:08 -04:00
Fabio Comuni 6af5a3a485 escape email template var names. fix bug n385. 2012-04-20 11:39:36 +02:00