30b658c429
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
slackr - better highlighting of current selections
slackr - knock the sharp edges off the events calendar
rev update
* master:
10 years ago
19bf0aa283
slackr - better highlighting of current selections
10 years ago
5b7865f8f9
slackr - knock the sharp edges off the events calendar
10 years ago
8bc8be1f87
Merge https://github.com/friendica/friendica into pull
10 years ago
6bcfda6d53
rev update
10 years ago
1d56ec3c7a
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
Update install wizard - writable .htconfig.php not required - add test for working .htaccess/mod_rewrite configuration - fix last pass: create tables, eventually show config text and print a "What next" section
* master:
10 years ago
5acd0a1c32
Merge pull request #309 from fabrixxm/master
...
Update install wizard
10 years ago
8cec510b73
Merge pull request #311 from simonlnu/master
...
clean up and fixing things
10 years ago
5198260e3a
clean up and make nice the dispy photo edit stuff
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
10 years ago
fb50727f8d
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
10 years ago
da67269468
Merge pull request #310 from simonlnu/master
...
add a placeholder attribute on #search-text; dispy fixes
10 years ago
789063da39
add a placeholder attribute on search-text; dispy fixes
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
10 years ago
3aa516ccab
Merge remote branch 'upstream/master'
10 years ago
325343a492
Update install wizard
...
- writable .htconfig.php not required
- add test for working .htaccess/mod_rewrite configuration
- fix last pass: create tables, eventually show config text and print a "What next" section
10 years ago
bd12902d7b
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
photo rotation
event calendar theming
import quattro event reminder
mark bubbles unsupported
keep FB out of private notes
clear submanage, etc from session on logout
if identity (uid) changes - reload any other open browser windows on next ping.
* master:
10 years ago
61dba985c1
photo rotation
10 years ago
8ffb65ceef
event calendar theming
10 years ago
86a38cca24
import quattro event reminder
10 years ago
af495879af
mark bubbles unsupported
10 years ago
3ac7c4e859
keep FB out of private notes
10 years ago
0da20ec9ef
Merge https://github.com/friendica/friendica into pull
10 years ago
b43b680802
clear submanage, etc from session on logout
10 years ago
e56af0e09e
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
Oops - but lets commit the right revision, sorry. There's a spare line in the last one.
Fix darkzero/ns BB icon background colours.
cause of bogus wall-to-wall posts found
add queue totals to admin summary page
DE: update to the strings and some mail templates
fix setting array values to config items
redir links for permission controlled attachments
* master:
10 years ago
e70573f34c
if identity (uid) changes - reload any other open browser windows on next ping.
10 years ago
b962559570
Oops - but lets commit the right revision, sorry. There's a spare line in the last one.
10 years ago
18983bb932
Fix darkzero/ns BB icon background colours.
10 years ago
3ce06caeed
cause of bogus wall-to-wall posts found
10 years ago
f29f861d25
add queue totals to admin summary page
10 years ago
Tobias Diekershoff
be64437b14
DE: update to the strings and some mail templates
10 years ago
Tobias Diekershoff
30f3a16874
Merge branch 'master' of https://github.com/friendica/friendica
10 years ago
Tobias Diekershoff
5dad99888d
fix setting array values to config items
10 years ago
e9c86c0fd0
Merge remote branch 'upstream/master'
10 years ago
02502c3a74
Merge https://github.com/friendica/friendica into pull
10 years ago
a163825291
redir links for permission controlled attachments
10 years ago
2320a3e549
Merge pull request #308 from simonlnu/master
...
fix (mini-)search-text text
10 years ago
d466c9ab08
fix (min-)search-text text
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
10 years ago
c95eb69997
Merge pull request #307 from simonlnu/master
...
updates to dispy family; fix typo in INSTALL.txt
10 years ago
bd3c0edf34
updates to dispy family; fix typo in INSTALL.txt
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
10 years ago
867e3b33d1
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
rev update, bug 428, 429, and ability to block globaldir submissions from demo sites
* master:
10 years ago
9ca3ac6e61
Merge https://github.com/friendica/friendica into pull
10 years ago
54e2c1ca81
rev update, bug 428, 429, and ability to block globaldir submissions from demo sites
10 years ago
f570965ebe
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
10 years ago
997d88b449
Merge pull request #306 from simonlnu/master
...
more light fixes
10 years ago
627367e1ee
more light fixes
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
10 years ago
f982a8b3e5
Merge pull request #305 from simonlnu/master
...
fix dumb mistake in light
10 years ago
cb2702249f
fix dumb mistake in light
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
10 years ago
f65d8e50be
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
rev update
* master:
10 years ago
71fe343324
Merge https://github.com/friendica/friendica into pull
10 years ago
afaf9ec74f
rev update
10 years ago
34423e4b32
Merge pull request #303 from simonlnu/master
...
fix brown paper bag with dispy light
10 years ago
Simon L'nu
friendica
Simon
zottel
root
Thomas Willingham
Tobias Diekershoff