Haakon Meland Eriksen
|
545dc5cf65
|
Merge remote-tracking branch 'upstream/master'
|
2015-11-18 01:52:11 +01:00 |
|
redmatrix
|
a089064588
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2015-11-17 15:04:04 -08:00 |
|
redmatrix
|
a06f7fbe2e
|
photo album widget permissions issue
|
2015-11-17 15:03:27 -08:00 |
|
Mario Vavti
|
6fa0807550
|
more css fixes
|
2015-11-17 23:01:24 +01:00 |
|
Haakon Meland Eriksen
|
c545ada746
|
Merge remote-tracking branch 'upstream/master'
|
2015-11-17 16:49:11 +01:00 |
|
Mario Vavti
|
9e3d130ad9
|
css fixes
|
2015-11-17 11:32:37 +01:00 |
|
Mario Vavti
|
b531486dab
|
show jotnets toggle button only if there are jotnets and whitespace fixes
|
2015-11-17 10:46:38 +01:00 |
|
redmatrix
|
6df98f080b
|
fix api/direct_messages/new at least for the json case. We seem to have a missing template for XML
|
2015-11-16 19:17:39 -08:00 |
|
Haakon Meland Eriksen
|
fd5d1416d9
|
Merge remote-tracking branch 'upstream/master'
|
2015-11-15 00:27:23 +01:00 |
|
jeroenpraat
|
def5edf93c
|
nl+es and some other bits
|
2015-11-14 20:43:34 +01:00 |
|
Haakon Meland Eriksen
|
9d6a4c1d05
|
Reorder buttons HME
|
2015-11-13 19:44:42 +01:00 |
|
Haakon Meland Eriksen
|
94bef08f15
|
Adding original jot.tpl from GitHub
|
2015-11-13 18:32:25 +01:00 |
|
Haakon Meland Eriksen
|
0178840c19
|
Merge remote-tracking branch 'upstream/master'
|
2015-11-13 16:45:31 +01:00 |
|
Haakon Meland Eriksen
|
d04c73ae00
|
Reorder buttons
|
2015-11-13 16:31:48 +01:00 |
|
Haakon Meland Eriksen
|
495f21c08c
|
Reverted changes - got white screen
|
2015-11-13 07:36:32 +01:00 |
|
Haakon Meland Eriksen
|
d238cbea19
|
Regrouped post buttons
|
2015-11-13 07:03:30 +01:00 |
|
redmatrix
|
93e5449c08
|
really basic photo album widget for content regions
|
2015-11-12 20:22:36 -08:00 |
|
Haakon Meland Eriksen
|
921a2e0dc4
|
Regrouped post buttons
|
2015-11-13 00:07:09 +01:00 |
|
jeroenpraat
|
5afe8e5aa1
|
Small update to Bluegrid and generic-content-wrapper-styled to dreport
|
2015-11-12 22:10:20 +01:00 |
|
Haakon Meland Eriksen
|
ba84d6ff7c
|
Regrouped post buttons
|
2015-11-12 21:11:47 +01:00 |
|
Haakon Meland Eriksen
|
d786502f19
|
Regrouped post buttons
|
2015-11-12 20:44:41 +01:00 |
|
Haakon Meland Eriksen
|
90463ee67d
|
Make upload and encrypt easier on phones by editing jot.tpl
|
2015-11-12 07:45:37 +01:00 |
|
Haakon Meland Eriksen
|
e26b558e53
|
Promoted upload of images and encryption
|
2015-11-11 23:55:05 +01:00 |
|
Haakon Meland Eriksen
|
85e5cd7f98
|
Rearranged comment buttons back
|
2015-11-11 23:43:41 +01:00 |
|
Haakon Meland Eriksen
|
1d8cac6e73
|
Rearranged comment buttons
|
2015-11-11 23:31:18 +01:00 |
|
redmatrix
|
fba2603304
|
add avatars to likes/dislikes/etc.
|
2015-11-09 15:58:19 -08:00 |
|
redmatrix
|
7d5acef20a
|
remove list bullets from extended like list
|
2015-11-09 15:18:26 -08:00 |
|
jeroenpraat
|
b99b6b5ae9
|
This is better
|
2015-11-09 16:37:22 +01:00 |
|
jeroenpraat
|
cda81e35db
|
Using bootstrap classes, so other themes/schemas also work. Plus margin when collapsed.
|
2015-11-09 15:08:50 +01:00 |
|
Wave
|
115a53225e
|
Merge pull request #137 from wave72/master
Updated Italian strings
|
2015-11-09 08:58:58 +01:00 |
|
Paolo Tacconi
|
36c196e18c
|
Updated Italian strings
|
2015-11-09 08:54:18 +01:00 |
|
redmatrix
|
5e1b61eb02
|
some more db doco
|
2015-11-08 20:02:35 -08:00 |
|
redmatrix
|
4e1c308162
|
make jotnets modal
|
2015-11-08 17:48:43 -08:00 |
|
Tobias Luther
|
8639eda70f
|
Quick fix: Moved Twitter select box to the top of ACL selector
|
2015-11-08 12:20:58 +01:00 |
|
jeroenpraat
|
2b0b03eebc
|
Fix ffsapi for non-English languages (or better when 's was used in the strings) - Update nl+es
|
2015-11-08 00:04:02 +01:00 |
|
jeroenpraat
|
0db5a8673d
|
Firefox share (that seems now the official name) button added to misc. settings.
|
2015-11-05 16:20:56 +01:00 |
|
jeroenpraat
|
1c0fe89368
|
Chat page improved (I think). Works now better with diff. resolutions, font sizes and languages. Fixed follow field on conn. page. Small schemas updates.
|
2015-11-04 22:52:40 +01:00 |
|
Wave
|
9398e49eb7
|
Merge pull request #125 from wave72/master
Updated Italian strings
|
2015-11-04 15:04:20 +01:00 |
|
Paolo Tacconi
|
50cf095c00
|
Updated Italian strings
|
2015-11-04 14:58:52 +01:00 |
|
redmatrix
|
c57926d799
|
Merge pull request #119 from sasiflo/master
Some small rebranding for Hubzilla transition from Red Matrix
|
2015-11-04 16:00:32 +11:00 |
|
redmatrix
|
77a03e376c
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/photo/photo_driver.php
include/text.php
mod/post.php
|
2015-11-03 20:46:47 -08:00 |
|
redmatrix
|
e09b49288f
|
provide admin setting to change directory server
|
2015-11-03 18:34:16 -08:00 |
|
redmatrix
|
c1cfcc78fe
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2015-11-03 14:59:43 -08:00 |
|
redmatrix
|
2c299a9f37
|
implement unfollow thread
|
2015-11-03 14:59:14 -08:00 |
|
jeroenpraat
|
d1aa672388
|
small update Ducth strings + fix dark schema
|
2015-11-03 21:19:23 +01:00 |
|
sasiflo
|
b21f6fd619
|
Merge branch 'rebranding'
|
2015-11-03 11:35:44 +01:00 |
|
sasiflo
|
39245238fd
|
Some small rebranding for Hubzilla transition from Red Matrix
|
2015-11-03 11:31:19 +01:00 |
|
Mario Vavti
|
43d8090182
|
timeago() works best with iso format. fix #118
|
2015-11-03 11:19:22 +01:00 |
|
redmatrix
|
d3183467e0
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2015-11-01 15:52:35 -08:00 |
|
redmatrix
|
b62614bbd4
|
improve /locs page with some field notes and the ability to do a forced sync
|
2015-11-01 15:51:45 -08:00 |
|