 redmatrix
|
9cddbc9a47
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-04-17 19:58:59 -07:00 |
|
|
redmatrix
|
966773cdbb
|
pull in the new object router and a few selected samples for the new controller layout
|
2016-04-17 19:55:36 -07:00 |
|
|
redmatrix
|
d2e61122c5
|
Merge commit '521d404' into dev
|
2016-04-17 19:42:43 -07:00 |
|
 jeroenpraat
|
7229cd56ed
|
Making sure the great new context help works with all thmes and schema's (3rd party themes: maybe abit of tweaking is still needed). Also fixing some minor cosmetic things.
|
2016-04-18 01:57:54 +02:00 |
|
|
redmatrix
|
521d404013
|
remove the date hack on public feeds which was a temporary fix for an issue limiting the number of posts returned and no longer needed.
|
2016-04-17 16:37:44 -07:00 |
|
|
redmatrix
|
5591eac973
|
Merge pull request #345 from anaqreon/context-help
New help panel that slides in from the top and pushes the content ...
|
2016-04-18 06:47:57 +10:00 |
|
|
redmatrix
|
c366bbaa54
|
Merge branch 'master' into dev
|
2016-04-17 04:31:20 -07:00 |
|
|
redmatrix
|
72e7c50968
|
revup #337
|
2016-04-17 04:29:50 -07:00 |
|
 Andrew Manning
|
f4cca21fdf
|
Recover lost language translation accommodation and doc/context restructuring
|
2016-04-17 07:29:08 -04:00 |
|
|
Andrew Manning
|
d7fe48d1b6
|
New help panel that slides in from the top and pushes the content down so it is not covered. Panel toggles with help button. Still some bugs with small screen viewing.
|
2016-04-17 07:09:42 -04:00 |
|
|
redmatrix
|
08a651dc9d
|
Merge branch 'master' into dev
|
2016-04-16 00:39:29 -07:00 |
|
|
redmatrix
|
65571249b2
|
revup #337
|
2016-04-16 00:38:45 -07:00 |
|
|
redmatrix
|
0865d0ef51
|
Convert Channel to new module
|
2016-04-15 22:36:07 -07:00 |
|
|
redmatrix
|
b57f69d14d
|
cleanup and test of new router
|
2016-04-15 20:43:05 -07:00 |
|
|
redmatrix
|
07650b4646
|
get init() working with class modules
|
2016-04-15 16:13:55 -07:00 |
|
|
redmatrix
|
ce582ccada
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-04-15 14:27:44 -07:00 |
|
|
redmatrix
|
ee5163ce64
|
Merge branch 'master' into dev
|
2016-04-15 14:27:28 -07:00 |
|
 Mario Vavti
|
bbe33f9503
|
Merge branch 'master' into dev
|
2016-04-15 12:42:12 +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 |
|
|
redmatrix
|
aaa327ca05
|
testing the new router/module code
|
2016-04-15 01:25:15 -07: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
|
f124f4a9f5
|
Merge branch 'master' into dev
|
2016-04-15 00:49:17 -07: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
|
521641f3a8
|
filter out a bit more dreport noise - especially for private posts to multiple recipients.
|
2016-04-14 21:53:39 -07:00 |
|
|
redmatrix
|
a29c0371f1
|
commit 1.4
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 |
|
|
redmatrix
|
5ab1d509d2
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-04-11 13:04:17 -07:00 |
|
|
redmatrix
|
1b83d88fe6
|
remove references to ref_session_write - can't use
|
2016-04-11 13:03:34 -07:00 |
|