friendica
/
friendica
зеркало из https://github.com/friendica/friendica
6
0
Форкнуть 1
Код Задачи Пакеты Проекты Релизы 1 Вики Активность
11 917 коммитов 2 Ветки 63 Теги 237 MiB
Граф коммитов

11917 Коммитов

Автор SHA1 Сообщение Дата
Michael Vogel 5fc1eebdab Copy an item to the local user if it's only available as public copy 2016-05-01 00:19:24 +02:00
Michael Vogel 9288c57bea Merge pull request #2494 from rabuzarus/2904_autocomplete 
autocomplete: Use stopImmidiatePropagation() only if we are in a list to not interf…
 2016-04-29 15:55:45 +02:00
Michael Vogel 51a9cb8a2d Merge pull request #2493 from rabuzarus/2904_textcomplete_update 
jquery.textcomplete update to v1.3.4
 2016-04-29 15:55:07 +02:00
rabuzarus 47e395be88 Use stopImmidiatePropagation() only if we are in a list to not interfere with other keypress listeners 2016-04-29 14:42:12 +02:00
rabuzarus dd2a8fd852 jquery.textcomplete update to v1.3.4 2016-04-29 14:31:09 +02:00
Michael Vogel 6a739b5ba2 Merge pull request #2491 from rabuzarus/2804_acl_hook 
add a hook call to acl_lookup()
 2016-04-29 14:03:02 +02:00
rabuzarus a61361f351 add some hook docu 2016-04-28 23:18:38 +02:00
rabuzarus 3dad86f0e0 add a hook call to acl_lookup() 2016-04-28 22:15:55 +02:00
Tobias Diekershoff 853b13252a Merge pull request #2490 from annando/1604-bugfix-xml 
Bugfix for XML function
 2016-04-28 08:43:54 +02:00
Michael Vogel af22007481 Bugfix for XML function 2016-04-28 08:30:15 +02:00
Tobias Diekershoff 1644919880 Merge pull request #2489 from annando/1604-unseen 
Check before doing the database update
 2016-04-28 07:18:35 +02:00
Michael Vogel 5e4a2badb2 Check before doing the database update 2016-04-28 06:56:55 +02:00
Michael Vogel 87af398ee0 Merge pull request #2486 from rabuzarus/2704_xml 
move xml related function to the xml class + some doxygen docu
 2016-04-28 06:27:49 +02:00
Michael Vogel d3cf0bf994 Merge pull request #2488 from tobiasd/20160426-phpxmlcheck 
installer check for XML module
 2016-04-28 06:17:58 +02:00
Tobias Diekershoff 9a79b0c5f2 count from 0 2016-04-27 20:23:06 +02:00
Tobias Diekershoff a5f4f47c41 installer check for XML module 2016-04-27 20:16:35 +02:00
rabuzarus 9b3931e48a xml: rename convert_element_to_array to element_to_array 2016-04-27 17:04:46 +02:00
rabuzarus dbc39bea74 move xml related function to the xml class + some doxygen docu 2016-04-27 16:31:03 +02:00
Tobias Diekershoff 64595e9a2d Merge pull request #2481 from annando/1604-probe_url 
Use data from contact and gcontact prior to probe_url
 2016-04-26 06:47:12 +02:00
Tobias Diekershoff d049ffa96c Merge pull request #2483 from annando/1604-cookie 
"remember me" should work now reliable
 2016-04-26 06:45:20 +02:00
Tobias Diekershoff 9ec9ea3844 Merge pull request #2484 from rabuzarus/25.04_login_template 
login: use ARIA instead of <fieldset> tag
 2016-04-26 06:43:48 +02:00
rabuzarus 7e199c72ac login: use ARIA instead of <fieldset> tag 2016-04-25 23:40:07 +02:00
Michael Vogel ca72c5f256 Merge remote-tracking branch 'upstream/develop' into 1604-cookie 2016-04-25 22:25:13 +02:00
Michael Vogel e98a670f50 Merge pull request #2482 from rabuzarus/2604_vier_mobile_embedded_video 
vier-mobile: expand embedded video on play
 2016-04-25 22:24:08 +02:00
