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
53f799f2bc
handle escaped file chars in display and search
2012-03-31 15:25:17 -07:00
friendica
8c4fbc3b4d
add the bang
2012-03-24 03:11:45 -07:00
friendica
db5ec58863
network filter is now a permission group
2012-03-24 01:33:50 -07:00
friendica
224dfa848b
bug #335 network search broken after new ssl policy settings
2012-03-16 05:51:04 -07:00
friendica
110e8f2919
basic ssl_policy for important modules
2012-03-14 21:20:20 -07:00
friendica
7e270b043c
addon settings form error
2012-03-13 23:52:13 -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
Tobias Hößl
9574f7df03
Merge branch 'master' of git://github.com/friendica/friendica
2012-03-12 19:06:45 +00:00
friendica
93058af4fc
backend for "save to file" feature
2012-03-11 20:19:56 -07:00
Tobias Hößl
4df08433c6
Merge branch 'master' of git://github.com/friendica/friendica
2012-03-11 11:27:47 +00:00
Michael Johnston
fd1f8fb436
allow user to set number of items to show on network page
2012-03-09 21:29:39 -05:00
Tobias Hößl
635958e11d
Merge branch 'master' of git://github.com/friendica/friendica
2012-03-09 10:00:12 +00:00
friendica
03b5e3aa0c
reworked fix from unary for bug #323 (due to incorrect use of array_key_exists())
2012-03-07 21:12:31 -08:00
friendica
8fb0ea4048
bugs #312 , #313
2012-03-06 14:27:53 -08:00
friendica
4dd4a22582
From Tobias H - catch some irregularities caused by cut/paste code
2012-02-28 14:52:23 -08:00
Tobias Hößl
5bb8ed4b8b
Mostly some checks in order to avoid Notices; 1 real bugfix in /mod/network.php
2012-02-28 21:56:42 +00:00
friendica
07ca8d6574
starred/bookmark searches only returning conversation head without comments
2012-02-14 23:29:24 -08:00
friendica
b0ee8dd409
begin cmin, cmax
2012-02-08 17:56:23 -08:00
friendica
c68235d10d
placeholder - spam tab on network page
2012-02-01 00:20:54 -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
cdd56dc5de
fix return url when deleting network posts with page params
2012-01-12 18:30:52 -08:00
friendica
dcc22ab5c5
improve direct login on network page
2012-01-11 13:38:03 -08:00
friendica
cfe8094b45
nets widget - allow all children of specified parent net regardless of network
2012-01-06 00:23:05 -08:00
friendica
c3ada095f4
network select widget
2012-01-05 20:40:48 -08:00
friendica
291a82c4a4
backend for per-network streams
2012-01-05 18:11:53 -08:00
friendica
0db637bf00
hopefully this will speed up the network updates a wee bit more
2012-01-02 19:33:26 -08:00
friendica
71377291ba
that didn't work - revert
2012-01-02 18:50:28 -08:00
friendica
f4b1d335a5
sql optimisation cont.
2012-01-02 18:40:38 -08:00
friendica
4c35a6b0d7
conversation sql optimisations
2012-01-02 16:54:37 -08:00
friendica
4b09566579
try again on the network page sql optimisation
2012-01-02 03:40:52 -08:00
friendica
a5144518aa
revert sql optimisation - js updates broken
2012-01-02 00:20:06 -08:00
friendica
fb3a0baa78
long running query on network page - optimise out the double sub-select
2012-01-01 23:07:53 -08:00
friendica
52137859eb
improved cid search
2011-12-22 16:05:03 -08:00
friendica
048fcae40b
bug #247
2011-12-21 01:45:15 -08:00
friendica
4007e7ec19
"new" view broken after liveupdate fixes
2011-12-14 03:51:50 -08:00
friendica
c45b903178
live update improvements
2011-12-12 16:11:03 -08:00
friendica
80428a33d5
refactor updates
2011-12-12 14:39:25 -08:00
friendica
341fcce75e
preg_quote search strings
2011-12-06 19:51:19 -08:00
friendica
0c24784f5e
include diaspora mentions in personal (requires adding a Diaspora profile url because they don't use ours)
2011-12-06 15:24:01 -08:00
friendica
513c1c0d68
dynamic delete icons for saved-search on network page
2011-12-01 18:27:45 -08:00
friendica
73564df4d8
fine tune personal regex's
2011-11-29 22:49:05 -08:00
friendica
84e197cde9
missing paren
2011-11-29 19:53:18 -08:00
friendica
7474c48022
add tag to personal
2011-11-29 19:52:14 -08:00
friendica
7b9ba3bb03
personal tab on network page
2011-11-29 14:35:20 -08:00
friendica
a1c277ed1a
remove old liveupdate marker
2011-11-24 18:46:07 -08:00
friendica
757ca5014c
move liveupdate after birthdays/events
2011-11-24 17:32:45 -08:00
Fabio Comuni
a86fd26bd8
more work on quattro. remove html from php for groups and saved searches widgets.
2011-11-21 12:34:22 +01:00
Friendika
4ea6f86b20
bug #166
2011-10-24 22:07:42 -07:00
Friendika
f48fd5aa16
more tagging
2011-10-24 04:17:46 -07:00
Friendika
19129e06c3
diaspora_reshare no content found, d* profile message work in progress, network page fix for cid search using post order
2011-10-19 15:08:16 -07:00
Friendika
0f24f3b505
post/comment order options
2011-10-17 18:24:23 -07:00
Friendika
2206d894b3
add contact_widgets and provide widgets on appropriate pages, fix the saved search widget
...
fix directory page on testbubble, don't use system theme for community, directory, and search if the viewer is logged in.
2011-10-11 19:27:58 -07:00
Fabio Comuni
f64e2d63b9
New common tab template. Update css
2011-10-10 15:28:34 +02:00
Friendika
4a5079f8fb
urlescape saved search terms
2011-10-04 05:19:25 -07:00
Devlon Duthie
0881c04cea
classes added to core + testbubble theme
...
some fixes to testbubble theme related to tab styling
2011-09-29 01:20:39 -05:00
Fabio Comuni
5792b3d358
Merge branch 'master' into newui
2011-09-26 11:42:48 +02:00
Devlon Duthie
3426ce5f94
Merge remote-tracking branch 'upstream/master'
2011-09-25 13:30:55 -05:00
Devlon Duthie
cb1c6dd1e3
really commiting files this time, still getting the hang of git.
...
some images added, some classes added to groupidebar, contacts sidebar
notification flags moved out of nav and into banner for testbubble the
testbubble css tweaks
2011-09-25 13:20:19 -05:00
Friendika
6a9e22550d
.
2011-09-24 05:45:34 -07:00
Friendika
7ea6b0a126
fix message ordering glitch on network page
2011-09-23 05:03:12 -07:00
Friendika
3a2bf8ab7c
w3c compliance fixes, owner attribution on likes defaulting to local owner, not item creator
2011-09-23 03:12:31 -07:00
Friendika
8bf6a29d4e
optimise the commented date view
2011-09-18 19:04:11 -07:00
Fabio Comuni
9d2afc2d3c
Merge remote-tracking branch 'friendika/master' into newui
2011-09-16 09:39:29 +02:00
Friendika
12fec75489
ability to re-order network page (no UI yet)
2011-09-13 18:40:15 -07:00
Friendika
21d35e52dd
provide option for viewing by parent created order
2011-09-13 05:13:01 -07:00
Friendika
4f24494b0b
Dreamhost's unreliable process model is really getting irritating
2011-09-12 19:42:10 -07:00
fabrixxm
d284f8017c
Merge remote-tracking branch 'friendika/master' into newui
2011-09-08 20:15:27 +02:00
Fabio Comuni
ad7c111c7c
deal with messages without comments or likes
2011-09-08 14:39:53 +02:00
Fabio Comuni
694e74d54d
Show conversations in network default view ordered by activity
2011-09-08 11:18:44 +02:00
Friendika
eeecb412aa
view bookmarks
2011-09-06 00:55:24 -07:00
Fabio Comuni
0283cbfcd3
Merge remote-tracking branch 'friendika/master' into newui
2011-09-05 09:09:34 +02:00
Friendika
82f7f33cf5
bookmarks + bug #140
2011-09-04 19:58:03 -07:00
Friendika
481853d2cc
saved searches on network page
2011-09-04 17:35:06 -07:00
Fabio Comuni
d0926240a8
Merge remote-tracking branch 'friendika/master' into newui
2011-08-30 11:00:23 +02:00
Friendika
ada8bee70e
remove public disclosure risk
2011-08-27 18:09:43 -07:00
fabrixxm
07b6c868b3
remove javascript to set selectect nav item. enanche img template prefetch ignoring
2011-08-17 18:36:24 +02:00
fabrixxm
bdf42473a0
Merge remote-tracking branch 'friendika/master' into newui
2011-08-17 17:35:37 +02:00
Friendika
b28b468b21
cleanup
2011-08-16 20:05:02 -07:00
Fabio Comuni
e6444adafd
change nav selected css class
2011-07-25 16:52:30 +02:00
Friendika
6b806708d9
typo
2011-07-21 20:21:41 -07:00
Friendika
77cea581b0
better fix for bug #107 , last one was flawed
2011-07-21 20:19:55 -07:00
Friendika
f4b4f61f66
provide fake first arg to ajax updater
2011-07-21 17:55:15 -07:00
Friendika
cd7098501e
change wording of "new item view" to be consistent
2011-07-03 20:18:20 -07:00
Friendika
5ceeb6752d
starred items
2011-07-03 19:41:04 -07:00
Friendika
b1aa77584f
indicate currently selected group in group picker
2011-07-01 06:14:15 -07:00
Friendika
38cf37d3c3
new item view, sort by received date - not posted date.
2011-06-23 17:56:59 -07:00
Friendika
341f853b04
search from network page
2011-05-26 17:47:33 -07:00
Fabio Comuni
e1107b55c6
add info() function. Works like notice() but show messages in a div with class info-message.
...
update code to use info() instead of notice() when appropriate (non-error message)
add info-message class style in themes
2011-05-23 11:39:57 +02:00
Friendika
22cf6b3fe6
'mark seen' not getting all msgs on profile page
2011-05-20 19:28:48 -07:00
Friendika
5f0b43485a
incorrect count of total pages in normal view mode
2011-05-04 20:49:11 -07:00
Friendika
69dc17eb81
when viewing network group, show my private conversations to the group
2011-04-30 21:53:51 -07:00
Friendika
a01c40a845
no insecure warning on FB connections
2011-04-26 05:45:53 -07:00
Friendika
e302741e49
merge status editor instances
2011-04-20 05:48:12 -07:00
Friendika
3787e1e500
provide disclosure warning on private network page
2011-04-19 21:09:25 -07:00
Friendika
d874a55178
per contact network page (link in photo menu)
2011-04-19 20:50:02 -07:00
Friendika
a0179235d2
provide a way to disable mailbox integration
2011-04-18 20:20:04 -07:00
Friendika
ab099e9102
email integration, cont.
2011-04-17 23:27:11 -07:00
Friendika
f04e2e7044
edit group links on network page
2011-04-12 18:22:58 -07:00
