|
|
1c47ec35b8
|
Merge pull request #2460 from annando/bugfix-attachments
Bugfix: Missing include added
|
2016-04-18 08:14:20 +02:00 |
|
Michael Vogel
|
d928928fda
|
Merge remote-tracking branch 'upstream/develop' into bugfix-attachments
|
2016-04-18 06:15:29 +02:00 |
|
Michael Vogel
|
26f62a97fd
|
Bugfix: Missing include added
|
2016-04-18 06:11:29 +02:00 |
|
|
|
a5f97b2d87
|
Merge pull request #2457 from annando/1604-attachments
Use the "attachment" element instead of a mixture of several elements
|
2016-04-18 05:53:47 +02:00 |
|
|
|
93a11cf839
|
Merge pull request #2458 from annando/1603-smilies
Bugfix: Messages work now again
|
2016-04-18 05:52:00 +02:00 |
|
Michael Vogel
|
81bcafe28f
|
Improved handling of photos
|
2016-04-17 23:38:29 +02:00 |
|
Michael Vogel
|
dde600c0f5
|
Merge pull request #2459 from rabuzarus/patch-1
rework autocompletion: Update mobile.css
|
2016-04-17 22:38:46 +02:00 |
|
rabuzarus
|
9190380dec
|
rework autocompletion: Update mobile.css
|
2016-04-17 22:27:49 +02:00 |
|
Michael Vogel
|
0f24f2d9ae
|
Bugfix: Messages work now again
|
2016-04-17 22:07:01 +02:00 |
|
Michael Vogel
|
502b660ca9
|
Added documentation
|
2016-04-17 20:55:19 +02:00 |
|
Michael Vogel
|
49d52faab5
|
Use the "attachment" element instead of a mixture of several elements
|
2016-04-17 20:43:41 +02:00 |
|
|
|
e44bec3c37
|
Merge pull request #2452 from annando/1604-clean-contact-url
Clean gcontact url before saving in gcontact table
|
2016-04-17 16:51:06 +02:00 |
|
|
|
2ac1a2f4ce
|
Merge pull request #2454 from annando/1604-more-elements
More elements for the autocompletion
|
2016-04-17 16:47:50 +02:00 |
|
|
|
1e18b6bbb9
|
Merge pull request #2456 from rabuzarus/1704_vier_cbox_img
vier: colorbox fix (img max-width: 100%)
|
2016-04-17 16:47:28 +02:00 |
|
|
|
6da01c1a3d
|
Merge pull request #2455 from annando/1604-completion
Speeding up the gcontact search
|
2016-04-17 16:46:50 +02:00 |
|
Michael Vogel
|
ae75a46529
|
the "nurl" index was accidentally dropped
|
2016-04-17 16:41:28 +02:00 |
|
rabuzarus
|
84238e1b89
|
vier: colorbox fix (img max-width: 100%)
|
2016-04-17 15:34:15 +02:00 |
|
Michael Vogel
|
d5bfbeab6e
|
Some rearrangements
|
2016-04-17 14:10:43 +02:00 |
|
Michael Vogel
|
017bfe17f8
|
Speeding up the gcontact search
|
2016-04-17 13:46:49 +02:00 |
|
Michael Vogel
|
2d4fd30cc3
|
Merge remote-tracking branch 'upstream/develop' into 1604-clean-contact-url
|
2016-04-17 11:55:51 +02:00 |
|
Michael Vogel
|
1af274877d
|
More elements for the autocompletion
|
2016-04-17 11:54:49 +02:00 |
|
Michael Vogel
|
146dc5c8cd
|
Added comment
|
2016-04-16 17:01:32 +02:00 |
|
|
|
9ad7af699b
|
Merge pull request #2451 from annando/1604-completion
Speed up the contact search, proxy the images, search for addresses
|
2016-04-16 16:58:09 +02:00 |
|
Michael Vogel
|
1dda70d144
|
Merge pull request #2453 from rabuzarus/1404_reworked_autocomplete
rework autocomplete: don't try to replace the id if contact doesn't have an id
|
2016-04-16 16:22:46 +02:00 |
|
rabuzarus
|
f83040f625
|
rework autocomplete: space after inserting contact without id
|
2016-04-16 15:58:11 +02:00 |
|
rabuzarus
|
bc4b5e1564
|
rework autocomplete: don't show the id if contact doesn't have an id
|
2016-04-16 15:37:34 +02:00 |
|
Michael Vogel
|
57cadf5b8f
|
Clean gcontact url before saving in gcontact table
|
2016-04-16 15:22:54 +02:00 |
|
Michael Vogel
|
f8c96d24b4
|
Speed up the contact search, proxy the images, search for addresses
|
2016-04-16 15:01:03 +02:00 |
|
|
|
bbd5878734
|
Merge pull request #2449 from rabuzarus/1404_reworked_autocomplete
new autocompletion
|
2016-04-16 08:16:21 +02:00 |
|
rabuzarus
|
b43f4722e6
|
rework autocomplete: fix .gitignore
|
2016-04-15 03:17:15 +02:00 |
|
rabuzarus
|
ed6ada0da5
|
rework autocomplete: use minified version + delete old fk.autocomplete.js
|
2016-04-15 02:25:58 +02:00 |
|
rabuzarus
|
bbab3f590a
|
rework autocomplete: update jquery.textcomplete to v1.3.3
|
2016-04-15 02:02:54 +02:00 |
|
rabuzarus
|
98b62b80f3
|
rework autocomplete: seperate bbcode completion
|
2016-04-14 23:59:29 +02:00 |
|
rabuzarus
|
ce1faf17d1
|
rework autocomplete: some polishing
|
2016-04-14 17:05:19 +02:00 |
|
rabuzarus
|
01b02dbcaa
|
Merge develop into 1404_reworked_autocomplete
Conflicts:
include/text.php
view/templates/head.tpl
view/theme/duepuntozero/style.css
view/theme/vier/style.css
|
2016-04-14 16:23:51 +02:00 |
|
|
|
0a3cd33cb0
|
Merge pull request #2447 from annando/1604-bugfix-default-group
Bugfix: "default_group" behaviour wasn't implemented correctly
|
2016-04-13 22:36:10 +02:00 |
|
Michael Vogel
|
d6a79abb68
|
Bugfix: "default_group" behaviour wasn't implemented correctly
|
2016-04-13 22:21:23 +02:00 |
|
|
|
6d0b4f92bc
|
Merge pull request #2446 from rabuzarus/1304_quatro_event_acl
quattro fix for #2385 - respect acl on event edit
|
2016-04-13 19:21:15 +02:00 |
|
rabuzarus
|
c73e93b19b
|
quattro fix for #2385 - respect acl on event edit
|
2016-04-13 17:43:46 +02:00 |
|
|
|
a7d6fa1bc9
|
Merge pull request #2444 from annando/1604-twidere-html
API: Just some more elements where Twidere has problems ...
|
2016-04-13 08:19:14 +02:00 |
|
|
|
7f7bd724d3
|
Merge pull request #2445 from annando/1604-vanished-mentions
Bugfix: Sometimes mentions vanished - now they shouldn't do this anymore
|
2016-04-13 08:18:39 +02:00 |
|
Michael Vogel
|
71caebdae0
|
Bugfix: Sometimes mentions vanished - now they shouldn't do this anymore
|
2016-04-13 07:00:36 +02:00 |
|
Michael Vogel
|
018b3ed25f
|
API: Just some more elements where Twidere has problems ...
|
2016-04-12 22:53:54 +02:00 |
|
|
|
df62bcab2e
|
Merge pull request #2443 from annando/1604-fbrowser
fbrowser: Take the picture as that mostly fits
|
2016-04-10 19:45:24 +02:00 |
|
Michael Vogel
|
90f5cb23f2
|
fbrowser: Take the picture as that mostly fits
|
2016-04-10 13:36:26 +02:00 |
|
|
|
f27cadae8d
|
Merge pull request #2442 from annando/1604-api
API: Improvement for Twidere/Conversation call improved
|
2016-04-10 06:37:33 +02:00 |
|
Michael Vogel
|
34dc23b871
|
API: Improvement for Twidere/Conversation call improved
|
2016-04-09 22:44:32 +02:00 |
|
fabrixxm
|
0370a2e6f3
|
Merge pull request #2440 from tobiasd/issue2241
Issue 2241: added language selector to the admin wizard
|
2016-04-08 10:41:36 +02:00 |
|
|
|
dfa5183774
|
Merge pull request #2441 from rabuzarus/0704_doxygen_forum
Update ForumManager.php
|
2016-04-07 21:06:32 +02:00 |
|
rabuzarus
|
d5bf386cf7
|
Update ForumManager.php - small correction
|
2016-04-07 16:58:26 +02:00 |
|
