|
e29c748b25
|
Merge pull request #2501 from annando/1604-insert
Avoid SQL errors because of existing entries
|
2016-05-04 07:19:58 +02:00 |
|
Michael Vogel
|
bed4799728
|
Some more beautification.
|
2016-05-03 21:57:08 +02:00 |
|
Michael Vogel
|
a7aaf7cc98
|
Shared links to Diaspora should look better now
|
2016-05-03 20:12:13 +02:00 |
|
Michael Vogel
|
26e1c4d458
|
Avoid SQL errors because of existing entries
|
2016-05-03 19:20:58 +02:00 |
|
|
3a819e3630
|
Merge pull request #2500 from fabrixxm/feature_mobile_notification_menu
style notification menu to be more mobile-friendly
|
2016-05-02 15:20:56 +02:00 |
|
Michael Vogel
|
1bf67c2048
|
Merge pull request #2499 from fabrixxm/issue_mobile_iframe_embed
small fix to embed iframes on mobile
|
2016-05-02 14:56:00 +02:00 |
|
Fabrixxm
|
343c7faba4
|
style notification menu to be more mobile-friendly
|
2016-05-02 14:55:57 +02:00 |
|
Fabrixxm
|
9a6cfcfd88
|
small fix to embed iframes on mobile
|
2016-05-02 14:17:55 +02:00 |
|
|
3d3cde2aed
|
Merge pull request #2497 from annando/1604-local-copy
Copy an item to the local user if it's only available as public copy
|
2016-05-02 06:07:50 +02:00 |
|
|
7418e5256e
|
Merge pull request #2495 from annando/1604-messagelist
Bugfix: The message list always showed "x and you"
|
2016-05-02 06:06:47 +02:00 |
|
|
d13460362d
|
Merge pull request #2498 from rabuzarus/0105_autocomplete_webbie
autocomplete: use webbie on click for nav global contact search
|
2016-05-01 15:48:23 +02:00 |
|
rabuzarus
|
03e1c3b775
|
autocomplete:remove commited file by accident
|
2016-05-01 11:27:43 +02:00 |
|
Michael Vogel
|
b677f63e85
|
Added some more explanation/now copy the whole thread
|
2016-05-01 09:48:05 +02:00 |
|
rabuzarus
|
367869ed81
|
autocomplete: use webbie on click for nav global contact search
|
2016-05-01 08:45:11 +02:00 |
|
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
|
8e0b3b28da
|
Bugfix: The message list always showed "x and you"
|
2016-04-30 14:13:43 +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 |
|
|
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 |
|
|
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 |
|
|
9a79b0c5f2
|
count from 0
|
2016-04-27 20:23:06 +02:00 |
|
|
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 |
|
|
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 |
|
|
d049ffa96c
|
Merge pull request #2483 from annando/1604-cookie
"remember me" should work now reliable
|
2016-04-26 06:45:20 +02:00 |
|
|
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 |
|
|
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 |
|