friendica
5b7865f8f9
slackr - knock the sharp edges off the events calendar
2012-05-23 15:55:09 -07:00
friendica
8bc8be1f87
Merge https://github.com/friendica/friendica into pull
2012-05-23 15:46:49 -07:00
friendica
6bcfda6d53
rev update
2012-05-23 15:46:04 -07:00
Simon
5acd0a1c32
Merge pull request #309 from fabrixxm/master
...
Update install wizard
2012-05-23 15:10:24 -07:00
Simon
8cec510b73
Merge pull request #311 from simonlnu/master
...
clean up and fixing things
2012-05-23 15:08:43 -07:00
Simon L'nu
5198260e3a
clean up and make nice the dispy photo edit stuff
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-23 18:06:49 -04:00
Simon L'nu
fb50727f8d
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
2012-05-23 18:04:23 -04:00
Simon
da67269468
Merge pull request #310 from simonlnu/master
...
add a placeholder attribute on #search-text; dispy fixes
2012-05-23 13:05:10 -07:00
Simon L'nu
789063da39
add a placeholder attribute on search-text; dispy fixes
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-23 15:58:22 -04:00
root
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
2012-05-23 07:38:31 -04:00
Simon L'nu
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:
2012-05-23 05:03:05 -04:00
friendica
61dba985c1
photo rotation
2012-05-23 01:01:04 -07:00
friendica
8ffb65ceef
event calendar theming
2012-05-22 22:34:35 -07:00
friendica
86a38cca24
import quattro event reminder
2012-05-22 22:06:52 -07:00
friendica
af495879af
mark bubbles unsupported
2012-05-22 21:54:19 -07:00
friendica
3ac7c4e859
keep FB out of private notes
2012-05-22 21:20:31 -07:00
friendica
0da20ec9ef
Merge https://github.com/friendica/friendica into pull
2012-05-22 18:06:34 -07:00
friendica
b43b680802
clear submanage, etc from session on logout
2012-05-22 18:05:58 -07:00
Simon L'nu
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:
2012-05-22 19:49:03 -04:00
friendica
e70573f34c
if identity (uid) changes - reload any other open browser windows on next ping.
2012-05-22 16:01:07 -07:00
Thomas Willingham
b962559570
Oops - but lets commit the right revision, sorry. There's a spare line in the last one.
2012-05-22 19:19:36 +01:00
Thomas Willingham
18983bb932
Fix darkzero/ns BB icon background colours.
2012-05-22 19:14:58 +01:00
friendica
3ce06caeed
cause of bogus wall-to-wall posts found
2012-05-22 03:55:11 -07:00
friendica
f29f861d25
add queue totals to admin summary page
2012-05-22 03:44:03 -07:00
Tobias Diekershoff
be64437b14
DE: update to the strings and some mail templates
2012-05-22 12:17:01 +02:00
Tobias Diekershoff
30f3a16874
Merge branch 'master' of https://github.com/friendica/friendica
2012-05-22 11:57:19 +02:00
Tobias Diekershoff
5dad99888d
fix setting array values to config items
2012-05-22 11:56:49 +02:00
friendica
02502c3a74
Merge https://github.com/friendica/friendica into pull
2012-05-21 22:56:39 -07:00
friendica
a163825291
redir links for permission controlled attachments
2012-05-21 22:54:39 -07:00
Simon
2320a3e549
Merge pull request #308 from simonlnu/master
...
fix (mini-)search-text text
2012-05-21 18:39:50 -07:00
Simon L'nu
d466c9ab08
fix (min-)search-text text
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-21 21:38:53 -04:00
Simon
c95eb69997
Merge pull request #307 from simonlnu/master
...
updates to dispy family; fix typo in INSTALL.txt
2012-05-21 18:30:36 -07:00
Simon L'nu
bd3c0edf34
updates to dispy family; fix typo in INSTALL.txt
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-21 21:29:18 -04:00
Simon L'nu
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:
2012-05-21 21:23:40 -04:00
friendica
9ca3ac6e61
Merge https://github.com/friendica/friendica into pull
2012-05-21 16:43:07 -07:00
friendica
54e2c1ca81
rev update, bug 428, 429, and ability to block globaldir submissions from demo sites
2012-05-21 16:40:11 -07:00
Simon L'nu
f570965ebe
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
2012-05-21 06:50:00 -04:00
Simon
997d88b449
Merge pull request #306 from simonlnu/master
...
more light fixes
2012-05-21 03:49:46 -07:00
Simon L'nu
627367e1ee
more light fixes
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-21 06:48:08 -04:00
Simon
f982a8b3e5
Merge pull request #305 from simonlnu/master
...
fix dumb mistake in light
2012-05-20 23:49:59 -07:00
Simon L'nu
cb2702249f
fix dumb mistake in light
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-21 02:47:43 -04:00
Simon L'nu
f65d8e50be
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
rev update
* master:
2012-05-21 00:36:38 -04:00
friendica
71fe343324
Merge https://github.com/friendica/friendica into pull
2012-05-20 18:30:52 -07:00
friendica
afaf9ec74f
rev update
2012-05-20 18:30:02 -07:00
Simon
34423e4b32
Merge pull request #303 from simonlnu/master
...
fix brown paper bag with dispy light
2012-05-20 11:38:25 -07:00
Simon L'nu
2ac55c9f21
fix dispy light
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-20 14:37:20 -04:00
Simon L'nu
18d4cf0583
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
search with leading @ performs directory search (# for tag search), nothing for text search
Darkzero-NS + 'Friendicaland' countries.
set comment permissions explicitly to parent permissions
* master:
2012-05-20 14:33:15 -04:00
friendica
f16a119940
search with leading @ performs directory search (# for tag search), nothing for text search
2012-05-19 21:53:27 -07:00
Thomas Willingham
c6104fb856
Darkzero-NS + 'Friendicaland' countries.
2012-05-20 01:44:07 +01:00
friendica
266512e801
Merge https://github.com/friendica/friendica into pull
2012-05-19 17:22:00 -07:00
