Stefan Parviainen
f2e648308c
Return results from acl.php in standard form
2015-01-07 20:45:00 +01:00
Stefan Parviainen
c9b15bbab5
Allow passing autocomplete type to contact_autocomplete
2015-01-07 20:38:56 +01:00
Stefan Parviainen
9f8ce331f3
Disable browser-based autocomplete when using the textcomplete based one
2015-01-07 20:29:38 +01:00
Stefan Parviainen
f157122c35
Make searchbox use textcomplete
2015-01-07 20:25:29 +01:00
Stefan Parviainen
e025fd9de2
Make mail use textcomplete
2015-01-07 20:15:33 +01:00
Stefan Parviainen
0cf016b0b0
Make mod_poke use textcomplete
2015-01-07 20:03:05 +01:00
Stefan Parviainen
34ecbcceea
Make nav search use textcomplete
2015-01-07 19:39:50 +01:00
Stefan Parviainen
4e3aadc38a
Rename some stuff related to autocomplete
2015-01-07 18:57:16 +01:00
Stefan Parviainen
e3d064ff22
Allow textcomplete to work on inputs (PR also filed upstream)
2015-01-07 18:42:57 +01:00
marijus
a373b9f1d4
also style the collapse link
2015-01-07 13:04:50 +01:00
friendica
3ef487418d
don't allow admin to delete the sys channel from the channel manage page
2015-01-06 20:12:34 -08:00
friendica
a1e5a661fa
Merge branch 'master' into trinidad
2015-01-06 15:45:00 -08:00
friendica
fbe0610ce9
don't update locally deleted items
2015-01-06 15:44:23 -08:00
friendica
f8151a33e2
Merge branch 'master' into trinidad
2015-01-06 15:31:39 -08:00
friendica
bb67ab1fbf
this brings us up to date
2015-01-06 15:30:54 -08:00
friendica
400a2cd912
Merge branch 'master' into trinidad
2015-01-06 14:51:13 -08:00
friendica
4b9ed48a54
don't let dns_get_record() "write to screen" if it errors.
2015-01-06 14:50:29 -08:00
friendica
aaceb71e86
Merge branch 'master' into trinidad
2015-01-06 13:45:55 -08:00
RedMatrix
2417125c89
Merge pull request #826 from pafcu/cache_autocomplete
...
Cache autocomplete results locally (the one in the editor)
2015-01-07 08:45:47 +11:00
friendica
c9839d38a5
Merge branch 'master' into trinidad
2015-01-06 13:43:19 -08:00
friendica
1cfff44535
lines reversed in handle_tag()
2015-01-06 13:42:55 -08:00
Stefan Parviainen
3e41b8137c
Cache autocomplete results locally (the one in the editor)
2015-01-06 21:01:30 +01:00
friendica
c05586fbe7
begin the grand unification for 3.0. Start by splitting DAV into a web accessible component and a DAV accessible component so that we can eliminate the http-auth prompts for web-accessed resources.
2015-01-06 11:55:42 -08:00
friendica
7ee5567421
Merge branch 'master' into trinidad
2015-01-06 11:40:31 -08:00
RedMatrix
8c5e5c3449
Merge pull request #825 from einervonvielen/dev_beginning_fix
...
Corrected errors in chapter 'Contribute your changes via github'
2015-01-07 06:40:20 +11:00
friendica
911d7105a0
Merge branch 'pafcu-mainjsoptimize'
2015-01-06 11:38:21 -08:00
friendica
11ec8d865c
Merge branch 'mainjsoptimize' of git://github.com/pafcu/red into pafcu-mainjsoptimize
...
Conflicts:
view/js/main.js
2015-01-06 11:37:48 -08:00
friendica
e20d82ab0b
Merge branch 'master' into trinidad
2015-01-06 11:26:54 -08:00
friendica
b8d3936e47
Merge https://github.com/friendica/red into pending_merge
2015-01-06 11:26:53 -08:00
friendica
01e65ffbb4
revup
2015-01-06 11:26:35 -08:00
marijus
1064be3a76
add some style to divgrowmore
2015-01-06 20:06:41 +01:00
Einer von Vielen
88d26f1f87
Corrected errors in chapter 'Contribute your changes via github'
...
- changed commit statement
- changed push statement (it pointed to the orign)
2015-01-06 19:07:59 +01:00
mrjive
94dd994abc
Merge pull request #823 from einervonvielen/dev_beginning
...
Step-by-step manual to debug the red matrix (php) and to contribute code
2015-01-06 17:44:58 +01:00
Einer von Vielen
2f0d196f28
spelling
2015-01-06 17:32:57 +01:00
Einer von Vielen
ba428533bb
added modification of branch
2015-01-06 17:27:52 +01:00
Einer von Vielen
a5766534fe
Mainly it shows how to debug the red matrix (php) in a virtual machine and contribute changes via git.
...
It will guide to the following steps:
- Install a Virtual Machine
- Install Apache Web Server
- Install PHP, MySQL, phpMyAdmin
- Fork the project on github to be able contribute
- Install the RED Matrix
- Debug the server via eclipse
- Contribute your changes via github
2015-01-06 16:22:30 +01:00
Einer von Vielen
b12393ea12
Mainly it shows how to debug the red matrix (php) in a virtual machine and contribute changes via git.
...
It will guide to the following steps:
- Install a Virtual Machine
- Install Apache Web Server
- Install PHP, MySQL, phpMyAdmin
- Fork the project on github to be able contribute
- Install the RED Matrix
- Debug the server via eclipse
- Contribute your changes via github
2015-01-06 16:14:04 +01:00
pafcu
5c8aca9a61
Merge pull request #822 from pafcu/master
...
Add title to bb_observer tags to further clarify a bit what's going on
2015-01-06 17:06:44 +02:00
Stefan Parviainen
29e0bfee2f
Fix bug in readmore.js
2015-01-06 15:54:58 +01:00
mrjive
b80c218606
Merge pull request #1 from friendica/master
...
test pull request
2015-01-06 15:13:03 +01:00
Stefan Parviainen
fac6963444
Add title to bb_observer tags to further clarify a bit what's going on
2015-01-06 14:00:31 +01:00
Stefan Parviainen
c3433bdf95
Don't update fuzzy time for items in a collapsed thread to increase performance.
2015-01-06 12:01:50 +01:00
Stefan Parviainen
ae821efbf1
Update jquery.timeago.js to add support for dispose action
2015-01-06 11:43:59 +01:00
friendica
859b672e37
Merge branch 'master' into trinidad
2015-01-05 21:00:32 -08:00
friendica
43f43d78cf
regression: need float clear on manage page so footer doesn't end up floated,
...
add default value to features so that features can be created that are default enabled, or modified later to default enabled without requiring a system config to accomplish this.
2015-01-05 20:57:30 -08:00
friendica
39459c2d65
undo these bits of trinidad - we're going to do things differently
2015-01-05 18:22:15 -08:00
friendica
2dca165f9b
Merge branch 'master' into trinidad
2015-01-05 16:14:56 -08:00
friendica
3185bfe3ca
detect https coming through reverse proxy or load balancer using x-forwarded-proto instead of (actually in addition to testing) $_SERVER['HTTPS'] and/or $_SERVER['SERVER_PORT'] to indicate ssl is enabled
2015-01-05 16:12:55 -08:00
friendica
8a3ef177ce
Merge branch 'master' into trinidad
2015-01-05 14:41:08 -08:00
friendica
3df3ab5630
Merge https://github.com/friendica/red into pending_merge
2015-01-05 14:41:04 -08:00