rabuzarus 9943d4a60a vier-mobile: expand embedded video on play 2016-04-25 22:12:53 +02:00
Michael Vogel 18aa43e6f6 Code redesign and comments 2016-04-25 22:10:45 +02:00
Michael Vogel 1f4f60a82d Merge pull request #2480 from rabuzarus/2504_vier_mobile_fix 
vier mobile fixes
 2016-04-25 21:41:43 +02:00
Michael Vogel cd92521c1d Remove test code 2016-04-25 21:39:54 +02:00
Michael Vogel 1aa6c1dc5b Use data from contact and gcontact prior to probe_url 2016-04-25 21:35:42 +02:00
Michael Vogel 2c75a0fefc Minor session stuff 2016-04-25 20:43:40 +02:00
rabuzarus 4daa9a50f5 vier-mobile: little css fix 2016-04-25 20:30:02 +02:00
rabuzarus fa66fa9b28 vier-mobile: fix embedded video for tablets and bigger 2016-04-25 20:24:36 +02:00
Tobias Diekershoff 714eb1a296 Merge pull request #2479 from annando/1604-vier-login 
Vier: No visible login border/no search and events without login
 2016-04-25 20:24:10 +02:00
rabuzarus 7b48ef23d5 vier-mobile: fix embedded video and embedded link images for tablets and bigger 2016-04-25 20:04:10 +02:00
rabuzarus c553ab9b46 vier-mobile: fix threaded view for tablets and bigger 2016-04-25 19:54:03 +02:00
Michael Vogel f0d5c97c08 Merge remote-tracking branch 'upstream/develop' into 1604-cookie 2016-04-25 16:44:06 +02:00
Michael Vogel 75fefeba95 Only hide the search if "local_search" was activated. 2016-04-25 16:42:16 +02:00
Tobias Diekershoff af37fa8293 Merge pull request #2478 from annando/1604-bookmarks 
Bugfix DFRN and bookmark detection
 2016-04-25 14:52:03 +02:00
Michael Vogel 8c2a4fe02a We now work with a hash to avoid cookie manipulation 2016-04-25 11:19:42 +02:00
Michael Vogel a214fc798a "Remember Me" should work now but needs more fine tuning 2016-04-25 07:10:40 +02:00
Michael Vogel b4369d51f5 Improved "remember me" functionality 2016-04-25 00:02:43 +02:00
Michael Vogel 0c5f315294 Vier: No visible login border/no search and events without login 2016-04-24 21:45:06 +02:00
Michael Vogel 93347d3279 Bugfix DFRN and bookmark detection 2016-04-24 17:00:19 +02:00
Tobias Diekershoff 1756ecaba3 Merge pull request #2476 from annando/1604-poller-maxlevel 
Value to define the maximum level of database connections for the worker
 2016-04-23 11:35:43 +02:00
Tobias Diekershoff c7bf440a2c Merge pull request #2477 from annando/1604-gcontact-update 
Check the global contacts every 90 days/Better handling in item creation
 2016-04-23 11:09:12 +02:00
Michael Vogel 5711e561fc Check the global contacts every 90 days/Better handling in item creation 2016-04-23 10:46:16 +02:00
Michael Vogel 76b24f61a9 New (experimental) value to define the maximum level of database connections for the worker 2016-04-23 10:11:09 +02:00
Tobias Diekershoff 76c04e6782 Merge pull request #2474 from annando/1604-hubzilla-quickfix 
Quickfix for Hubzilla systems with enabled OStatus addon
 2016-04-23 06:49:29 +02:00
Tobias Diekershoff aac046c91b Merge pull request #2475 from annando/1604-avoid-write-operations 
Avoid write operations if not needed
 2016-04-23 06:48:45 +02:00
Michael Vogel 68bff2707e Merge pull request #2473 from tobiasd/20160422-es 
ES translations thx TupambaeNet
 2016-04-23 00:21:48 +02:00