redmatrix
|
fdef224da1
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge
|
2016-04-23 00:05:33 -07:00 |
|
redmatrix
|
59c642ed19
|
revup
|
2016-04-23 00:05:12 -07:00 |
|
redmatrix
|
2b91962b32
|
Merge pull request #352 from phellmes/de20160422
Update DE translation strings
|
2016-04-23 07:46:44 +10:00 |
|
phellmes
|
61e695e143
|
Update DE translation strings
|
2016-04-22 20:00:14 +02:00 |
|
redmatrix
|
2726c68b60
|
revup
|
2016-04-22 00:50:42 -07:00 |
|
redmatrix
|
cf79c4ea48
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge
|
2016-04-21 01:08:00 -07:00 |
|
redmatrix
|
ae932922c4
|
revup #337
|
2016-04-21 01:07:46 -07:00 |
|
git-marijus
|
bacd05ea9e
|
Merge pull request #349 from HaakonME/master
Updated Hubzilla on OpenShift deploy script to include unofficial repos
|
2016-04-21 09:14:32 +02:00 |
|
Mario Vavti
|
59799ba2b4
|
some crossbrowser rendering work on the comment box
|
2016-04-20 21:59:29 +02:00 |
|
Mario Vavti
|
8147e6203f
|
Use stopImmidiatePropagation() only if we are in a list to not interfere with other keypress listeners (e.g. chat).
|
2016-04-20 14:13:09 +02:00 |
|
redmatrix
|
683da1aa77
|
revup #337
|
2016-04-20 01:19:13 -07:00 |
|
redmatrix
|
dd7fdf0c2b
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge
|
2016-04-19 13:04:59 -07:00 |
|
redmatrix
|
bb7b756974
|
revup #337
|
2016-04-19 13:04:44 -07:00 |
|
Haakon Meland Eriksen
|
e805f589aa
|
Updated Hubzilla on OpenShift deploy script to include unofficial repos by appending the 'insecure' argument
|
2016-04-19 19:23:40 +02:00 |
|
Haakon Meland Eriksen
|
e47a473e2c
|
Merge remote-tracking branch 'upstream/master'
|
2016-04-18 18:07:20 +02:00 |
|
Mario Vavti
|
a49fa5f87c
|
bring back bbcode buttons for mod/editpost
|
2016-04-18 16:45:34 +02:00 |
|
Mario Vavti
|
f761ea5fc9
|
fix rpost bbcode buttons and autocomplete
|
2016-04-18 10:56:51 +02:00 |
|
redmatrix
|
f12af17238
|
revup #337
|
2016-04-18 01:02:03 -07:00 |
|
jeroenpraat
|
c8dec1fae5
|
Spanish and Dutch strings update
|
2016-04-17 19:27:40 +02:00 |
|
redmatrix
|
72e7c50968
|
revup #337
|
2016-04-17 04:29:50 -07:00 |
|
Haakon Meland Eriksen
|
fddacf0a5a
|
Merge remote-tracking branch 'upstream/master'
|
2016-04-16 15:18:31 +02:00 |
|
redmatrix
|
65571249b2
|
revup #337
|
2016-04-16 00:38:45 -07:00 |
|
Haakon Meland Eriksen
|
b4205554a8
|
Commented out extra repos except official addons
|
2016-04-16 09:29:31 +02:00 |
|
Mario Vavti
|
2cb04ccb8f
|
nav: move js and css out of template, provide a help button in the panel on small screens and lots of whitespace cleanup
|
2016-04-15 12:39:22 +02:00 |
|
Mario Vavti
|
ce34c4086d
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2016-04-15 09:53:34 +02:00 |
|
Mario Vavti
|
fe9df64fc2
|
fix some slight crossbrowser rendering issues with jot
|
2016-04-15 09:52:40 +02:00 |
|
redmatrix
|
a1af2cbb30
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge
|
2016-04-15 00:48:38 -07:00 |
|
redmatrix
|
ec9e914798
|
revup + strings #337
|
2016-04-15 00:48:18 -07:00 |
|
Wave
|
ec5bd9d679
|
Merge pull request #343 from wave72/master
Updated Italian strings
|
2016-04-15 09:31:38 +02:00 |
|
Paolo Tacconi
|
c38c79d71c
|
Merge branch 'redmatrix-master'
|
2016-04-15 09:22:27 +02:00 |
|
Paolo Tacconi
|
45a854762b
|
Resolved conflict in view/it/hstrings.php
|
2016-04-15 09:20:58 +02:00 |
|
Paolo Tacconi
|
1806da0851
|
Updated Italian strings
|
2016-04-15 09:09:59 +02:00 |
|
redmatrix
|
a29c0371f1
|
commit 1.4
|
2016-04-14 20:11:36 -07:00 |
|
redmatrix
|
a8f7af2079
|
provide general purpose verification class, remove include/session.php (no longer used)
|
2016-04-14 18:51:06 -07:00 |
|
redmatrix
|
7ae7fac234
|
Merge branch 'master' into dev
|
2016-04-14 17:35:47 -07:00 |
|
redmatrix
|
d1fb4e9b03
|
revup #337
|
2016-04-14 17:34:08 -07:00 |
|
redmatrix
|
ed0bff798b
|
fix marked bug in code
|
2016-04-13 22:58:37 -07:00 |
|
redmatrix
|
3f0bb1bb1d
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-04-13 16:37:10 -07:00 |
|
redmatrix
|
9a0b61e4af
|
refactor the js detection into a checkjs class which is only enabled on demand (currently only the channel and display pages). Will probably require a bit more work to hide/disable the cover photo when js is disabled. Have not actually tested without js to discover any other potential page issues. Have only confirmed that the detection class works and redirects to set a jsdisabled cookie and reload the page with that cookie+variable set if called from the channel page.
|
2016-04-13 16:31:06 -07:00 |
|
Mario Vavti
|
b81291cd5c
|
some bbcode autocomplete refinement for edit webpage
|
2016-04-13 11:56:43 +02:00 |
|
redmatrix
|
a8a0ca8291
|
Merge branch 'master' into dev
|
2016-04-13 01:02:23 -07:00 |
|
redmatrix
|
1c61be4113
|
issue #337
|
2016-04-13 01:01:01 -07:00 |
|
redmatrix
|
91cc365143
|
reverse the logic of the jsenabled setting so that sessions without js are performance penalised instead of regular sessions.
|
2016-04-12 22:55:26 -07:00 |
|
redmatrix
|
f4a27afee9
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-04-12 19:42:02 -07:00 |
|
redmatrix
|
be654f1769
|
Important work on the sessionhandler to maintain compatibility with php7 and php5x (x > 4)
Merge branch 'master' into dev
|
2016-04-12 19:40:19 -07:00 |
|
redmatrix
|
73628db7e2
|
revup issue #337
|
2016-04-12 18:43:50 -07:00 |
|
Mario Vavti
|
571c72f853
|
improve bbco autocomplete to not execute listNewLineAutocomplete() many times after many ajax page reloads
|
2016-04-12 11:55:50 +02:00 |
|
redmatrix
|
b788b38edf
|
remove obsolete jotVideoURL() and jotAudioURL()
|
2016-04-11 21:40:03 -07:00 |
|
redmatrix
|
09861abab7
|
when saving bookmarks from a post allow choice of bookmark to be saved (default is all of them); this implements the backend. Additional work will be required on the front end or within plugins to make this happen.
|
2016-04-11 20:53:08 -07:00 |
|
redmatrix
|
202035fc68
|
move all DB session storage logic to SessionHandler where it belongs
|
2016-04-11 19:19:58 -07:00 |
|