Fabrixxm
|
c51e057fe6
|
Merge remote branch 'friendica/master' into moveme
|
2012-10-29 05:57:58 -04:00 |
|
friendica
|
88c8387c44
|
revive "mark everything seen" on main network page - see comments
|
2012-10-26 14:29:42 -07:00 |
|
|
friendica
|
2347a4326c
|
get rid of 'Friendika'
|
2012-10-18 21:51:45 -07:00 |
|
|
Fabrixxm
|
65d235017c
|
move account. first step.
export basic account data as json
import basic account data in db (dbs must be at same schema version)
|
2012-10-17 11:13:01 -04:00 |
|
|
friendica
|
3af16ff92a
|
Merge https://github.com/friendica/friendica into pull
|
2012-10-14 17:16:41 -07:00 |
|
|
friendica
|
dec5298248
|
rev update
|
2012-10-14 17:16:25 -07:00 |
|
Michael Johnston
|
939227e820
|
Moved comment box on photos to be after the last comment, added text for the Preview link
|
2012-10-14 14:41:31 -04:00 |
|
fermionic
|
ca21f1bbc8
|
Merge pull request #512 from fermionic/auto-redir-for-local-hub-contacts
for profile and photos, detect contacts from local hub and auto-redir
|
2012-10-11 17:24:11 -07:00 |
|
|
fermionic
|
2f3d118e77
|
Merge pull request #508 from fermionic/no-theme-control-of-live-update-location
allow themes to decide where live updates appear
|
2012-10-10 17:34:28 -07:00 |
|
|
friendica
|
816db4396a
|
better fix for threads with no parent showing up as unseen
|
2012-10-10 16:17:40 -07:00 |
|
|
friendica
|
8a1f9d32ab
|
Merge https://github.com/friendica/friendica into pull
|
2012-10-10 15:59:05 -07:00 |
|
|
friendica
|
675aa56b02
|
rev update - prevent messages with no parent from being counted as unseen, because they cannot ever be cleared
|
2012-10-10 15:57:40 -07:00 |
|
|
fermionic
|
14d8033e54
|
Merge pull request #510 from fermionic/lockview-plugin-support
allow changing the lockview content with a plugin
|
2012-10-10 07:04:08 -07:00 |
|
|
Zach Prezkuta
|
b9818185db
|
for profile and photos, detect contacts from local hub and auto-redir
|
2012-10-09 09:50:24 -06:00 |
|
|
Zach Prezkuta
|
86d6f380dc
|
add home_init hook to manage to call startpage plugin
|
2012-10-09 09:47:14 -06:00 |
|
|
Zach Prezkuta
|
96a245409b
|
allow changing the lockview content with a plugin
|
2012-10-09 09:45:54 -06:00 |
|
|
Zach Prezkuta
|
0ea89852d2
|
allow themes to decide where live updates appear
|
2012-10-09 09:41:33 -06:00 |
|
Domovoy
|
8e50b3f9ce
|
Use saved_searches_aside.tpl in search.php
|
2012-10-02 16:03:20 +02:00 |
|
|
fermionic
|
9daafe7489
|
Merge pull request #501 from fermionic/network-remember-filters
don't set a date as a group
|
2012-10-01 13:08:48 -07:00 |
|
|
Zach Prezkuta
|
c6061d598f
|
don't set a date as a group
|
2012-10-01 14:07:32 -06:00 |
|
|
fabrixxm
|
9d4fdee65d
|
Merge pull request #500 from fabrixxm/quattro-fontsoptions
Quattro fixes
|
2012-10-01 07:05:58 -07:00 |
|
|
Fabrixxm
|
864d022468
|
editpost: add short jot action text to edit post form
|
2012-10-01 10:00:25 -04:00 |
|
|
friendica
|
112fafcc81
|
consistent handling of scaled images when using imagick
|
2012-09-30 03:25:20 -07:00 |
|
|
friendica
|
e60c729b51
|
Merge pull request #495 from fermionic/email-optimization
send less messages to server; remove delete option
|
2012-09-30 01:58:07 -07:00 |
|
|
friendica
|
c9536ac056
|
Merge pull request #498 from fermionic/more-robust-tag-conversion
allow tagging of people by name or nickname
|
2012-09-30 01:55:23 -07:00 |
|
|
Zach Prezkuta
|
421c72d10f
|
remember combination of last tab selected, last group selected, and last network selected; update only items seen in selected filters
|
2012-09-29 17:56:50 -06:00 |
|
|
Zach Prezkuta
|
ce73cd560f
|
allow tagging of people by name or nickname
|
2012-09-29 17:55:40 -06:00 |
|
|
Zach Prezkuta
|
f4f3c8375f
|
send less messages to server; remove delete option
|
2012-09-29 17:50:34 -06:00 |
|
|
friendica
|
ebabd25717
|
order photo album list in blog (reverse date) order
|
2012-09-29 06:08:44 -07:00 |
|
|
friendica
|
c357fddea7
|
photo "conversation streams" need work - quite a bit of it
|
2012-09-29 06:04:01 -07:00 |
|
|
friendica
|
260b0f7fe8
|
rev update
|
2012-09-27 19:53:23 -07:00 |
|
|
friendica
|
41db3fb983
|
declare array separately, doesn't work well when defined in hook
|
2012-09-26 04:50:24 -07:00 |
|
|
friendica
|
d1d5eca258
|
network_ping hook for next generation "page"/"forums" plugin
|
2012-09-26 04:46:54 -07:00 |
|
|
friendica
|
b6b8f40fa9
|
Merge https://github.com/friendica/friendica into pull
|
2012-09-21 18:10:32 -07:00 |
|
|
friendica
|
c2af97ef61
|
rev update
|
2012-09-21 18:04:09 -07:00 |
|
|
Zach Prezkuta
|
da7c5b19b1
|
allow hidden comments phrase to be accessed separately as number and text
|
2012-09-19 21:31:26 -06:00 |
|
|
friendica
|
490c98b7db
|
fix events
|
2012-09-19 00:44:37 -07:00 |
|
|
friendica
|
0b59d30e34
|
more infrastructure for ignored events
|
2012-09-18 22:49:05 -07:00 |
|
|
friendica
|
fa14723ef5
|
Merge https://github.com/friendica/friendica into pull
|
2012-09-18 17:44:38 -07:00 |
|
|
friendica
|
5cad3e114a
|
give themes more control over events/birthdays and provide them as notifications
|
2012-09-18 17:43:09 -07:00 |
|
|
friendica
|
6ebd56012a
|
Merge pull request #479 from fermionic/album-image-inserted-too-large
dont insert images larger than scale level 2
|
2012-09-18 15:46:41 -07:00 |
|
|
Zach Prezkuta
|
cd25573038
|
select based on dimensions instead of scale level
|
2012-09-17 21:46:36 -06:00 |
|
|
Fabrixxm
|
6aa45fb9cc
|
admin: Don't allow to block or delete site admin in users admin page. fix bug 471
|
2012-09-17 08:48:43 -04:00 |
|
|
Zach Prezkuta
|
364f56e8bd
|
dont insert images larger than scale level 2
|
2012-09-16 19:07:12 -06:00 |
|
|
friendica
|
ee5ed6b963
|
Merge https://github.com/friendica/friendica into pull
|
2012-09-15 15:24:28 -07:00 |
|
|
friendica
|
669d2b890e
|
rev update - add cancel markup to editor
|
2012-09-15 15:23:15 -07:00 |
|
|
Zach Prezkuta
|
8a4dcc28c1
|
make size search less greedy
|
2012-09-14 18:33:07 -06:00 |
|
|
Zach Prezkuta
|
f445ed47df
|
fix permissions for uploaded images with size specified
|
2012-09-14 18:22:56 -06:00 |
|
|
friendica
|
39b296a87d
|
ostatus disabled typo
|
2012-09-14 06:04:25 -07:00 |
|
|
friendica
|
20938d07cd
|
typo on previous checkin - set max number of images for an inserted link, default 2.
|
2012-09-13 23:01:10 -07:00 |
|