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
Friendika
2825c49573
more work on new contact edit page - plus first port to testbubble
2011-11-09 03:46:36 -08:00
Friendika
02d4a742ab
more contact edit page stuff
2011-11-08 21:22:45 -08:00
Friendika
05cabf24a9
first checkin - updated contact_edit, more work remains
2011-11-08 18:30:20 -08:00
Fabio Comuni
00c342e13d
Merge branch 'oauthapi'
2011-11-07 17:41:23 +01:00
Fabio Comuni
10e5754e24
oauth: authorize
2011-11-07 17:36:41 +01:00
Friendika
2f3e39ba15
edit profile quick link
2011-10-26 16:57:25 -07:00
Fabio Comuni
951c73d825
style autocomplete popup in themes
2011-10-26 14:02:17 +02:00
Friendika
52038c6b88
event notification stuff
2011-10-25 15:36:49 -07:00
Friendika
3b6b0eaa8b
social tag - add UI
2011-10-24 15:47:17 -07:00
Fabio Comuni
de44072172
works on login form
2011-10-17 16:53:59 +02:00
Friendika
2911bf9434
sql issue item_store
2011-10-13 01:00:06 -07:00
Friendika
557a7d0cec
stuff
...
- background the external network notifications (Facebook, Twitter, Statusnet)
- add vimeo support
- consolidate editor video options (insert video, regardless of source)
- add "Connector Settings" page purely for configuring connectors
- moved mailbox settings to Connectors
- Move the "Connect/Follow" dialogue out of "find people" and move to top.
- Add "Find People" dialogue
- minor theme edits on duepuntozero and testbubble to make all this stuff work
- A bit of theming on duepunto notifications to eliminate the gigantic Diaspora profile photos.
2011-10-11 18:24:37 -07:00
Fabio Comuni
f64e2d63b9
New common tab template. Update css
2011-10-10 15:28:34 +02:00
Friendika
1cfeb61ddc
more notification cleanup duepuntozero
2011-10-09 21:34:07 -07:00
Friendika
26f2c868da
some notification text cleanup and notification page layout fixes for duepuntozero
2011-10-09 20:26:17 -07:00
Friendika
ecd714ae54
provide ability to repair contact photo
2011-10-05 20:01:42 -07:00
Friendika
b1e5dfad3c
clean up w3c validation and layout for priv mail and lang selector
2011-10-05 15:35:53 -07:00
Friendika
0ad9e7b5f4
option to not post photos to status stream
2011-10-01 06:20:41 -07:00
Friendika
ffa3b67365
fix nav-selected duepuntozero
2011-09-28 23:10:23 -07:00
Friendika
4343a73076
move connect button down a smidgin
2011-09-28 00:53:55 -07:00
Friendika
44d7c6aac3
connect button overlapping profile details
2011-09-27 22:03:07 -07:00
Friendika
2118dd3160
vcard elements float not cleared
2011-09-27 01:28:22 -07:00
Friendika
428e676641
fix minor placement issues on old themes from testbubble theme changes
2011-09-25 22:29:30 -07:00
Friendika
672ecc7f7d
more tag infrastructure
2011-09-18 22:42:47 -07:00
Friendika
eeecb412aa
view bookmarks
2011-09-06 00:55:24 -07:00
Friendika
7e8100d2cd
custom attags
2011-09-04 22:40:36 -07:00
Friendika
481853d2cc
saved searches on network page
2011-09-04 17:35:06 -07:00
Friendika
f6a43afb8d
set max height of acl names to avoid wrap
2011-09-04 06:18:26 -07:00
Friendika
e440353013
truncate overflow text on acl selector items (3 themes)
2011-09-04 05:41:11 -07:00
Friendika
99ea045723
some minor work on contact edit page
2011-08-25 18:12:42 -07:00
Friendika
83605cf3dc
theme settings for contact photo menu
2011-08-25 05:15:05 -07:00
Friendika
71fc694c67
contact photo menu
2011-08-24 23:20:04 -07:00
Friendika
74d61ed00b
contact menu beginnings
2011-08-24 22:40:26 -07:00
Friendika
1d659bd854
move public profile warning to top of page
2011-08-05 06:42:27 -07:00
Friendika
41c7d71e3b
make profile-jot-desc track lock state changes
2011-07-28 20:44:35 -07:00
Friendika
04675e3ec3
revup
2011-07-28 16:49:43 -07:00
Fabio Comuni
096ecba883
Use new ACL selector in photo edit
2011-07-20 14:19:20 +02:00
Fabio Comuni
19c93adf84
Use popup ACL selector in photo upload. js_upload use new acl selector.
2011-07-20 11:40:24 +02:00
Fabio Comuni
7a069c1438
Load tinyMCE on post editor only if needed.
2011-07-20 11:08:42 +02:00
Fabio Comuni
020deefba6
Merge remote-tracking branch 'friendika/master' into newacl
2011-07-20 10:01:12 +02:00
Fabio Comuni
1c9ed08620
show acl selector in a popup with fancybox
2011-07-20 10:00:33 +02:00
Friendika
1d35d1e5a1
Merge pull request #141 from fabrixxm/newacl
...
New jot ACL selector
2011-07-19 17:24:09 -07:00
Fabio Comuni
0a3ae96093
add icons to acl selector
2011-07-19 17:15:34 +02:00
Fabio Comuni
89eefbe46c
Fix style and scrollbar
2011-07-19 16:34:27 +02:00
Fabio Comuni
9fa0956966
New jot acl selector
2011-07-19 16:17:58 +02:00
Friendika
7008bec045
improved code blocks
2011-07-18 19:17:16 -07:00
Fabio Comuni
4fdc5ff30c
First test for friendika "live" update
2011-07-08 17:12:08 +02:00
Friendika
2d2b500639
input the admin email address during install/setup.
2011-07-07 19:12:35 -07:00
Fabio Comuni
bf19b219ef
duepuntozero: style blockquote
2011-07-07 14:27:39 +02:00
Fabio Comuni
4116beb276
duepuntozero: style "connect" link in profile page
2011-07-07 14:03:47 +02:00
