harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • 1763a6c9c2 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-03-13 14:41:46 -04:00
  • 43430ef561 Merge branch 'master' of git://github.com/friendica/friendica Tobias Hößl 2012-03-13 18:34:15 +00:00
  • 5a41676465 initial tag display for categories and save-to-file - suitable for testing but needs cleanup, links to delete term, and theming. friendica 2012-03-13 04:04:26 -07:00
  • 5bae7159cc Merge branch 'master' of https://github.com/friendica/friendica Tobias Diekershoff 2012-03-13 06:50:14 +01:00
  • 203fa94e17 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-03-13 00:25:20 -04:00
  • bf7425c591 click anywhere to close notifications -> zeros and bubbles friendica 2012-03-12 20:21:32 -07:00
  • e12706e825 Merge branch 'pull' friendica 2012-03-12 19:12:39 -07:00
  • acf75e85c8 revup friendica 2012-03-12 19:12:00 -07:00
  • 691f5b11f7 Merge pull request #128 from tomtom84/master tomtom84 2012-03-12 16:40:10 -07:00
  • 8358b9247f fix css tommy tomson 2012-03-13 00:38:38 +01:00
  • ecc9f4ba70 Merge pull request #127 from tomtom84/master tomtom84 2012-03-12 16:06:15 -07:00
  • 27bc8052d0 use fancybox instead of lightbox tommy tomson 2012-03-13 00:04:19 +01:00
  • 8a85914e1d Merge pull request #126 from tomtom84/master tomtom84 2012-03-12 15:33:29 -07:00
  • caffb217c1 fixes tommy tomson 2012-03-12 23:31:54 +01:00
  • 5a1e2c32fe Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-03-12 17:12:01 -04:00
  • 59766b944c Some security against XSRF-attacks Tobias Hößl 2012-03-12 20:17:37 +00:00
  • a1305433b8 Merge pull request #125 from tomtom84/master tomtom84 2012-03-12 13:11:19 -07:00
  • 9436175746 add lightbox, fixex in css tommy tomson 2012-03-12 21:09:16 +01:00
  • 9574f7df03 Merge branch 'master' of git://github.com/friendica/friendica Tobias Hößl 2012-03-12 19:06:45 +00:00
  • c30342e2f7 add 'loggin_out' hook Fabio Comuni 2012-03-12 15:58:59 +01:00
  • bce3bfff38 get tags test improved Alexander Kampmann 2012-03-12 13:59:00 +01:00
  • 38cb4a362f Merge branch 'pull' friendica 2012-03-12 00:57:06 -07:00
  • 3bc990f718 more save to file backend friendica 2012-03-11 21:32:11 -07:00
  • 30f5c3a9eb Merge branch 'master' of https://github.com/friendica/friendica Tobias Diekershoff 2012-03-12 05:02:45 +01:00
  • 93058af4fc backend for "save to file" feature friendica 2012-03-11 20:19:56 -07:00
  • 9f52e3df8d fix dispy-dark photo album stuff Simon L'nu 2012-03-11 21:34:51 -04:00
  • 8629d90818 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-03-11 21:33:06 -04:00
  • 18ef942f62 Merge pull request #124 from simonlnu/master Simon 2012-03-11 17:37:29 -07:00
  • e9b82bb5ee fix dispys' css and layout Simon L'nu 2012-03-11 20:36:16 -04:00
  • de70b2f30f Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-03-11 20:33:10 -04:00
  • 1401f763ec Merge branch 'pull' friendica 2012-03-11 17:09:07 -07:00
  • 6e7a190e91 Mail: Subject are now with working "Re:" Michael Vogel 2012-03-12 00:22:12 +01:00
  • d9bee73edf community meta tag renamed from "ika" friendica 2012-03-11 15:50:23 -07:00
  • 2ed6b3531e Removing test exports Michael Vogel 2012-03-11 23:29:59 +01:00
  • 905ba5ba1d Missing field in database.sql Michael Vogel 2012-03-11 22:39:40 +01:00
  • 6e5f837609 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-03-11 17:05:08 -04:00
  • 7235d5466a Removed changes Michael Vogel 2012-03-11 20:24:55 +01:00
  • d653e27e2d Merge commit 'upstream/master' Michael Vogel 2012-03-11 20:22:28 +01:00
  • ebdf484218 Added config options for the item cache and the ostatus priority Michael Vogel 2012-03-11 19:50:51 +01:00
  • 9ca5de8c28 Item cache now is one day. Michael Vogel 2012-03-11 19:45:28 +01:00
  • 739309abd0 Corrected some git problems Michael Vogel 2012-03-11 19:41:29 +01:00
  • 9f76d96d46 Cache: item cache now has an autodelete of old files. The pages plugin now sets a link via redirection. So posting works. Michael Vogel 2012-03-11 19:11:25 +01:00
  • b879a1ddf1 Pages: Show every community page - even from foreign servers (with caching) Michael Vogel 2012-03-11 17:45:12 +01:00
  • d9cb46f0de Merge branch 'master' of git://github.com/friendica/friendica Tobias Hößl 2012-03-11 14:43:16 +00:00
  • 1dad15a021 Merge pull request #123 from simonlnu/master Simon 2012-03-11 07:29:45 -07:00
  • 258a8c0871 screwed up on the font-size for screen last push Simon L'nu 2012-03-11 10:29:12 -04:00
  • 467aa66d37 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-03-11 10:25:39 -04:00
  • ac2a81a273 Merge pull request #122 from simonlnu/master Simon 2012-03-11 07:25:27 -07:00
  • fa0cb8514d add some '@media handheld' types for dispys Simon L'nu 2012-03-11 10:24:49 -04:00
  • 48306e1fae Merge pull request #121 from simonlnu/master Simon 2012-03-11 07:15:35 -07:00
  • 62fe48f064 fix more stuff Simon L'nu 2012-03-11 10:14:31 -04:00
  • eb3b211461 New plugin that shows community pages in the sidebar Michael Vogel 2012-03-11 14:22:19 +01:00
  • 076393c9e7 Merge pull request #120 from simonlnu/master Simon 2012-03-11 06:13:10 -07:00
  • 57d8370376 fix some stuff right away Simon L'nu 2012-03-11 09:12:31 -04:00
  • 4df08433c6 Merge branch 'master' of git://github.com/friendica/friendica Tobias Hößl 2012-03-11 11:27:47 +00:00
  • 6cbd765e1f Revert "OpenID: display error msg if ID URL used to register an account does not exist" Tobias Diekershoff 2012-03-11 12:03:47 +01:00
  • 3c16850383 OpenID: display error msg if ID URL used to register an account does not exist Tobias Diekershoff 2012-03-11 12:00:32 +01:00
  • 50863a19eb Merge pull request #119 from simonlnu/master Simon 2012-03-10 22:33:40 -08:00
  • f7ade749b8 preliminary dispy-dark theme. WIP! did i say "WIP!"? yes, i did. WIP! Simon L'nu 2012-03-11 01:32:11 -05:00
  • dfdf0f1335 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-03-11 01:24:59 -05:00
  • 5915325367 bug #328 friendica 2012-03-10 18:52:50 -08:00
  • d9c5d9d2eb default the text template var on conversations friendica 2012-03-10 15:53:36 -08:00
  • 1bddd48661 bug #327 - composed private message is lost if no recip specified. friendica 2012-03-10 15:50:51 -08:00
  • 4f606ff633 Merge branch 'pull' friendica 2012-03-10 14:45:23 -08:00
  • 20d1a16dbb revup friendica 2012-03-10 14:44:43 -08:00
  • 670b571c8a Caching improved. Michael Vogel 2012-03-10 18:19:00 +01:00
  • 74b3e9f273 Enabled Caching for items. Changed color of tags in diabook. Michael Vogel 2012-03-10 15:50:35 +01:00
  • c79cb57e1e Merge pull request #118 from tomtom84/master tomtom84 2012-03-10 04:24:49 -08:00
  • 0f3255467e fixed login-fields, fixed. notofication.png, changed locations tommy tomson 2012-03-10 13:22:41 +01:00
  • e098147c24 New config options if ostatus polling should use the priority in the contacts Michael Vogel 2012-03-10 11:29:40 +01:00
  • 1e37477fdc German translation Tobias Diekershoff 2012-03-10 10:36:20 +01:00
  • 15916a2cb7 Mail: Removing signatures, gpg, unnecessary line breaks Michael Vogel 2012-03-10 09:52:20 +01:00
  • 665ad7e660 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-03-10 00:15:29 -05:00
  • d50a839c04 Merge branch 'pull' friendica 2012-03-09 19:50:45 -08:00
  • 0e3b9097f6 spec directory friendica 2012-03-09 19:50:31 -08:00
  • a374bbcf81 Merge pull request #117 from unary/issue299 friendica 2012-03-09 19:42:52 -08:00
  • fd1f8fb436 allow user to set number of items to show on network page Michael Johnston 2012-03-09 21:29:39 -05:00
  • 686fe47b88 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-03-09 19:02:29 -05:00
  • cb1ecf2c5a diabook: Moving the location between the icons Michael Vogel 2012-03-10 00:15:27 +01:00
  • a02ffbcc86 Merge branch 'pull' friendica 2012-03-09 14:44:29 -08:00
  • 92a93642e1 revup friendica 2012-03-09 14:43:48 -08:00
  • 68ca29719e Merge pull request #116 from tomtom84/master tomtom84 2012-03-09 09:17:01 -08:00
  • 8fe4645a5d add js to hide nav-menus, when clicked outside tommy tomson 2012-03-09 18:15:27 +01:00
  • 68541b5dd2 Merge pull request #115 from tomtom84/master tomtom84 2012-03-09 04:24:59 -08:00
  • 9f441731af fixes in css tommy tomson 2012-03-09 13:23:38 +01:00
  • f8042d0445 splitted test cases. Alexander Kampmann 2012-03-09 12:57:11 +01:00
  • 21589c5ece changed a test string Alexander Kampmann 2012-03-09 12:18:37 +01:00
  • af34cf019c Merge branch 'master' of git://github.com/friendica/friendica Alexander Kampmann 2012-03-09 12:17:19 +01:00
  • f84c191f8d added some tests Alexander Kampmann 2012-03-09 12:16:58 +01:00
  • 42d622d6bf recover contacts total count which got lost friendica 2012-03-09 02:50:57 -08:00
  • 11c29e0cba Merge commit 'upstream/master' Michael Vogel 2012-03-09 11:41:23 +01:00
  • 635958e11d Merge branch 'master' of git://github.com/friendica/friendica Tobias Hößl 2012-03-09 10:00:12 +00:00
  • 2ce78253ae Merge branch 'pull' friendica 2012-03-09 00:48:16 -08:00
  • 3878b58f0d bug #324 - tinymce used for mail even if editplain being used. friendica 2012-03-09 00:47:10 -08:00
  • 312c175045 bug in check for private email comment to public conversation prevents authenticated visitor from seeing comments that should be allowed friendica 2012-03-09 00:31:17 -08:00
  • d050762e4d Merge pull request #114 from simonlnu/master Simon 2012-03-08 21:28:35 -08:00
  • 81f5b0e2df [theme:dispy] optimised the pngs: bet. 0 and 30% savings in size. style label elemnts. Simon L'nu 2012-03-09 00:26:54 -05:00
  • 2050f886cc keep tony from talking to himself friendica 2012-03-08 21:14:41 -08:00
  • 0188e2b3ee Merge pull request #113 from simonlnu/master Simon 2012-03-08 21:03:16 -08:00
  • dc8d060d4d i consider dispy pretty stable at this point, so i'm removing the experimental file Simon L'nu 2012-03-09 00:00:56 -05:00