clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Commit Graph

  • e74ae8b031 diabook-themes: bugfix tommy tomson 2012-04-22 23:58:34 +02:00
  • d6c8a14fb0 diabook-themes: fixed youtube-bug and added "Info/Impressum" to footer tommy tomson 2012-04-22 22:31:44 +02:00
  • 76aa9b3037 api: add support for StatusNet-style media param to API Michael Johnston 2012-04-22 13:37:25 -04:00
  • 75c228fa13 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-04-22 12:27:59 -04:00
  • a3f08c44be API: RSS-Feeds are now shortened to 1000 characters. (With added link) Michael Vogel 2012-04-22 18:00:24 +02:00
  • 27c23229c4 Merge branch 'master' of git://github.com/friendica/friendica Tobias Hößl 2012-04-22 13:31:07 +00:00
  • 3116db1a74 Add a hook Tobias Hößl 2012-04-22 13:28:54 +00:00
  • 9434b447f3 DE strings update Tobias Diekershoff 2012-04-22 13:13:27 +02:00
  • c0a377e0de diabook-themes: comment-bbcode-bugfix tommy tomson 2012-04-22 12:59:00 +02:00
  • f1d84c1045 Merge branch 'master' of git://github.com/friendica/friendica Vasudev Kamath 2012-04-22 12:08:05 +05:30
  • 54817f058a Merge pull request #256 from simonlnu/master Simon 2012-04-21 22:23:13 -07:00
  • 203aa819e2 fix tinymce theming Simon L'nu 2012-04-22 01:22:29 -04:00
  • f99d9e4d7f Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-04-22 01:17:13 -04:00
  • d340b80094 Merge https://github.com/friendica/friendica into pull friendica 2012-04-21 19:29:08 -07:00
  • 371f3e450e rev update friendica 2012-04-21 19:28:45 -07:00
  • fe6567cb88 diabook-themes: deleted obsolete diabook-folder & minor bug-fixes tommy tomson 2012-04-22 03:15:06 +02:00
  • 71e2dbf352 Merge commit 'upstream/master' Michael Vogel 2012-04-21 19:26:24 +02:00
  • 2d129e7455 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-04-21 04:34:56 -04:00
  • bdbe068b95 rev update friendica 2012-04-21 01:18:46 -07:00
  • 4499ce96a0 Executable permission missing on script Vasudev Kamath 2012-04-21 12:00:19 +05:30
  • 7bae290aeb Merge pull request #255 from simonlnu/master Simon 2012-04-20 17:19:49 -07:00
  • 7a14f45904 fix checkbox/radio buttons for some browsers Simon L'nu 2012-04-20 20:18:47 -04:00
  • 172aff1c2b Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-04-20 20:16:06 -04:00
  • 8809e96310 diabook-themes: add diabook-dark tommy tomson 2012-04-21 01:06:17 +02:00
  • 8465ad6e1e Few more files with unnecessary executable permissions Vasudev Kamath 2012-04-21 00:22:48 +05:30
  • e052be606c diabook-themes: add diabook-green and some minor css/bug-fixes tommy tomson 2012-04-20 17:16:42 +02:00
  • 30bbbf32e5 rev update friendica 2012-04-20 06:31:38 -07:00
  • 9663299da1 Merge remote branch 'upstream/master' zottel 2012-04-20 13:42:33 +02:00
  • 0e25376e4a Merge pull request #254 from simonlnu/master Simon 2012-04-20 03:43:55 -07:00
  • 16c308791f Merge pull request #253 from fabrixxm/master fabrixxm 2012-04-20 03:42:50 -07:00
  • 5d2dd5798b fix the buttons. don't hide the buttons once shown Simon L'nu 2012-04-20 06:42:08 -04:00
  • eb9ddb884a optimise imgs; add some comment editing knobs Simon L'nu 2012-04-20 05:56:54 -04:00
  • 1c88a7ef5d Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-04-20 05:52:08 -04:00
  • 6af5a3a485 escape email template var names. fix bug n385. Fabio Comuni 2012-04-20 11:39:36 +02:00
  • 3bb785fdad Merge remote-tracking branch 'CatoTH/master' into req245 Fabio Comuni 2012-04-20 09:25:51 +02:00
  • 83683b516e Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-04-20 00:02:18 -04:00
  • c88dd1485f Merge pull request #252 from tomtom84/master tomtom84 2012-04-19 16:55:24 -07:00
  • f5f1956e8b diabook-themes: theme-settings: add "colour scheme"-option, add diabook-pink and some bug/css-fixes tommy tomson 2012-04-20 01:44:20 +02:00
  • ccdac0cd99 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-04-19 18:47:54 -04:00
  • 4a292e4137 Merge pull request #251 from simonlnu/master Simon 2012-04-19 10:41:25 -07:00
  • 6055d636ed Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-04-19 13:02:52 -04:00
  • 05173d0a8a fix .item-select Simon L'nu 2012-04-19 13:02:41 -04:00
  • 51967edfe8 Merge pull request #250 from simonlnu/master Simon 2012-04-19 09:55:36 -07:00
  • 4fd1a17f06 tweak drop-down and add in filebrowser Simon L'nu 2012-04-19 12:54:53 -04:00
  • caa6bc96f3 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-04-19 12:32:09 -04:00
  • 44f4b4b9d1 Merge pull request #248 from fabrixxm/tmcefilebrowser fabrixxm 2012-04-19 00:30:45 -07:00
  • 42e120586c Merge pull request #249 from mschmitt/master fabrixxm 2012-04-18 23:18:50 -07:00
  • 25f6753a1f Hadn't merged fixed typo from upstream. Martin Schmitt 2012-04-19 06:51:52 +02:00
  • 7e3c183601 EO translation fixes Martin Schmitt 2012-04-19 06:45:54 +02:00
  • 5916bc6539 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-04-18 23:48:41 -04:00
  • fddf21d983 filebrowser: fix style, show 10 recent photos if not in an album Fabio Comuni 2012-04-18 15:15:52 +02:00
  • 0630120455 filebrowser: more style, load min and max scale photos Fabio Comuni 2012-04-18 14:56:03 +02:00
  • 56efb42223 tinymce: add inlinepopups plugin Fabio Comuni 2012-04-18 14:55:21 +02:00
  • e2e6b56c44 tinymce: add filebrowser for photos and attached files Fabio Comuni 2012-04-18 13:23:42 +02:00
  • 91d1ef36d8 Merge pull request #247 from simonlnu/master Simon 2012-04-18 03:20:10 -07:00
  • a30ea16218 only affect immediate li children Simon L'nu 2012-04-18 06:17:20 -04:00
  • 4b9bcb39e0 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-04-18 06:11:54 -04:00
  • 311f39f12f fix silly abandonded typo. shouldn't affect translations Simon L'nu 2012-04-18 06:10:34 -04:00
  • b7bda7530f Merge pull request #246 from simonlnu/master Simon 2012-04-18 03:01:02 -07:00
  • af3e37ce20 fix alignment issues with toolbar Simon L'nu 2012-04-18 05:59:50 -04:00
  • b885fedee1 XSRF protection and PHPdoc for mod/admin.php Tobias Hößl 2012-04-18 07:36:48 +00:00
  • d7e750ad74 XSRF protection and PHPdoc for mod/admin.php Tobias Hößl 2012-04-18 07:24:47 +00:00
  • f087fd5581 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-04-18 00:24:33 -04:00
  • 1b6c84d8f4 diabook-themes: some css/bug-fixes tommy tomson 2012-04-18 02:36:30 +02:00
  • c53d4498b8 Merge pull request #244 from mschmitt/master friendica 2012-04-17 17:09:16 -07:00
  • 34144a3b4a Merge pull request #243 from CatoTH/master friendica 2012-04-17 17:09:04 -07:00
  • 2fbd5127ba messages.po/strings.php at 100% Esperanto Martin Schmitt 2012-04-17 22:50:44 +02:00
  • 74b237d46d Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-04-17 15:36:45 -04:00
  • e3af818263 Typo Tobias Hößl 2012-04-17 19:31:06 +00:00
  • 5b407b5ee7 diabook-themes: theme-settings: "wide"-option and new screenshots tommy tomson 2012-04-17 19:45:53 +02:00
  • 97c50a0924 Merge pull request #242 from simonlnu/master Simon 2012-04-17 10:22:39 -07:00
  • f4ff75cace [SECURITY] finish ripping out fpostit Simon L'nu 2012-04-17 13:21:30 -04:00
  • d92bab6693 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-04-17 13:17:13 -04:00
  • 04af5d9e2c Merge pull request #241 from simonlnu/master Simon 2012-04-17 10:16:56 -07:00
  • 1b2209fb3c rip out fpostit Simon L'nu 2012-04-17 13:15:11 -04:00
  • dbff4252d4 Merge branch 'master' of https://github.com/friendica/friendica Tobias Diekershoff 2012-04-17 18:07:20 +02:00
  • 757e3429ac update to the German string files Tobias Diekershoff 2012-04-17 18:06:28 +02:00
  • b30c761aae diabook-themes: removed fpostit due to security issues and small fix in german translation tommy tomson 2012-04-17 16:15:49 +02:00
  • 8269d6aa19 Merge pull request #240 from CatoTH/master friendica 2012-04-17 06:50:09 -07:00
  • e6330e3b96 naked br appearing when attaching and textplain friendica 2012-04-17 06:11:41 -07:00
  • 720c8324c7 Some Bugfixes, and variable checks Tobias Hößl 2012-04-17 11:33:50 +00:00
  • a742199035 Merge https://github.com/friendica/friendica into pull friendica 2012-04-16 22:59:09 -07:00
  • 7ebca2b37d rev update friendica 2012-04-16 22:58:52 -07:00
  • 621bf6bab4 Merge pull request #239 from simonlnu/master Simon 2012-04-16 21:29:05 -07:00
  • 68e1523496 finally fix the ui in the settings. it was fugly.... other bug fixes too Simon L'nu 2012-04-17 00:26:37 -04:00
  • 4e967fc79f Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-04-16 22:58:28 -04:00
  • f08844a8a5 diabook-themes: bugfix (sry, necessary) tommy tomson 2012-04-16 19:23:11 +02:00
  • 15dc8f4b21 diabook-themes: small bug/css-fixes ---> ver. 1.019 tommy tomson 2012-04-16 18:51:08 +02:00
  • b32a731517 diabook-themes: bug-fixes tommy tomson 2012-04-16 17:12:08 +02:00
  • 947b6073b1 diabook-themes: minor bugfixes tommy tomson 2012-04-16 16:05:29 +02:00
  • 041f74dc77 Merge remote branch 'upstream/master' zottel 2012-04-16 13:53:05 +02:00
  • fd2f7dd6ae turn on comment edit friendica 2012-04-16 03:51:48 -07:00
  • 0b838e4cc7 propagate edited comments friendica 2012-04-16 02:09:00 -07:00
  • c8598e7da6 edited comments weren't being relayed friendica 2012-04-16 01:35:27 -07:00
  • 37bb3c330d rev update friendica 2012-04-15 16:21:20 -07:00
  • 93df525f5c Merge pull request #238 from annando/master friendica 2012-04-15 16:00:07 -07:00
  • b5c164bf2f diabook-themes: css-fixes tommy tomson 2012-04-15 19:58:26 +02:00
  • a147d6113c Merge commit 'upstream/master' Michael Vogel 2012-04-15 16:49:54 +02:00
  • f994f9abc6 open contact edit in same window friendica 2012-04-15 06:34:01 -07:00
  • c4e8ef330e where did this "lang" string come from and why? friendica 2012-04-15 06:04:54 -07:00