redmatrix
|
692e41c41e
|
provide a way for the router to support custom controller objects and allow plugins to register class objects as modules instead of the traditional procedural interface.
|
2016-04-21 16:09:25 -07:00 |
|
redmatrix
|
4669107634
|
Merge branch 'master' into dev
|
2016-04-21 01:08:38 -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 |
|
redmatrix
|
657b34c012
|
change the 404 warning from the router to reflect the new architecture
|
2016-04-20 22:50:59 -07:00 |
|
redmatrix
|
5eb594706b
|
make the cookie check agnostic to cookie state
|
2016-04-20 22:17:02 -07:00 |
|
redmatrix
|
2b0a04ea9e
|
revert the reversal of checkjs logic, but still restrict the behaviour scope to just those urls that require it
|
2016-04-20 22:10:00 -07:00 |
|
redmatrix
|
f00a701ad1
|
send the correct number of args
|
2016-04-20 19:56:01 -07:00 |
|
redmatrix
|
dff9e18c1e
|
We no longer require the diaspora_meta service locally.
|
2016-04-20 19:54:26 -07:00 |
|
redmatrix
|
d2f67bf249
|
Merge branch 'dmeta' into dev
several diaspora changes/fixes
|
2016-04-20 19:06:36 -07:00 |
|
redmatrix
|
8f64b28fb9
|
upgrade std rev
|
2016-04-20 19:06:19 -07:00 |
|
redmatrix
|
0d91f363cc
|
There is no longer a followup flag in the notifier. Remove all traces of it.
|
2016-04-20 19:03:56 -07:00 |
|
redmatrix
|
23180ae078
|
Merge branch 'dev' into dmeta
|
2016-04-20 18:16:15 -07:00 |
|
redmatrix
|
635580091a
|
Merge branch 'master' into dev
|
2016-04-20 17:43:20 -07:00 |
|
redmatrix
|
a768bb1ab2
|
Merge branch 'master' into dev
|
2016-04-20 17:41:51 -07: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
|
2641980ac2
|
bb2d updates from testing signature changes
|
2016-04-20 01:40:09 -07:00 |
|
redmatrix
|
683da1aa77
|
revup #337
|
2016-04-20 01:19:13 -07:00 |
|
redmatrix
|
21b0128e9e
|
testing dmeta
|
2016-04-19 23:06:43 -07:00 |
|
redmatrix
|
d07afb54e4
|
rework bb2diaspora for eradicating the diaspora comment virus
|
2016-04-19 21:43:12 -07:00 |
|
redmatrix
|
1e8b3fe749
|
Revert the last edit on this file. Need to work this through a bit more before changing this bit.
|
2016-04-19 20:02:55 -07:00 |
|
redmatrix
|
9040ee53e4
|
missing class instance pointer in Pconfig module upgrade
|
2016-04-19 19:09:35 -07:00 |
|
redmatrix
|
974390d5d2
|
remove test files which were committed by accident
|
2016-04-19 19:02:48 -07:00 |
|
redmatrix
|
8a57b845ae
|
second phase of diaspora comment virus eradication begins
|
2016-04-19 17:03:14 -07:00 |
|
redmatrix
|
324771f858
|
Merge branch 'master' into dev
|
2016-04-19 15:51:41 -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 |
|
redmatrix
|
f53478f142
|
a bit more namespace wrangling
|
2016-04-18 20:47:11 -07:00 |
|
redmatrix
|
2a4e8972e0
|
module updates
|
2016-04-18 20:38:38 -07:00 |
|
redmatrix
|
2a61817bad
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-04-18 19:17:20 -07:00 |
|
Haakon Meland Eriksen
|
e47a473e2c
|
Merge remote-tracking branch 'upstream/master'
|
2016-04-18 18:07:20 +02:00 |
|
Mario Vavti
|
094d4cc325
|
Merge branch 'master' into dev
|
2016-04-18 16:45:58 +02:00 |
|
Mario Vavti
|
a49fa5f87c
|
bring back bbcode buttons for mod/editpost
|
2016-04-18 16:45:34 +02:00 |
|
Mario Vavti
|
ca59ecd107
|
Merge branch 'master' into dev
|
2016-04-18 10:57:20 +02:00 |
|
Mario Vavti
|
f761ea5fc9
|
fix rpost bbcode buttons and autocomplete
|
2016-04-18 10:56:51 +02:00 |
|
redmatrix
|
1698732cff
|
convert all the _well_known service controllers which are a bit touchy when it comes to the router
|
2016-04-18 01:35:09 -07:00 |
|
redmatrix
|
a9f68e4d2a
|
Merge branch 'master' into dev
|
2016-04-18 01:02:44 -07:00 |
|
redmatrix
|
f12af17238
|
revup #337
|
2016-04-18 01:02:03 -07:00 |
|
redmatrix
|
d1ecf3f323
|
some issues with GNU-Social's implementation of events in feeds. The summary element is over-riding content, so put summary into the xcal namespace. Some investigation reveals that both projects are non-compliant in the xcal space. Will deal with this later.
|
2016-04-18 00:59:42 -07:00 |
|
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 |
|
jeroenpraat
|
c8dec1fae5
|
Spanish and Dutch strings update
|
2016-04-17 19:27:40 +02:00 |
|
redmatrix
|
c366bbaa54
|
Merge branch 'master' into dev
|
2016-04-17 04:31:20 -07:00 |
|