Mario Vavti
|
b23284cba2
|
move moment.min.js and remove unneeded files
|
2015-11-18 23:56:25 +01:00 |
|
Mario Vavti
|
e4145deeb7
|
some events refacturing
|
2015-11-18 23:50:42 +01:00 |
|
redmatrix
|
68da4d90dc
|
fix admin plugin hooks
|
2015-11-17 20:44:57 -08: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 |
|
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 |
|
jeroenpraat
|
def5edf93c
|
nl+es and some other bits
|
2015-11-14 20:43:34 +01:00 |
|
redmatrix
|
93e5449c08
|
really basic photo album widget for content regions
|
2015-11-12 20:22:36 -08:00 |
|
jeroenpraat
|
5afe8e5aa1
|
Small update to Bluegrid and generic-content-wrapper-styled to dreport
|
2015-11-12 22:10:20 +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 |
|
jeroenpraat
|
618155e6ab
|
More Bluegrid fine tuning and generic-content-wrapper-styled added to some tpl-files and 2 php files, cause they dont have a tpl file.
|
2015-11-01 22:59:32 +01:00 |
|
Mario Vavti
|
0353b0e04f
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2015-11-01 11:17:04 +01:00 |
|
jeroenpraat
|
3262d819de
|
update srings nl+es, wrapper-styled 1 tpl-file, more finetuning bluegrid schema.
|
2015-10-31 22:34:59 +01:00 |
|
jeroenpraat
|
52120b367a
|
Update nl+es
|
2015-10-31 21:07:57 +01:00 |
|
Mario Vavti
|
5920a96da7
|
make attachments appear in a dropdown in wall-item-tools-left
|
2015-10-31 00:38:01 +01:00 |
|
Mario Vavti
|
f8b767ed32
|
fix photo item for search_item.tpl and a minor css fix
|
2015-10-30 18:46:16 +01:00 |
|
redmatrix
|
96402a2354
|
This may take a few iterations to discover the best way to present the information, but we need a way for members to know what alternate locations are available for a channel during times of server issues - and as recently discovered if there aren't any hublocs at all; without digging around the database and probing channels and other messy stuff.
|
2015-10-29 01:23:56 -07:00 |
|
jeroenpraat
|
605381f83d
|
More fine tuning bluegrid schema. Extra generic-wrapper-styled.
|
2015-10-27 22:52:54 +01:00 |
|
Mario Vavti
|
71f70b4377
|
css fixes
|
2015-10-27 12:52:21 +01:00 |
|
jeroenpraat
|
02527552fd
|
Better -styled.
|
2015-10-27 01:23:30 +01:00 |
|
jeroenpraat
|
ac5b9f2382
|
Another .generic-content-wrapper
|
2015-10-27 01:20:48 +01:00 |
|
jeroenpraat
|
fc65496d1d
|
NEW: Redbasic schema, based on the Hubzilla project page layout.
|
2015-10-27 01:11:50 +01:00 |
|
jeroenpraat
|
35857931ef
|
2 more tpl files with generic-content-wrapper-styled
|
2015-10-26 22:47:47 +01:00 |
|
jeroenpraat
|
6cb7afcbc0
|
es+nl strings
|
2015-10-26 16:35:44 +01:00 |
|
jeroenpraat
|
32a0f5b04a
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2015-10-26 15:28:11 +01:00 |
|
jeroenpraat
|
3bc6190bdd
|
Update Dark schema
|
2015-10-26 15:27:47 +01:00 |
|
Mario Vavti
|
4fb9571136
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2015-10-26 14:20:06 +01:00 |
|
Mario Vavti
|
e70bb371d9
|
bring back item transparency
|
2015-10-26 14:19:46 +01:00 |
|
jeroenpraat
|
2099ac0615
|
Revert this one. This was hub specific.
|
2015-10-26 14:16:05 +01:00 |
|
jeroenpraat
|
5e28b1216e
|
Added a few generic-content-wrapper-styled classes and a button position fixed for lostpass. mod/search probably needs a .tpl in the future, but I don't know how to that.
|
2015-10-26 14:05:45 +01:00 |
|
jeroenpraat
|
e858ee811b
|
Fixed connection page. Page was overcrowded on systems with larger fonts.
|
2015-10-26 13:57:12 +01:00 |
|
redmatrix
|
a498fc8e72
|
looks like there may be issues with the datetime picker if the local timezone isn't the same as your settings.
|
2015-10-25 21:17:02 -07:00 |
|
redmatrix
|
917d0ced4a
|
new feature: delayed posting
|
2015-10-25 16:54:18 -07:00 |
|
Mario Vavti
|
fd1e163bf4
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2015-10-24 21:44:45 +02:00 |
|
Mario Vavti
|
ab8b4d5c36
|
another try to avoid dubble photo deletion. allow to set a photo caption and simple status body (if create status post is enabled) on upload
|
2015-10-24 21:44:25 +02:00 |
|
Wave
|
4a044351a9
|
Merge pull request #97 from wave72/master
Italian strings updated
|
2015-10-24 12:15:15 +02:00 |
|
wave72
|
e0a2268b0e
|
Italian strings updated
|
2015-10-24 12:13:17 +02:00 |
|
Mario Vavti
|
9ae215291f
|
fix app.tpl missing </div> tag if not authenticated
|
2015-10-23 10:20:01 +02:00 |
|
mcnesium
|
379fd33484
|
fix placeholder font-family
[Imgur](http://i.imgur.com/Cegabd5.png)
|
2015-10-22 13:44:33 +02:00 |
|
Mario Vavti
|
ed6629002f
|
photo object fixes
|
2015-10-22 13:01:33 +02:00 |
|
Mario Vavti
|
bcb4ac7aae
|
experiment: put the photo-item photo on top of the post
|
2015-10-22 12:58:11 +02:00 |
|
Mario Vavti
|
6f8d29ad80
|
move photo object stuff from itemObject to prepare_body() so we can do more stuff with it
|
2015-10-22 10:52:10 +02:00 |
|
Mario Vavti
|
232742a5e6
|
warn if quota exceeds 90% of storage limit
|
2015-10-21 12:52:03 +02:00 |
|
Mario Vavti
|
a33ddf373b
|
move file storage quota display to upload section. add a warning if remaining space is less than 100MB and fix % calculation
|
2015-10-21 12:40:09 +02:00 |
|
redmatrix
|
38816d7e41
|
move quota display to where it's visible on a tablet
|
2015-10-20 18:48:14 -07:00 |
|
Mario Vavti
|
13d0db5f9a
|
css cleanup
|
2015-10-20 09:47:30 +02:00 |
|
Mario Vavti
|
f7601756e9
|
create photo object if feature large photos is enabled and display those slightly different
|
2015-10-20 09:36:15 +02:00 |
|
redmatrix
|
ea37882b95
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/zot.php
install/schema_mysql.sql
install/schema_postgres.sql
install/update.php
mod/zfinger.php
|
2015-10-19 16:18:04 -07:00 |
|
Paolo Tacconi
|
8da8e02dc8
|
Replaced some old redmatrix branding
|
2015-10-19 10:51:33 +02:00 |
|
jeroenpraat
|
6eaf35a142
|
Update es+nl
|
2015-10-18 19:09:38 +02:00 |
|
jeroenpraat
|
52f3d6722d
|
Update nl+es
|
2015-10-18 16:45:11 +02:00 |
|
Mario Vavti
|
126628546b
|
tweak justify gallery options to not load to large previews
|
2015-10-18 14:21:42 +02:00 |
|
redmatrix
|
be701677d6
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
view/nl/messages.po
view/nl/strings.php
|
2015-10-17 16:38:57 -07:00 |
|
redmatrix
|
1d2797dc1f
|
bring back chat expiration setting and adjust chat size for our now smaller content region
|
2015-10-17 14:54:27 -07:00 |
|
Mario Vavti
|
b7408fa39e
|
we now provide images for all suffixes (0-3) -> simplify photo item body creation and provide width x height for any size
|
2015-10-16 16:27:51 +02:00 |
|
jeroenpraat
|
7ca5b5c928
|
Update Dutch strings
|
2015-10-16 15:31:11 +02:00 |
|
Mario Vavti
|
73082a338b
|
(re)add default image-size 320px - it is good for gallery preview. this size has the suffix -3 now
|
2015-10-15 12:56:22 +02:00 |
|
Mario Vavti
|
1593ebec1f
|
update conv_list.tpl
|
2015-10-15 11:49:33 +02:00 |
|
Mario Vavti
|
2413968021
|
double up default photo sizes - even the mos simple camera can now do images > 1024px
|
2015-10-15 11:20:56 +02:00 |
|
Mario Vavti
|
2848f5dab4
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2015-10-15 09:36:51 +02:00 |
|
redmatrix
|
de697a4267
|
issue #86 - like/dislike in photos not working
|
2015-10-14 14:16:16 -07:00 |
|
Mario Vavti
|
b4e83b6537
|
allow photo-items to appear full width if large photos feature is enabled. in prepare_body() split off mentions, tags, categories folders and attachments from body for easier theming. some other little fixes.
|
2015-10-14 22:14:19 +02:00 |
|
Wave
|
e3070eb170
|
Merge pull request #81 from tuscanhobbit/master
Italian strings updated
|
2015-10-14 09:12:58 +02:00 |
|
Paolo Tacconi
|
319b02a757
|
Italian strings updated
|
2015-10-14 09:11:05 +02:00 |
|
Mario Vavti
|
61e3ef2552
|
do not collapse content which is just slightly higher than we allow
|
2015-10-13 10:45:22 +02:00 |
|
jeroenpraat
|
43eefb5929
|
update es + nl strings
|
2015-10-13 00:43:23 +02:00 |
|
Mario Vavti
|
dec37b3dbe
|
another collapseHeight() fix
|
2015-10-11 22:58:59 +02:00 |
|
Mario Vavti
|
9431112f77
|
fix an issue with collapseHeight() and css margins/paddings in directory
|
2015-10-11 22:49:36 +02:00 |
|
Mario Vavti
|
c963aa98e8
|
some conv-item restructuring to allow full width elements
|
2015-10-11 22:32:06 +02:00 |
|
jeroenpraat
|
a9696abdce
|
Redesigned the export page. Please fix my English if I made some mistakes.
|
2015-10-09 16:45:29 +02:00 |
|
Andrew Manning
|
9034765790
|
There is no mod/import_items tool in RedMatrix
|
2015-10-07 20:37:00 -04:00 |
|
Andrew Manning
|
e1fca2a1ab
|
Add message about exporting by year/month to uexport
|
2015-10-06 06:45:55 -04:00 |
|
jeroenpraat
|
f5fe37ab09
|
Updated Spanish strings
|
2015-10-05 16:53:43 +02:00 |
|
jeroenpraat
|
8f7dd2f858
|
Final Spanish strings for Redmatrix
|
2015-10-05 16:50:59 +02:00 |
|
Mario Vavti
|
05050381d3
|
bring our bbcode tools to private mail
|
2015-10-05 12:26:04 +02:00 |
|
Mario Vavti
|
2e45b41902
|
do not show delete conversation in single message view
|
2015-10-04 19:58:20 +02:00 |
|
Mario Vavti
|
7776c56c6c
|
bring single message view to inbox/outbox view
|
2015-10-04 19:51:23 +02:00 |
|
Mario Vavti
|
4decceea76
|
add anchors to messages and links
|
2015-10-04 14:07:05 +02:00 |
|
Mario Vavti
|
26b97722c6
|
remove check mail - it just reloads the page. we get a notification in the panel if we get new mail
|
2015-10-04 13:43:16 +02:00 |
|
jeroenpraat
|
392ee70fd5
|
Updated Spanish and Dutch language strings
|
2015-10-03 15:38:40 +02:00 |
|
redmatrix
|
7abad2ff99
|
get rid of the unnecessary blank space after mail recipient completion
|
2015-10-02 18:12:09 -07:00 |
|
Mario Vavti
|
5ba39fef9a
|
private mail compositor changes
|
2015-10-02 17:51:37 +02:00 |
|
Mario Vavti
|
9b8aa8d09e
|
whitespace
|
2015-10-02 12:26:12 +02:00 |
|
Mario Vavti
|
3bed94f4ad
|
move mail item buttons/menu to dropdown
|
2015-10-02 12:20:33 +02:00 |
|
Mario Vavti
|
a895a0d79e
|
private mail template and css fixes
|
2015-10-02 11:41:37 +02:00 |
|
Haakon Meland Eriksen
|
1574043a9e
|
Updated Norwegian strings for Hubzilla
|
2015-10-01 17:51:31 +02:00 |
|
Haakon Meland Eriksen
|
a2a5580e68
|
Updated Norwegian string for Hubzilla
|
2015-10-01 17:46:31 +02:00 |
|
Wave
|
d9f962ee6f
|
Merge pull request #65 from tuscanhobbit/master
More updates on Italian translation from transifex
|
2015-10-01 17:31:00 +02:00 |
|
Paolo Tacconi
|
7468d8a000
|
More updates on Italian translation from transifex
|
2015-10-01 17:29:04 +02:00 |
|
Wave
|
270bb4e2d9
|
Merge pull request #64 from tuscanhobbit/master
First Hubzilla Italian localization
|
2015-10-01 17:12:31 +02:00 |
|
Paolo Tacconi
|
d3d9b06eb7
|
First Hubzilla Italian localization
|
2015-10-01 17:11:36 +02:00 |
|
redmatrix
|
e7131bc8f8
|
this is an even better fix for issue #61
|
2015-09-30 22:10:26 -07:00 |
|
redmatrix
|
1df1c15e48
|
issue #61 - provide un-useable icons as placeholders for location setting options on deleted hublocs
|
2015-09-30 21:59:33 -07:00 |
|
redmatrix
|
526bc36b40
|
update the opensearch template
|
2015-09-30 19:31:25 -07:00 |
|
redmatrix
|
9bdb7bef5d
|
add delivery reports to mail (not backported to redmatrix)
|
2015-09-30 19:27:53 -07:00 |
|
redmatrix
|
54e7d5d260
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/zot.php
view/de/messages.po
view/de/strings.php
|
2015-09-30 16:31:06 -07:00 |
|
zottel
|
b5f382f0ea
|
update German strings
|
2015-09-30 14:05:10 +02:00 |
|
zottel
|
d66715648a
|
update German strings
|
2015-09-30 14:01:21 +02:00 |
|
jeroenpraat
|
34f52e47eb
|
Hooray! Dutch language complete again.
|
2015-09-29 22:22:02 +02:00 |
|
Mario Vavti
|
6368b09337
|
a clear is needed after floating
|
2015-09-28 21:51:04 +02:00 |
|
Mario Vavti
|
b97102da01
|
private mail: bring additional inbox/outbox views and ajaxify single message drop
|
2015-09-28 17:40:38 +02:00 |
|
redmatrix
|
55b530f0fd
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/zot.php
util/messages.po
|
2015-09-27 17:00:41 -07:00 |
|
redmatrix
|
cd2b811555
|
move string files to hmessages.po and hstrings.php for hubzilla to avoid endless merge conflicts.
|
2015-09-26 23:44:30 -07:00 |
|
Mario Vavti
|
d6293730fc
|
private mail: some work on conversations view
|
2015-09-25 23:26:28 +02:00 |
|
jeroenpraat
|
49000dadda
|
Another Spanish update
|
2015-09-25 21:25:42 +02:00 |
|
redmatrix
|
ba94f824b9
|
deliveries per process ui for setting
|
2015-09-25 01:31:58 -07:00 |
|
redmatrix
|
2fe3d16bbe
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2015-09-24 16:58:32 -07:00 |
|
redmatrix
|
2844f276b9
|
Document the additional content export options
|
2015-09-24 16:57:17 -07:00 |
|
Mario Vavti
|
b9723aa85b
|
some heavy private mail restructuring - work in progress
|
2015-09-24 14:07:44 +02:00 |
|
redmatrix
|
2869ccfe39
|
delivery reports - crude but mostly functional at least for zot deliveries
|
2015-09-22 04:04:51 -07:00 |
|
redmatrix
|
9baaa6fa56
|
issue #51
|
2015-09-21 20:05:54 -07:00 |
|
redmatrix
|
d2565d0f61
|
looks like chat has been neglected a bit recently
|
2015-09-20 21:37:18 -07:00 |
|
Mario Vavti
|
c38687725d
|
kick right aside out a little earlier
|
2015-09-20 22:12:00 +02:00 |
|
redmatrix
|
74827133b2
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
util/messages.po
|
2015-09-18 22:46:21 -07:00 |
|
Mario Vavti
|
87c8cf4892
|
css fixes
|
2015-09-18 13:07:04 +02:00 |
|
redmatrix
|
f2fefb91d5
|
change photo permissions when attach permissions are changed through mod/filestorage, and fix lockview for photos.
|
2015-09-18 01:53:04 -07:00 |
|
jeroenpraat
|
4090843fef
|
Converse width for a few related (old) schemas back to 1024px / Name default theme to Focus / Non expert custom display settings above expert display settings, so people can better find them.
|
2015-09-17 22:39:48 +02:00 |
|
Mario Vavti
|
c6c18261a0
|
missing refernce to array
|
2015-09-17 19:33:44 +02:00 |
|
Mario Vavti
|
1cf404177d
|
quickfix for private messages - needs a lot more work
|
2015-09-17 19:25:13 +02:00 |
|
jeroenpraat
|
582607c0f0
|
Another (hopefully final) Spanish update
|
2015-09-17 16:28:31 +02:00 |
|
Mario Vavti
|
6cd5826d21
|
Revert "moved submit button to the bottom in settings.tpl"
This reverts commit 1500691cc2 .
|
2015-09-17 15:05:40 +02:00 |
|
Mario Vavti
|
b7e953f50e
|
fix calculation of content height with margins
|
2015-09-17 14:14:01 +02:00 |
|
redmatrix
|
30af694e30
|
Merge pull request #44 from mrjive/move_submit_button
moved submit button to the bottom in settings.tpl
|
2015-09-17 10:19:43 +10:00 |
|