fabrixxm
|
4ec5974074
|
Merge pull request #1155 from fabrixxm/master
fix #1151, fix #1150
|
2014-09-20 12:18:48 +02:00 |
|
fabrixxm
|
f6cebf607f
|
remove unneeded htconfig templates
|
2014-09-20 12:14:59 +02:00 |
|
fabrixxm
|
f6cfdf4af1
|
remove uneeded email templates
|
2014-09-20 12:10:24 +02:00 |
|
fabrixxm
|
b95e746259
|
allow mod/view in install mode to load pcss files. Fix unstiled install
|
2014-09-20 12:09:10 +02:00 |
|
fabrixxm
|
d2afb263ae
|
Set internal PuSH server as default
|
2014-09-20 12:08:10 +02:00 |
|
fabrixxm
|
5d1c7b4e4f
|
Cleanup mods folder and remove privacy_image_cache from docs. fix #1151
|
2014-09-20 11:41:44 +02:00 |
|
fabrixxm
|
0dd3aaf82b
|
Merge pull request #1154 from fabrixxm/master
fix residual curCSS, should fix #1153
|
2014-09-20 11:26:44 +02:00 |
|
fabrixxm
|
6da5cf8037
|
fix residual curCSS, should fix #1153
|
2014-09-20 11:24:06 +02:00 |
|
fabrixxm
|
e85d7b9235
|
Merge pull request #1149 from fabrixxm/quattro_fixs
Quattro fix and other
|
2014-09-17 11:09:54 +02:00 |
|
Fabrixxm
|
133b5bca59
|
fix oembed video template
|
2014-09-17 11:02:58 +02:00 |
|
Fabrixxm
|
51e6c30188
|
add id to album name tag
this should be in template
|
2014-09-17 11:02:18 +02:00 |
|
Fabrixxm
|
f971f52482
|
remove messages link from notification tabs bar
|
2014-09-17 11:01:47 +02:00 |
|
Fabrixxm
|
fbe664cc44
|
fix settings page aside menu active item
add aside menu to delegate page
|
2014-09-17 11:00:34 +02:00 |
|
Fabrixxm
|
d1029e1fb2
|
tweak quattro theme
|
2014-09-17 10:59:19 +02:00 |
|
Fabrixxm
|
3031457c36
|
Merge branch 'Beanow-feature/collapse-menulink' into friendica/master
|
2014-09-17 08:59:01 +02:00 |
|
Fabrixxm
|
5bc69ccc70
|
remove dollar sign
|
2014-09-17 08:57:53 +02:00 |
|
Fabrixxm
|
c9a5038a7a
|
Merge branch 'feature/collapse-menulink' of https://github.com/Beanow/friendica into Beanow-feature/collapse-menulink
|
2014-09-17 08:54:46 +02:00 |
|
fabrixxm
|
50a28a6c7b
|
Merge pull request #1147 from tugelbend/master
small js bug fix, vagrant works again
|
2014-09-17 08:49:54 +02:00 |
|
Beanow
|
01b4f7d29a
|
Menu links now collapse if clicked again.
|
2014-09-16 01:21:27 +02:00 |
|
hauke
|
f68df6a9b0
|
made vagrant partly work again
|
2014-09-15 19:48:47 +02:00 |
|
hauke
|
76535578ba
|
bug fix: live function is deprecated
|
2014-09-15 19:48:17 +02:00 |
|
|
|
c78c88c266
|
Merge pull request #1144 from tobiasd/docs2014
documentation
|
2014-09-14 21:37:31 +02:00 |
|
|
|
94640d32fd
|
missing ?
|
2014-09-14 09:17:21 +02:00 |
|
|
|
de103ff273
|
added list of clients to the FAQ
|
2014-09-14 09:06:47 +02:00 |
|
|
|
d2512f5aa5
|
add API docs to home.md
|
2014-09-13 08:10:03 +02:00 |
|
|
|
9df7aeee55
|
Merge pull request #1143 from annando/master
Bugfix: "nurl" wasn't set/"remoteconnect" was missing in several templates
|
2014-09-12 06:58:41 +02:00 |
|
Michael Vogel
|
f9bec79a2c
|
In the profiles the remote connect field was missing
|
2014-09-11 23:38:24 +02:00 |
|
Michael Vogel
|
c8482ae19e
|
Bugfix: When repairing the url, the nurl wasn't set.
|
2014-09-11 23:37:55 +02:00 |
|
fabrixxm
|
dc4accf5be
|
Merge pull request #1142 from fabrixxm/quattro_update
fix quattro scroll and flash and vier flash on display page
|
2014-09-11 19:01:20 +02:00 |
|
fabrixxm
|
fd97f3013d
|
fix quattro scroll and flash and vier flash on display page
|
2014-09-11 18:56:33 +02:00 |
|
fabrixxm
|
81c2214f4f
|
Merge pull request #1140 from fabrixxm/master
Update IT strings
|
2014-09-10 19:08:07 +02:00 |
|
fabrixxm
|
df1f9d5eb7
|
Update IT strings
|
2014-09-10 19:05:43 +02:00 |
|
fabrixxm
|
c05376a53e
|
Merge pull request #1139 from fabrixxm/notifix
Override 'enotify_no_content' system option if type is SYSTEM_EMAIL
|
2014-09-10 18:33:01 +02:00 |
|
fabrixxm
|
8f2f7f8380
|
Override 'enotify_no_content' system option if type is SYSTEM_EMAIL
|
2014-09-10 18:30:30 +02:00 |
|
fabrixxm
|
c311db4420
|
Merge pull request #1138 from fabrixxm/notifix
fix some emails
|
2014-09-09 22:10:16 +02:00 |
|
fabrixxm
|
7687342849
|
fix email for
- registration request
- registration approval
- account created by admin
add a reditect after registration approval or deny
|
2014-09-09 22:07:47 +02:00 |
|
|
|
9c1ee29911
|
current API documentation from the github wiki
|
2014-09-09 08:41:58 +02:00 |
|
|
|
67bfb30f71
|
copy of the Home.md so github has an index file to show
|
2014-09-09 08:41:35 +02:00 |
|
|
|
bec92bf22e
|
Merge pull request #1136 from tobiasd/33rc
RC for 3.3
|
2014-09-07 20:43:29 +02:00 |
|
|
|
81949173c6
|
RC for 3.3
|
2014-09-07 20:41:33 +02:00 |
|
|
|
d1b1d45cc0
|
Merge pull request #1133 from tugelbend/master
added cc license to default avatar
|
2014-09-07 18:08:02 +02:00 |
|
|
|
216ad4c9fe
|
Merge pull request #1132 from tobiasd/20140907b
missing template file
|
2014-09-07 18:04:49 +02:00 |
|
hauke
|
d784e0d8a6
|
added cc license to default avatar
|
2014-09-07 18:04:35 +02:00 |
|
|
|
2234f257b6
|
missed the settings template for duepunto
|
2014-09-07 18:02:58 +02:00 |
|
|
|
e767e2d750
|
Merge pull request #1131 from fabrixxm/master
Bug fixes!
|
2014-09-07 17:52:52 +02:00 |
|
fabrixxm
|
3ac5e4508b
|
fix email to new registerd users.
fix notification in case of error sending email.
|
2014-09-07 17:46:31 +02:00 |
|
fabrixxm
|
6db73c0b6d
|
fix update routine to support update from 3.2
disable PDO support
|
2014-09-07 17:28:38 +02:00 |
|
|
|
c07e40e6e7
|
Merge pull request #1128 from Beanow/hotfix/settings-styling
Added styling to show settings headers can be clicked.
|
2014-09-07 17:15:30 +02:00 |
|
|
|
d568f2db68
|
Merge pull request #1130 from tugelbend/master
new default avatar by Andi Stadler
|
2014-09-07 17:13:47 +02:00 |
|
hauke
|
db2e20eb2e
|
Merge branch 'master' of https://github.com/friendica/friendica
|
2014-09-07 17:07:14 +02:00 |
|
