friendica
|
115c8a53bf
|
issue546 via Tobias
|
2013-04-23 18:58:52 -07:00 |
|
friendica
|
f090564f0f
|
Merge https://github.com/friendica/friendica into pull
|
2013-04-23 18:51:50 -07:00 |
|
friendica
|
f4b3cf980d
|
rev update
|
2013-04-23 18:51:35 -07:00 |
|
friendica
|
eef66da145
|
Merge pull request #669 from fabrixxm/templateengine
Use smarty3 as default template engine
|
2013-04-23 04:56:39 -07:00 |
|
Fabrixxm
|
4dc72742ae
|
remove unneeded files
|
2013-04-23 07:52:36 -04:00 |
|
Fabrixxm
|
379c761c3f
|
missing "templates" folders
|
2013-04-23 07:47:57 -04:00 |
|
Fabrixxm
|
d36292c532
|
template: set smarty3 as default template engine in theme info array.
remove commented code from get_markup_template.
add check for $root/$filename in get_template_file.
|
2013-04-23 03:35:31 -04:00 |
|
Fabrixxm
|
6fddd1cbbf
|
template: remove old 'internal' template files, move smarty3 templates into 'templates' subdir
|
2013-04-23 03:35:31 -04:00 |
|
Fabrixxm
|
ddf1caf0fd
|
template engine rework
- use smarty3 as default engine
- new pluggable template engine system
|
2013-04-23 03:27:52 -04:00 |
|
friendica
|
a34b1ceb3a
|
Merge https://github.com/friendica/friendica into pull
|
2013-04-21 16:07:26 -07:00 |
|
friendica
|
bc68892cf9
|
rev update
|
2013-04-21 16:07:02 -07:00 |
|
fabrixxm
|
ce23f9cd7b
|
Merge pull request #667 from fabrixxm/bug557
drop items to group pages if no mentions in it. should fix bug 557
|
2013-04-20 00:45:44 -07:00 |
|
Fabrixxm
|
dd02b7bd00
|
drop items to group pages if no mentions in it. should fix bug 557
|
2013-04-19 09:55:07 -04:00 |
|
friendica
|
65e0cbd730
|
Merge https://github.com/friendica/friendica into pull
|
2013-04-19 04:52:20 -07:00 |
|
friendica
|
a13e7b8a38
|
rev update
|
2013-04-19 04:51:43 -07:00 |
|
fermionic
|
d861225d40
|
Merge pull request #666 from fermionic/20130418-frost-mobile-password-check
update mobile theme settings pages
|
2013-04-18 18:48:38 -07:00 |
|
Zach Prezkuta
|
78e747016f
|
update mobile theme settings pages
|
2013-04-18 19:47:27 -06:00 |
|
fermionic
|
44f4b9a29f
|
Merge pull request #665 from tobiasd/foreach_arg
invalid arguments for a foreach loop found
|
2013-04-18 18:37:39 -07:00 |
|
fermionic
|
7b342d7297
|
Merge pull request #664 from tobiasd/issue_554
Issue 554
|
2013-04-18 18:37:11 -07:00 |
|
|
|
960d1d99b2
|
invalid arguments for a foreach loop found
|
2013-04-17 17:32:31 +02:00 |
|
|
|
b6d1a1f125
|
tabwidth
|
2013-04-14 18:19:01 +02:00 |
|
|
|
4dd406055c
|
check password when changing users email
|
2013-04-14 17:58:16 +02:00 |
|
|
|
7be1040a63
|
DE: update to the strings
|
2013-04-14 17:26:23 +02:00 |
|
|
|
5827db0ea3
|
check current password before changing the password
|
2013-04-14 17:22:42 +02:00 |
|
fabrixxm
|
d905f0a3e3
|
Merge pull request #663 from fabrixxm/moveme
uimport: remove db scheme version check
|
2013-04-08 06:17:51 -07:00 |
|
Fabrixxm
|
659d0cc1b8
|
uimport remove db scheme version check
|
2013-04-08 09:03:31 -04:00 |
|
friendica
|
8b4fa33c5e
|
Merge pull request #662 from fermionic/20130407-display-own-post
allow visiting other people's display/ links if I have a copy of the post
|
2013-04-07 16:05:10 -07:00 |
|
Zach Prezkuta
|
2cc73dbef3
|
allow visiting other people's display/ links if I have a copy of the post
|
2013-04-07 11:38:37 -06:00 |
|
|
|
17ca6290f5
|
DE: update to the strings
|
2013-04-06 08:25:33 +02:00 |
|
fermionic
|
dddb0570c5
|
Merge pull request #661 from fermionic/20130404-update-frost-decaf
update admin options for frost, frost mobile, and decaf mobile
|
2013-04-04 15:43:47 -07:00 |
|
Zach Prezkuta
|
2316e0d731
|
update admin options for frost, frost mobile, and decaf mobile
|
2013-04-04 16:42:39 -06:00 |
|
friendica
|
61bff09ecd
|
Merge https://github.com/friendica/friendica into pull
|
2013-04-04 15:13:06 -07:00 |
|
friendica
|
9660117c70
|
sync username when changed in either the default profile or the settings page
|
2013-04-04 15:10:14 -07:00 |
|
|
|
bee80004db
|
DE: update to the strings
|
2013-04-04 17:27:49 +02:00 |
|
friendica
|
1e54f0022f
|
Merge pull request #660 from fabrixxm/moveme
uimport: check table columns before import
|
2013-04-03 17:36:40 -07:00 |
|
friendica
|
8b51ffefc0
|
Merge https://github.com/friendica/friendica into pull
|
2013-04-03 16:29:13 -07:00 |
|
friendica
|
db0bb50e37
|
rev update
|
2013-04-03 16:28:49 -07:00 |
|
|
|
e77521c42f
|
PL: update to the strings
|
2013-04-03 09:28:37 +02:00 |
|
Fabrixxm
|
1442fecd14
|
uimport: fix file formatting
|
2013-04-02 09:44:19 -04:00 |
|
Fabrixxm
|
13e315e004
|
uimport: check table columns before import
|
2013-04-02 09:16:24 -04:00 |
|
|
|
dbc4371391
|
Merge pull request #659 from mexon/fetch_url_content_type
Make the content type available after calling fetch_url
|
2013-04-02 00:17:28 -07:00 |
|
pixelroot
|
ee07251d38
|
modified: view/theme/smoothly/style.css
modified: view/theme/smoothly/theme.php
|
2013-04-01 19:36:22 +02:00 |
|
Matthew Exon
|
5b158dbcfb
|
Make the content type available after calling fetch_url
|
2013-04-01 12:36:43 +08:00 |
|
|
|
cda327a368
|
Merge pull request #658 from annando/master
Mail importing problems, a small "vier" change
|
2013-03-30 01:46:13 -07:00 |
|
Michael Vogel
|
eabefb2f04
|
vier: The background color of the right area is now white.
|
2013-03-29 11:18:20 +01:00 |
|
|
|
ad48ab2928
|
DE: update to the strings
|
2013-03-28 07:49:58 +01:00 |
|
friendica
|
74954e6c68
|
Merge pull request #656 from fabrixxm/master
phpdocs for include/text.php
|
2013-03-27 19:44:24 -07:00 |
|
friendica
|
1eb56116e8
|
Merge pull request #657 from mexon/cron_lock
Add separate lock file for cronhooks, which might also take a long time ...
|
2013-03-27 19:41:59 -07:00 |
|
Matthew Exon
|
c3621407d1
|
Remove debug line added by mistake
|
2013-03-28 10:29:27 +08:00 |
|
Matthew Exon
|
10b68ef837
|
Add separate lock file for cronhooks, which might also take a long time and shouldn't be allowed to interfere with itself
|
2013-03-28 09:49:10 +08:00 |
|
