Commit Graph

  • fd0bd8433a Merge pull request #33 from friendica/bbcode friendica 2012-02-12 19:57:49 -08:00
  • 9697e82331 Merge branch 'master' into bbcode Abinoam P. Marques Jr 2012-02-12 18:56:53 -08:00
  • 135005571f Added [th] bbcode tag support. Abinoam P. Marques Jr 2012-02-12 17:27:08 -08:00
  • 3e85c1d330 make 'x minutes ago' fully translateable with argument ordering. string update. friendica 2012-02-12 17:15:09 -08:00
  • e575a3a02c Fixed bbcode [li] and [*] handling. Abinoam P. Marques Jr 2012-02-12 17:10:06 -08:00
  • 10e66d293d Added [quote=Name] bbcode support. Abinoam P. Marques Jr 2012-02-12 16:18:58 -08:00
  • 3a07973ffa Added [center] bbcode support. Abinoam P. Marques Jr 2012-02-12 15:51:17 -08:00
  • 74b529bda2 BBCode [size=50] --> font-size: 50px (with the unit px). Abinoam P. Marques Jr 2012-02-12 14:59:07 -08:00
  • 92a585ed23 Added support to [noparse], [nobb] and [pre] as bbcode escape tags. Abinoam P. Marques Jr 2012-02-12 14:35:29 -08:00
  • 330a876d81 bug #281 friendica 2012-02-12 14:18:32 -08:00
  • 6a17a3a8e2 Added support for [ol] standard ordered list bbcode. Abinoam P. Marques Jr 2012-02-12 12:00:23 -08:00
  • 5479142efc Added support for [ul] standard unordered list bbcode. Abinoam P. Marques Jr 2012-02-12 06:21:01 -08:00
  • 5107ee52d3 Regexp fix for [LIST=i], [list=i], [LIST=I] and [LIST=i] bbcodes Abinoam P. Marques Jr 2012-02-12 06:13:49 -08:00
  • 34ac72cffd Merge pull request #32 from copyninja/master tobiasd 2012-02-12 01:42:43 -08:00
  • 495d0fb80f Merge branch 'master' of git://github.com/friendica/friendica Vasudev Kamath 2012-02-12 15:06:41 +05:30
  • cbf53beec1 ;) :D and :-O are also enabled for wink laugh and surprised smiley's Vasudev Kamath 2012-02-12 15:06:12 +05:30
  • 8b101c6cb8 do not display contact_block if config for num shown is 0 friendica 2012-02-11 23:49:05 -08:00
  • 4cfb1fe0cf refresh contact record after setting change friendica 2012-02-11 23:17:55 -08:00
  • bb19c8ba4e kissing smilie may need escaping (thanks - Abinoam) friendica 2012-02-11 21:46:48 -08:00
  • d856ae1fa5 bug #279, add network selector widget to contacts page friendica 2012-02-11 21:39:51 -08:00
  • 0c4606682f fix link/bookmark reshares friendica 2012-02-11 19:21:41 -08:00
  • da946bb9b0 bug #278 show only blocked contacts friendica 2012-02-11 03:07:15 -08:00
  • 1d5f1723e0 Merge branch 'pull' friendica 2012-02-11 01:25:21 -08:00
  • 75a62db9c5 show tags (pub_keywords) in advanced profile friendica 2012-02-11 01:24:29 -08:00
  • 857f21eb32 fpostit by Devlon Duthied added to utils Tobias Diekershoff 2012-02-11 10:03:14 +01:00
  • 2984b8d5d2 bug #270 - solved Abinoam P. Marques Jr 2012-02-10 14:03:43 -08:00
  • d79c3351ea db installation sync friendica 2012-02-10 13:43:35 -08:00
  • ed38808aae hidden jot in "display" to allow reshare Fabio Comuni 2012-02-10 17:30:22 +01:00
  • 8480550144 quattro: add "view in context" link in search results Fabio Comuni 2012-02-10 17:29:37 +01:00
  • b346f4464c send notify emails to community pages as well as people friendica 2012-02-10 00:08:23 -08:00
  • 2f2e331c33 bug #274 friendica 2012-02-09 22:44:59 -08:00
  • ffe7d8b1e9 item tag notifications friendica 2012-02-09 21:18:50 -08:00
  • 5859f9dcf6 add render_location hook to both sets of conversations friendica 2012-02-09 18:09:28 -08:00
  • e242a391b9 Merge branch 'pull' friendica 2012-02-09 16:03:30 -08:00
  • 7b0a005441 edit post not working after plaintext editor fixes, missing some recent editor template changes friendica 2012-02-09 15:58:26 -08:00
  • 795e02aa14 bug #273 - no $baseurl variable expansion in install template friendica 2012-02-09 15:13:34 -08:00
  • 14ba3998ac Merge pull request #30 from Keith2/master Keith Fernie 2012-02-09 15:08:53 -08:00
  • ec26f88be9 render_location hook friendica 2012-02-09 15:02:59 -08:00
  • 171249966e add tag notifications to enotify friendica 2012-02-09 14:06:17 -08:00
  • 2c9cfb1fe9 modified: library/slinky.php Set up tabs in code correctly. Keith Fernie 2012-02-09 21:44:52 +00:00
  • 955022e7dc modified: library/slinky.php Added a custom YourLS shortener to the available shorteners Keith Fernie 2012-02-09 20:45:38 +00:00
  • f73b6ed7a1 Merge branch 'pull' friendica 2012-02-08 23:31:35 -08:00
  • 1c8680d9f9 Install note about PHP path. Abinoam P. Marques Jr 2012-02-08 22:01:42 -08:00
  • 11517a027b if removing a contact after viewing the third page of contacts, go back to page 3 friendica 2012-02-08 21:15:26 -08:00
  • 03435853b3 fix apps sub-menu on quattro and vier friendica 2012-02-08 18:12:26 -08:00
  • 1f3b608af2 Merge branch 'pull' friendica 2012-02-08 17:56:55 -08:00
  • b0ee8dd409 begin cmin, cmax friendica 2012-02-08 17:56:23 -08:00
  • d8157f73ef quattro: added delete button to mail list overview Tobias Diekershoff 2012-02-08 22:29:38 +01:00
  • ca8a25172e quattro: added delete buttons to groups and contacts Tobias Diekershoff 2012-02-08 22:13:36 +01:00
  • 72c30deb64 quattro: group member selection styling Tobias Diekershoff 2012-02-08 20:47:52 +01:00
  • 9436a9d84b Merge branch 'master' of https://github.com/friendica/friendica Tobias Diekershoff 2012-02-08 19:11:11 +01:00
  • 1eb32a0bb5 added theme "vier" by Michael Vogel Tobias Diekershoff 2012-02-08 19:09:25 +01:00
  • bb22464165 browser being sent to update_community friendica 2012-02-08 03:40:49 -08:00
  • e92e3658b2 make individual advanced profile items addressable via script or plugin friendica 2012-02-07 20:34:40 -08:00
  • c506bb42a9 :coffee extended smilie friendica 2012-02-07 17:03:09 -08:00
  • 8a3c1f7930 beer smilie friendica 2012-02-07 15:41:06 -08:00
  • a869bd2fe5 don't link tags enclosed inside Diaspora links friendica 2012-02-07 02:16:28 -08:00
  • c6cdad946e more fixes for textmode friendica 2012-02-07 00:13:16 -08:00
  • 2b77002471 basic support for plaintext editor configuration (disable tinymce), currently only zero themes - and not all the post tools currently work (as some of them emit html). friendica 2012-02-06 20:28:50 -08:00
  • 76308eca67 add toggle to choose sending "friends with" activity even if contact is not hidden friendica 2012-02-06 16:41:05 -08:00
  • 3d099bd99a beer friendica 2012-02-06 01:08:00 -08:00
  • 57f7083706 style missing on crepair-name friendica 2012-02-05 17:38:32 -08:00
  • 03956cef33 Merge branch 'master' into spam friendica 2012-02-05 16:11:39 -08:00
  • b12e598dba roll update 1118 forward, enable update 1119 friendica 2012-02-05 14:30:24 -08:00
  • a8163a6eaf Merge branch 'master' into spam friendica 2012-02-04 22:26:51 -08:00
  • 4cf6bd5469 do an optimise after an expunge friendica 2012-02-02 18:02:08 -08:00
  • f57fa90228 more work on Friendica db driver for b8 friendica 2012-02-01 20:37:05 -08:00
  • 94e396e6c4 Merge branch 'master' into spam friendica 2012-02-01 19:23:45 -08:00
  • 64d0616762 add uid variable to b8 classes friendica 2012-02-01 19:23:05 -08:00
  • 840f69e2c8 add spam flag to item table, DB version not incremented yet, give large sites a heads up to do it manually friendica 2012-02-01 18:50:11 -08:00
  • 9fc36d3da4 improvements in d* markdown conversion friendica 2012-02-01 17:09:53 -08:00
  • c68235d10d placeholder - spam tab on network page friendica 2012-02-01 00:20:54 -08:00
  • c0c0f2dc15 add closeness attribute friendica 2012-01-31 23:54:53 -08:00
  • 86c0eac27d transport for email contacts phase II friendica 2012-01-31 20:03:46 -08:00
  • c8c062d960 add spam engine friendica 2012-01-31 15:54:41 -08:00
  • 4fc455d195 revup friendica 2012-01-31 15:50:49 -08:00
  • 4993f4f1d6 allow plugin to abort message posting, fix half-duplex D* relationship friendica 2012-01-30 20:49:54 -08:00
  • 95878a3e84 Merge branch 'pull' friendica 2012-01-30 15:14:41 -08:00
  • c76b224d8a prune old expired and deleted items friendica 2012-01-30 15:13:24 -08:00
  • de645516ba Merge pull request #29 from zzottel/master zzottel 2012-01-30 13:38:55 -08:00
  • 3149e3cd3e testbubble fix: tools for wall-to-wall items now appear at the bottom where they should be zottel 2012-01-30 13:33:25 -08:00
  • d658cdaa84 quattro: small adjustments to the profile edit style Tobias Diekershoff 2012-01-30 14:25:24 +01:00
  • 43df068d2e quattro: styling of the edit profile page Tobias Diekershoff 2012-01-30 13:22:16 +01:00
  • 61246cbd1c some zot-id infrastructure friendica 2012-01-29 15:47:25 -08:00
  • e43a3a412c store moderated flag if set friendica 2012-01-29 02:09:39 -08:00
  • 955d2b6d83 Merge branch 'pull' friendica 2012-01-28 13:24:53 -08:00
  • d54042dd38 mime_content_type requires access to the file, not just the name friendica 2012-01-28 12:09:17 -08:00
  • a5974d1981 moving the pager down below the contact/photo list in quattro Tobias Diekershoff 2012-01-28 13:13:21 +01:00
  • 5161be67e9 logging of manage identities friendica 2012-01-27 12:56:36 -08:00
  • 039eec360a typo was also in database.sql friendica 2012-01-27 03:14:16 -08:00
  • 1bec801523 typo in update - critical friendica 2012-01-26 23:56:47 -08:00
  • 94b9e9ce6d for people whose DB's are not updating friendica 2012-01-26 23:08:51 -08:00
  • 3197a6e8aa fix some changes lost from another branch friendica 2012-01-26 23:03:27 -08:00
  • 8fe5168259 restore diaspora test mode friendica 2012-01-26 20:46:42 -08:00
  • f1f480c2bf slackr -> wall-to-wall comment form background different than regular comment friendica 2012-01-26 20:32:05 -08:00
  • 068cb53a9e page delegation friendica 2012-01-26 20:08:02 -08:00
  • 167ab537b5 backend for delegating forums friendica 2012-01-26 16:52:12 -08:00
  • 10f768630b D* event formatting friendica 2012-01-25 15:16:43 -08:00
  • d2a9341128 new event current date off by one, submit button misplaced friendica 2012-01-25 13:42:06 -08:00
  • a24a383dab by default allow pseudonyms friendica 2012-01-25 00:30:36 -08:00