Thomas Willingham
|
96e423dcfc
|
Merge pull request #297 from tazmandevil/master
link hover colour remains user set link_colour (w/o change default,Mike)
|
2014-02-02 08:33:26 -08:00 |
|
Thomas Willingham
|
5846dc105a
|
Move CSS out of chat template
|
2014-02-02 16:28:58 +00:00 |
|
Tazman DeVille
|
16e818def7
|
link hover colour remains user set link_colour (w/o change default,
Mike)
|
2014-02-02 14:01:12 +01:00 |
|
Christian Vogeley
|
a2fa1a162d
|
Other not so elegant way of detecting touch screen devices
But at least it seems to work
|
2014-02-02 13:59:20 +01:00 |
|
friendica
|
e83419b53e
|
add links to change chat status and leave room
|
2014-02-02 03:43:52 -08:00 |
|
friendica
|
17436f060f
|
fix default link color
|
2014-02-01 21:12:26 -08:00 |
|
friendica
|
34850289ff
|
Merge https://github.com/friendica/red into zpull
|
2014-02-01 21:03:46 -08:00 |
|
friendica
|
61cc4de225
|
provide donation options on siteinfo page
|
2014-02-01 21:03:21 -08:00 |
|
friendica
|
a9ceeff988
|
Merge pull request #296 from tazmandevil/master
link color
|
2014-02-01 20:47:19 -08:00 |
|
friendica
|
8e8b49d18c
|
Merge pull request #294 from git-marijus/master
comment out since it is not clear if this is not implemented yet or obsolete
|
2014-02-01 20:46:52 -08:00 |
|
Tazman DeVille
|
de412abe88
|
user configured link colour
|
2014-02-02 05:19:29 +01:00 |
|
Tazman DeVille
|
bd83783391
|
link colours
|
2014-02-02 04:32:43 +01:00 |
|
Tazman DeVille
|
a2761213e0
|
link colour options
|
2014-02-02 04:26:56 +01:00 |
|
Christian Vogeley
|
30aeb42bed
|
Press return to post chat posts- SHIFT-RETURN creates line break
on mobile devices keep default behavior
|
2014-02-01 23:28:27 +01:00 |
|
friendica
|
94e59d4770
|
status indication
|
2014-02-01 01:00:26 -08:00 |
|
friendica
|
d14afc0ee4
|
provide the room name for the room you're in.
|
2014-02-01 00:54:20 -08:00 |
|
friendica
|
33f3cd3d4a
|
chat formatting/style improvements
|
2014-01-31 20:48:26 -08:00 |
|
marijus
|
af75b77253
|
comment out since it is not clear if this is not implemented yet or obsolete
|
2014-01-31 18:31:14 +01:00 |
|
friendica
|
aaa3c62efa
|
keep presence updated - typo was causing it to logout
|
2014-01-30 21:09:02 -08:00 |
|
friendica
|
f69bf5e598
|
more chat work - this time the ajax bits to actually show chats on the page
|
2014-01-30 18:57:46 -08:00 |
|
friendica
|
70de97fca1
|
Merge pull request #293 from MicMee/master
more progress in admin to maintain hubloc with ping
|
2014-01-30 14:21:32 -08:00 |
|
Michael Meer
|
da1e7cc211
|
Merge branch 'master' of https://github.com/friendica/red
.
|
2014-01-30 19:54:12 +01:00 |
|
marijus
|
3bdbdbab53
|
dont show an empty link to profile creation if multi_profile is not enabled
|
2014-01-30 19:44:50 +01:00 |
|
friendica
|
48bc9b546c
|
typo and clear chattext after submission
|
2014-01-30 03:51:25 -08:00 |
|
Michael Meer
|
0a2b2a1390
|
attempt with fix URL for testing works
|
2014-01-30 10:39:09 +01:00 |
|
friendica
|
6c6a9b963a
|
a bit more ajax work on chat and chatsvc and some fiddling with layouts
|
2014-01-30 01:00:46 -08:00 |
|
friendica
|
080928f214
|
chatroom management front-end stuff
|
2014-01-29 21:29:48 -08:00 |
|
friendica
|
7b60978262
|
back-end for changing online status and keeping presence refreshed
|
2014-01-29 20:40:37 -08:00 |
|
friendica
|
9fdee53c9a
|
start on the ajax bits
|
2014-01-29 20:14:18 -08:00 |
|
friendica
|
b8fb6a4373
|
more chat infrastructure
|
2014-01-29 17:09:20 -08:00 |
|
friendica
|
677f5f641e
|
more testing of chatroom interfaces, also corrected a function call that should have been a class instantiation in reddav
|
2014-01-29 16:02:02 -08:00 |
|
marijus
|
fe2b6f3dfb
|
add image floating to bbcode
|
2014-01-30 00:01:19 +01:00 |
|
Paolo T
|
286dca84a1
|
Merge pull request #288 from tuscanhobbit/master
Updated Italian translation
|
2014-01-29 07:48:50 -08:00 |
|
Paolo Tacconi
|
25acd60f63
|
Updated Italian translation
|
2014-01-29 16:44:17 +01:00 |
|
friendica
|
6a9d43bcbe
|
debug chatroom_list widget
|
2014-01-29 03:16:07 -08:00 |
|
friendica
|
f84ba95e87
|
add template for chatroomlist widget
|
2014-01-29 01:53:15 -08:00 |
|
friendica
|
d970c69f91
|
online indication to the directory popup
|
2014-01-28 19:49:56 -08:00 |
|
friendica
|
cc11535e34
|
online indication on profile sidebar
|
2014-01-28 17:07:25 -08:00 |
|
friendica
|
8efac0cfd6
|
fix sql query and provide setting to hide online status
|
2014-01-28 16:16:55 -08:00 |
|
friendica
|
3100b5d93e
|
photo tagging still broken - but at least don't create a new linked item every time a photo is edited.
|
2014-01-27 18:06:09 -08:00 |
|
friendica
|
9551f6b404
|
Merge https://github.com/friendica/red into zpull
|
2014-01-27 14:47:58 -08:00 |
|
friendica
|
d6a9497e4a
|
cleanup include/menu in preparation for the next phase of bookmarking
|
2014-01-27 14:46:39 -08:00 |
|
Michael Meer
|
a3bf272753
|
Merge branch 'master' of https://github.com/MicMee/red
to be in sync
|
2014-01-27 10:37:15 +01:00 |
|
friendica
|
d67fdd1299
|
add davguest param to cut/paste link for directories in mod/filestorage
|
2014-01-26 14:41:43 -08:00 |
|
friendica
|
f3fd9535a4
|
Merge https://github.com/friendica/red into zpull
|
2014-01-25 02:55:17 -08:00 |
|
friendica
|
4b66a399e4
|
get rid of bootstrap's blockqote margin css which is just bloody wrong and can't easily be over-ridden
|
2014-01-25 02:53:31 -08:00 |
|
Tobias Diekershoff
|
88f25191e0
|
DE: update to the strings
|
2014-01-25 07:28:30 +01:00 |
|
Thomas Willingham
|
d3a0d37b0d
|
Add admin info to admin panel and site info.
Since we can have multiple admins, this is freeform bbcode.
|
2014-01-24 23:58:41 +00:00 |
|
friendica
|
3869b16298
|
prettyphoto (js|css) not found
|
2014-01-24 14:35:32 -08:00 |
|
Michael Meer
|
ffabb4cc86
|
reorg formula data for hubloc checks
|
2014-01-22 11:29:49 +01:00 |
|
friendica
|
05951a9877
|
add primary webbie to directory popup
|
2014-01-21 18:45:40 -08:00 |
|
friendica
|
60416d6f33
|
fix the admin interface to pending registrations
|
2014-01-21 14:56:42 -08:00 |
|
Michael Meer
|
86e2237555
|
no need to have a doule hublocid
|
2014-01-20 13:03:24 +01:00 |
|
Michael Meer
|
a13593590b
|
added buttons to perform later hubloc actions
|
2014-01-20 12:12:40 +01:00 |
|
Thomas Willingham
|
a59b7c97f4
|
Missed these from git add...a year ago
|
2014-01-17 23:30:33 +00:00 |
|
Thomas Willingham
|
6920c203d1
|
Remove deprecated CSS - there is a dark schema now, and shadows and stuff are cofigurable.
|
2014-01-16 04:18:19 +00:00 |
|
Thomas Willingham
|
cd72fd3f01
|
Tweak "typical" perms macro
|
2014-01-16 02:53:05 +00:00 |
|
friendica
|
ec6b8e5cda
|
Merge branch 'master' of https://github.com/pixelroot/red into pixelroot-master
Conflicts:
view/ru/strings.php
|
2014-01-15 16:14:43 -08:00 |
|
cvogeley
|
d0e657f0f0
|
Merge pull request #271 from cvogeley/master
Confirm box: fall back to standard js confirm dialog if bootstrap isn't ...
|
2014-01-13 14:14:53 -08:00 |
|
Christian Vogeley
|
d9d894cbb3
|
Confirm box: fall back to standard js confirm dialog if bootstrap isn't available
|
2014-01-13 22:32:13 +01:00 |
|
pixelroot
|
4fdd9c39c5
|
modified: view/ru/messages.po
modified: view/ru/strings.php
|
2014-01-13 18:29:37 +01:00 |
|
pixelroot
|
ecb125a47d
|
modified: view/ru/messages.po
|
2014-01-13 16:10:58 +01:00 |
|
Tobias Diekershoff
|
87b99be785
|
DE: update to the strings
|
2014-01-13 07:28:16 +01:00 |
|
cvogeley
|
df9e628495
|
Merge pull request #268 from cvogeley/master
delete confirmation popup for blocks and layouts
|
2014-01-11 17:34:37 -08:00 |
|
Christian Vogeley
|
325c5e4e76
|
delete confirmation popup for blocks and layouts
|
2014-01-12 02:29:03 +01:00 |
|
Paolo T
|
c30d637b08
|
Merge pull request #264 from tuscanhobbit/master
Italian translation of reddav
|
2014-01-11 10:59:30 -08:00 |
|
tuscanhobbit
|
59a396ac75
|
Italian translation of reddav
|
2014-01-11 19:57:28 +01:00 |
|
Thomas Willingham
|
865f7aef1c
|
Prevent whitespace breaking copy-paste of reset passwords.
|
2014-01-10 20:37:25 +00:00 |
|
friendica
|
ee2bea37e9
|
mod_filestorage: provide a URL for linking to webpages and other websites
|
2014-01-09 21:01:53 -08:00 |
|
friendica
|
49882f2be4
|
add cloud link to profile_tabs and Comanchify the sucker
|
2014-01-09 19:00:06 -08:00 |
|
friendica
|
7910221832
|
preparatory work for supporting a "list view" mode for conversations. This would be useful for forum-like channels and/or block-oriented themes.
|
2014-01-08 15:20:12 -08:00 |
|
friendica
|
29db236981
|
qr enhancements
|
2014-01-08 14:11:39 -08:00 |
|
friendica
|
8b93881ce7
|
qr code support
|
2014-01-07 20:36:16 -08:00 |
|
friendica
|
b8564134aa
|
make storage limit service classes apply to accounts, not channels. Also include a css file that was missing from work yesterday.
|
2014-01-07 14:10:28 -08:00 |
|
friendica
|
2f27d58dfe
|
filestorage re-org and cleanup
|
2014-01-06 19:43:54 -08:00 |
|
friendica
|
e49e6c0d2a
|
special handling for directories
|
2014-01-06 18:20:14 -08:00 |
|
friendica
|
5a5466346c
|
prepare for OS file storage, and add bbcode attachment link to mod/filestorage. This isn't beautiful, but it's a start.
|
2014-01-06 18:13:02 -08:00 |
|
friendica
|
41df51a815
|
add "self" to access control lists with special marking to indicate it's special (for instance you can't really deny access to yourself). But this lets us make something private to our eyes only; whatever it may be.
|
2014-01-06 17:12:44 -08:00 |
|
friendica
|
8dc22c564a
|
provide ability to change attachment/file permissions
|
2014-01-06 16:49:07 -08:00 |
|
friendica
|
196b3022bd
|
Merge branch 'master' into movejs
Conflicts:
version.inc
|
2014-01-06 02:37:06 -08:00 |
|
friendica
|
24450fe8ef
|
likes to comments getting indented an extra 50px
|
2014-01-05 16:44:58 -08:00 |
|
friendica
|
daa7ee1275
|
make plink href visible
|
2014-01-04 15:42:51 -08:00 |
|
friendica
|
0c85c97480
|
move js files from core
|
2014-01-04 03:58:21 -08:00 |
|
Paolo T
|
5d14d85210
|
Merge pull request #255 from tuscanhobbit/master
Updated Italian translation
|
2014-01-04 02:23:06 -08:00 |
|
tuscanhobbit
|
6054da5157
|
Updated Italian translation
|
2014-01-04 11:21:33 +01:00 |
|
cvogeley
|
24850a4ea4
|
Merge pull request #254 from cvogeley/master
Webpage fixes for the moment without the fix for page not found after editing a webpage
|
2014-01-03 12:28:34 -08:00 |
|
Christian Vogeley
|
aafc40069b
|
Confirm webpage deletion prompt
|
2014-01-01 16:18:39 +01:00 |
|
friendica
|
4c541bb680
|
expose profile things in the UI
|
2013-12-30 15:41:42 -08:00 |
|
friendica
|
0dd7d93674
|
basic edit and delete for things
|
2013-12-30 04:25:55 -08:00 |
|
friendica
|
f36be066af
|
display_thing: it ain't much, but it's implemented.
|
2013-12-29 00:51:27 -08:00 |
|
friendica
|
22f614feba
|
a bit more backend work on things
|
2013-12-28 17:04:23 -08:00 |
|
friendica
|
c59688553c
|
remove prettyphoto from core - this will affect the enhanced photo albums feature on the short term which has been disabled until we figure out how to make the setting per-theme instead of a core option. The library is still available in core (library/prettyphoto) currently but needs to be moved to theme js and loaded/accessed from there [for themes which use it]. Then the library will be removed. It appears that other lightboxes commonly use rel= to group photo albums. So we may provide a generic rel= tag in photo album templates so that the choice of lightbox or album viewer is not only a theme option but could also be accomplished with plugins.
|
2013-12-26 13:08:16 -08:00 |
|
friendica
|
b7686b2a50
|
missing end div
|
2013-12-25 16:58:59 -08:00 |
|
friendica
|
1430db5ea8
|
and add a border for delineation
|
2013-12-25 16:57:48 -08:00 |
|
friendica
|
eda7c24c4e
|
improve the register text until the new register page is finished
|
2013-12-25 16:53:59 -08:00 |
|
friendica
|
66600ed2f8
|
try again
|
2013-12-25 04:06:26 -08:00 |
|
friendica
|
fe00e9b261
|
extend the directory profiles a bit more
|
2013-12-25 01:57:04 -08:00 |
|
friendica
|
b1ade138ff
|
use colorbox for single photo viewing (replacing prettyPhoto, which may have license incompatibilities). Also set maximum size of a directory popup and let it scroll after that in case somebody set their profile keywords to the content of Webster's dictionary.
|
2013-12-25 01:05:46 -08:00 |
|
friendica
|
80879369e7
|
get around size limit
|
2013-12-23 20:18:04 -08:00 |
|
friendica
|
1c5fe5a1ac
|
set the height so colorbox can set its size correctly
|
2013-12-23 20:04:00 -08:00 |
|