aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/friendica/redjeroenpraat2014-06-053-0/+43
|\
| * poke notificationsfriendica2014-06-041-0/+28
| |
| * duplicate birthday events showing upfriendica2014-06-041-0/+7
| |
| * add zrl stuff - still a lot of new stuff missing but I'm not going to do it all.friendica2014-06-041-0/+8
| |
* | Merge branch 'master' of https://github.com/friendica/redjeroenpraat2014-06-044-5/+27
|\|
| * suggest appfriendica2014-06-031-1/+3
| |
| * don't add a birthday event if the birthday channel doesn't have permission ↵friendica2014-06-032-1/+6
| | | | | | | | to send you posts.
| * don't provide a second (actually third counting the navbar) search box on ↵friendica2014-06-031-1/+1
| | | | | | | | the search page if you've got saved searches turned on. This should solve some problems with duplicate html id's (and save wasn't working anyway). If you don't have saved search ability (which will provide a saved search widget in the sidebar), provide a simple search box in the main content region but without save ability.
| * Merge https://github.com/friendica/red into pending_mergefriendica2014-06-032-5/+5
| |\
| * | make system generated birthday events un-commentable since comments won't go ↵friendica2014-06-031-2/+17
| | | | | | | | | | | | where you think.
* | | expand/collapse is also used for comments, so removing 'post'.jeroenpraat2014-06-031-2/+2
| |/ |/|
* | Updated strings for show entire post and show less to expand and collapse. ↵jeroenpraat2014-06-032-5/+5
|/ | | | See last few comments from me and Mario at https://redmatrix.nl/channel/jeroenpraat/?f=&mid=5138fdee2ade50a7ef7a5a59e01a7dc91012c125e712d1ce483be6e31543dffe@redmatrix.nl
* Updated to [+] show more, [+] show more comments, etc. See ↵jeroenpraat2014-06-032-5/+5
| | | | https://redmatrix.nl/channel/jeroenpraat/?f=&mid=5138fdee2ade50a7ef7a5a59e01a7dc91012c125e712d1ce483be6e31543dffe@redmatrix.nl
* bring back birthdaysfriendica2014-06-024-6/+67
|
* don't show app editing options to non-authenticated folksfriendica2014-06-011-0/+1
|
* add a few days of slop to the orphan finder to account for any lags in dir ↵friendica2014-06-011-1/+1
| | | | syncing.
* regression: (-1) update_flag still exists in one function. This should be ↵friendica2014-06-011-1/+1
| | | | UPDATE_FLAGS_FORCED or 2.
* issue #477friendica2014-06-011-2/+2
|
* use consistent capitalisation in the item actions menufriendica2014-05-292-7/+7
|
* testing new event codefriendica2014-05-292-7/+13
|
* newevent: front end functionsfriendica2014-05-291-1/+5
|
* more work on new event codefriendica2014-05-291-58/+46
|
* event_addtocal function for storing received eventsfriendica2014-05-291-6/+52
|
* start to tie in the new event logicfriendica2014-05-291-1/+1
|
* split event storage into two bits - separate the event storage from the ↵friendica2014-05-291-65/+77
| | | | associated item storage
* Merge branch 'master' into neweventfriendica2014-05-2918-68/+754
|\ | | | | | | | | Conflicts: include/zot.php
| * this is an important bit - only mark dead hubs on directory servers. They ↵friendica2014-05-291-0/+4
| | | | | | | | shouldn't matter anywhere else.
| * cleanup dead directory entries. This was a real b#tch, so keep your eye out ↵friendica2014-05-283-19/+86
| | | | | | | | for issues - which you shouldn't see until next weekend when this is scheduled to run. We're only setting flags, so if anything goes wrong we should be able to recover without too much pain.
| * moods: simplify 'xyz is tired' rather than 'xyz is currently tired'. This is ↵friendica2014-05-281-1/+1
| | | | | | | | possible now that we have translation contexts, as before '$1 is $2' was ambiguous without a context - in this case 'mood'.
| * logging: include target url when reporting z_fetch_url and z_post_url errors.friendica2014-05-271-4/+4
| |
| * give the cloud file list a bit of paddingfriendica2014-05-272-23/+25
| |
| * filter randprof results to avoid channels that are known to be deceased.friendica2014-05-251-1/+1
| |
| * Language selection: case-insensitive and system languageAlexandre Hannud Abdo2014-05-231-2/+1
| | | | | | | | | | | | | | Fixed ignoring HTTP_ACCEPT_LANGUAGE tags that had uppercase characters. Fixed defining a->language too soon to ever get the system lang
| * fix search to use in appfriendica2014-05-222-3/+4
| |
| * more appsfriendica2014-05-221-0/+2
| |
| * implement 'requires' on personal appsfriendica2014-05-221-6/+43
| |
| * sort by app name and not by apd filenamefriendica2014-05-221-1/+4
| |
| * Add the admin appfriendica2014-05-211-0/+5
| |
| * more app workfriendica2014-05-212-7/+20
| |
| * change app dropdown to point to apps module (changes nav template). ↵friendica2014-05-212-4/+5
| | | | | | | | Important: Plugins using the app-menu hook will no longer be accessible from there and may require re-writing to plug into the system apps page. Also filter apps in items from the language detector to avoid false triggers from the base64 content.
| * Make tag delivery work when channel name differs from profile nameAlexandre Hannud Abdo2014-05-211-5/+5
| |
| * Merge pull request #464 from solstag/masterRedMatrix2014-05-212-9/+11
| |\ | | | | | | Bunch of translation work
| | * Allow translation context with plural. Use that in Likes/Dislikes.Alexandre Hannud Abdo2014-05-212-7/+8
| | |
| | * Make translation contexts effective.Alexandre Hannud Abdo2014-05-211-2/+3
| | |
| * | make it possible to edit/delete apps via /apps/personal/editfriendica2014-05-211-0/+3
| |/
| * add zids to all the personal app linksfriendica2014-05-201-0/+5
| |
| * more app workfriendica2014-05-201-8/+29
| |
| * add optional context to translationsfriendica2014-05-201-2/+4
| |
| * most of the remaining apps basic infrastructure except a form to create the ↵friendica2014-05-202-7/+53
| | | | | | | | things. Don't let this fool you - there is still a lot of work, but there isn't a whole lot of work to create a demo; in fact you can demo it now.
| * more app backend workfriendica2014-05-191-4/+41
| |