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 |
|
rabuzarus
|
9dafe525c8
|
use modal for wall message
|
2016-04-17 01:13:56 +02:00 |
|
|
rabuzarus
|
d9e2562f4b
|
replace some item_photo_menu links so we can call js functions
|
2016-04-17 00:55:43 +02:00 |
|
|
rabuzarus
|
c3225a1631
|
some more css changes for autocomplete acpopup
|
2016-04-16 23:24:19 +02:00 |
|
|
rabuzarus
|
30317e3af0
|
some changes to use friendicas new autocomplete function
|
2016-04-16 23:07:29 +02:00 |
|
|
Michael Vogel
|
146dc5c8cd
|
Added comment
|
2016-04-16 17:01:32 +02:00 |
|
Tobias Diekershoff
|
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 |
|
|
Tobias Diekershoff
|
bbd5878734
|
Merge pull request #2449 from rabuzarus/1404_reworked_autocomplete
new autocompletion
|
2016-04-16 08:16:21 +02:00 |
|
|
rabuzarus
|
f9c9019d90
|
move js from theme.php to theme.js
|
2016-04-16 01:00:23 +02:00 |
|
|
rabuzarus
|
e8558011c3
|
add logo in svg
|
2016-04-16 00:54:46 +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 |
|
|
rabuzarus
|
eb1e882d7c
|
open friendica photos from the stream with colorbox
|
2016-04-14 14:07:20 +02:00 |
|
rabuzarus
|
deaaeec047
|
wall thread: add wall-item-body div for post content
|
2016-04-14 03:42:36 +02:00 |
|
|
rabuzarus
|
8485b68625
|
jRange: little css fix
|
2016-04-14 03:15:05 +02:00 |
|
|
rabuzarus
|
b3014eaab2
|
jRange: slider color and width 100%
|
2016-04-14 03:14:12 +02:00 |
|
|
rabuzarus
|
37101bc321
|
improve transparency for some elements in style.css
|
2016-04-14 02:28:57 +02:00 |
|
|
rabuzarus
|
502aaabe8c
|
rework js for shared shared content
After showmore PR is accepted it should also work well with the showmore addon.
This resolves #4
|
2016-04-14 02:01:40 +02:00 |
|
|
Tobias Diekershoff
|
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 |
|
|
Tobias Diekershoff
|
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 |
|
|
Tobias Diekershoff
|
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 |
|
|
Tobias Diekershoff
|
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 |
|
|
rabuzarus
|
b3f5b3c899
|
fix: new width for the slider in theme settings
|
2016-04-11 13:36:07 +02:00 |
|
|
Tobias Diekershoff
|
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 |
|
|
Tobias Diekershoff
|
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 |
|
|
Tobias Diekershoff
|
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 |
|
|
rabuzarus
|
a3c79d2007
|
Update ForumManager.php
fix some doxygen description
|
2016-04-07 14:43:56 +02:00 |
|
|
Tobias Diekershoff
|
ac9d392264
|
make en the default language
|
2016-04-06 20:21:41 +02:00 |
|
|
Tobias Diekershoff
|
a28372c032
|
intendation...
|
2016-04-06 20:18:33 +02:00 |
|
|
Tobias Diekershoff
|
5df20fda11
|
Issue 2241: added language selector to the admin wizard
|
2016-04-06 20:13:34 +02:00 |
|
|
fabrixxm
|
295489e9a5
|
Merge pull request #2434 from tobiasd/20160403-lng
lang info in HTML header
|
2016-04-06 09:04:13 +02:00 |
|
|
Tobias Diekershoff
|
9d2864fc58
|
Merge pull request #2437 from annando/1604-session
"remember me" in session does work now
|
2016-04-06 08:08:21 +02:00 |
|