1
1
Fork 0
Commit graph

233 commits

Author SHA1 Message Date
Alexander Kampmann
355c42cb30 Merge branch 'master' of https://github.com/friendica/friendica
Conflicts:
	include/config.php
	update.php
2012-04-05 13:39:15 +02:00
friendica
c4ca21a762 move alert box away from nav links 2012-04-04 19:13:41 -07:00
Michael Johnston
581b54c974 allow users to set categories on their posts 2012-04-01 21:28:31 -04:00
friendica
bc283f7c5d qcomment overflow 2012-04-01 03:37:41 -07:00
friendica
5c2fdc795f send unverified private mail using zrl 2012-04-01 00:59:35 -07:00
friendica
e935b3a225 theme file_as combobox for 2.0 2012-03-29 04:07:16 -07:00
friendica
b18086097e title not updated when editing post 2012-03-28 03:18:26 -07:00
friendica
5275b5d049 qcomment enhancements 2012-03-26 20:13:03 -07:00
friendica
ba28362242 position the theme-preview on settings page 2012-03-25 21:12:10 -07:00
friendica
5a12383b78 undo git stuffup 2012-03-15 19:55:58 -07:00
Simon L'nu
5b757e4e0e commit latest to dispy-dark. fixes in html css and js
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-15 15:07:17 -04:00
friendica
4972d7ef6e more work on filer, comment level and file tag removal 2012-03-13 20:46:37 -07:00
friendica
be48fff157 file as widget and basic filing implementation for duepuntozero,slackr
much more work needed - this is just for test/evaluation currently
2012-03-13 18:13:03 -07:00
friendica
7b3349f38a some testbubble stuff 2012-03-05 15:58:26 -08:00
friendica
00edc89c47 notify positioning, theming 2012-02-25 05:00:48 -08:00
friendica
4839c235da theme seen,unseen notifications 2012-02-25 03:28:07 -08:00
friendica
6092567c97 notifications to zeros, bug in notify link 2012-02-24 23:44:55 -08:00
friendica
03171fd7de preliminary qcomment support, [nosmile] tag to disable smiley processing 2012-02-14 23:13:18 -08:00
friendica
d75b6a00d4 tabs and total count for contacts page 2012-02-13 20:38:00 -08:00
friendica
0c4606682f fix link/bookmark reshares 2012-02-11 19:21:41 -08:00
friendica
57f7083706 style missing on crepair-name 2012-02-05 17:38:32 -08:00
friendica
a76a497d92 implement "moderate" flag on items 2012-01-23 20:56:11 -08:00
friendica
8aa2552372 add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit) 2012-01-18 16:21:30 -08:00
friendica
28edeefc14 reset width of openid input, settings page 2012-01-12 20:35:05 -08:00
friendica
520ba0960b put openid logo back on openid input box, duepuntozero settings page 2012-01-12 20:31:14 -08:00
friendica
375cb82124 move post preview link 2012-01-09 21:02:02 -08:00
friendica
7011f71e8f post preview 2012-01-09 20:03:00 -08:00
friendica
9f6d38a61a something weird with git 2012-01-08 04:30:35 -08:00
friendica
a6d0a65321 more recovery of lost contact page formatting 2012-01-08 04:16:23 -08:00
friendica
dd7a10a219 contact page float got lost somewhere 2012-01-08 04:13:53 -08:00
friendica
41bb47ca1b title fixups 2012-01-06 03:59:05 -08:00
Fabio Comuni
f70f2eedaf duepuntozero: get back jot icons 2012-01-06 10:03:20 +01:00
Fabio Comuni
a5a6719283 fix photo album pager 2012-01-06 09:35:29 +01:00
Fabio Comuni
f9b0af6f2f Merge remote-tracking branch 'friendica/master' 2012-01-06 09:11:48 +01:00
Fabio Comuni
efe308b5ac Use html5 placeholder for title text input 2012-01-06 09:11:25 +01:00
friendica
c3ada095f4 network select widget 2012-01-05 20:40:48 -08:00
friendica
dbb5955469 bit more improvement on dynamic title 2012-01-04 20:35:32 -08:00
friendica
47edaf9ad7 dynamic title input box - via fabrixxm 2012-01-04 18:03:09 -08:00
friendica
5d6a098ce0 add connect link to suggestion and matches 2011-12-18 01:44:46 -08:00
friendica
47f369e052 hide some contacts from others 2011-12-05 18:36:26 -08:00
friendica
7faa6c3e93 more theme works 2011-12-01 22:44:27 -08:00
friendica
d703f4bc52 theme works d'zero 2011-12-01 20:57:09 -08:00
friendica
ac3df5fece dynamic group edit buttons 2011-12-01 16:33:53 -08:00
friendica
6b93324c11 "show more" -> move closer to text 2011-11-24 18:51:14 -08:00
friendica
53590d2166 rework show/hide comments 2011-11-22 16:00:05 -08:00
Fabio Comuni
8e588b530f duepuntozero: fix input width in aside 2011-11-15 15:59:53 +01:00
Fabio Comuni
e853549bc8 duepuntozero: add notice and info popups css style 2011-11-11 17:34:15 +01:00
Friendika
02f21fb74c some testbubble fixes 2011-11-10 19:53:13 -08:00
Friendika
15f2ce5459 contact edit updates 2011-11-09 19:30:14 -08:00
Friendika
a2018e2d14 vcard position - dpzero 2011-11-09 18:29:05 -08:00