clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
6,711 Commits 3 Branches 0 Tags 194 MiB
Commit Graph

6711 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zottel e6847cdd3f Merge remote branch 'upstream/master' 2012-04-23 08:57:49 +02:00
Simon L'nu 29d7f260d7 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  bug #388 - notify_comment received after post deleted
  don't allow non-existent themes as choices
  diabook-themes: bugfix
  diabook-themes: fixed youtube-bug and added "Info/Impressum" to footer
  api: add support for StatusNet-style media param to API
  Add a hook

* master:
 2012-04-22 22:22:52 -04: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
Simon L'nu 75c228fa13 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  DE strings update
  diabook-themes: comment-bbcode-bugfix

* master:
 2012-04-22 12:27:59 -04:00
Michael Vogel a3f08c44be API: RSS-Feeds are now shortened to 1000 characters. (With added link) 2012-04-22 18:00:24 +02: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
Vasudev Kamath f1d84c1045 Merge branch 'master' of git://github.com/friendica/friendica 2012-04-22 12:08:05 +05:30
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
Michael Vogel 71e2dbf352 Merge commit 'upstream/master' 2012-04-21 19:26:24 +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
Vasudev Kamath 4499ce96a0 Executable permission missing on script 2012-04-21 12:00:19 +05:30
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
Vasudev Kamath 8465ad6e1e Few more files with unnecessary executable permissions 2012-04-21 00:22:48 +05:30
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
zottel 9663299da1 Merge remote branch 'upstream/master' 2012-04-20 13:42:33 +02: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
Fabio Comuni 3bb785fdad Merge remote-tracking branch 'CatoTH/master' into req245 2012-04-20 09:25:51 +02:00
Simon L'nu 83683b516e Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  diabook-themes: theme-settings: add "colour scheme"-option, add diabook-pink and some bug/css-fixes

* master:
 2012-04-20 00:02:18 -04:00
tomtom84 c88dd1485f Merge pull request #252 from tomtom84/master 
diabook-themes: theme-settings: add "colour scheme"-option, add diabook-pink and some bug/css-fixes
 2012-04-19 16:55:24 -07:00
tommy tomson f5f1956e8b diabook-themes: theme-settings: add "colour scheme"-option, add diabook-pink and some bug/css-fixes 2012-04-20 01:44:21 +02:00
Simon L'nu ccdac0cd99 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:

* master:
 2012-04-19 18:47:54 -04:00
Simon 4a292e4137 Merge pull request #251 from simonlnu/master 
fix .item-select
 2012-04-19 10:41:25 -07:00
Simon L'nu 6055d636ed Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:

* master:
 2012-04-19 13:02:52 -04:00
Simon L'nu 05173d0a8a fix .item-select 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-04-19 13:02:41 -04:00
Simon 51967edfe8 Merge pull request #250 from simonlnu/master 
tweak drop-down and add in filebrowser
 2012-04-19 09:55:36 -07:00