|
|
4079084492
|
Merge pull request #1975 from rabuzarus/template_rework
Template rework for contact related pages
|
2015-10-27 08:59:03 +01:00 |
|
rabuzarus
|
4c263aa4ac
|
Merge develop into manage
Conflicts:
view/global.css
|
2015-10-25 16:57:04 +01:00 |
|
|
|
03ff349a94
|
Merge pull request #1982 from annando/1510-reduced-profile
Profile data are now reduced to only the most important fields
|
2015-10-25 16:54:24 +01:00 |
|
rabuzarus
|
bac61cf596
|
manage-selector: some cleanup and css work
|
2015-10-25 16:49:45 +01:00 |
|
Michael Vogel
|
78a8db55c6
|
Merge pull request #1981 from rabuzarus/poke
some work on poke template
|
2015-10-25 14:59:39 +01:00 |
|
rabuzarus
|
e0e6762ed8
|
some inital work to have profile pics on manage page
|
2015-10-25 14:00:08 +01:00 |
|
Michael Vogel
|
4631c13d08
|
Profile data are now reduced to only the most important fields
|
2015-10-25 09:15:36 +01:00 |
|
rabuzarus
|
8f92b6eea4
|
some work on poke template
|
2015-10-24 19:51:58 +02:00 |
|
rabuzarus
|
eb33698556
|
some minor changes in crepair.tpl
|
2015-10-24 16:01:55 +02:00 |
|
rabuzarus
|
ea2b3b2f76
|
move html from crepair.php to template
|
2015-10-24 15:57:46 +02:00 |
|
rabuzarus
|
442d59abc4
|
template rework: multi-row view for the other themes
|
2015-10-23 21:45:16 +02:00 |
|
rabuzarus
|
86f94570ef
|
template rework: delete unused templates
|
2015-10-23 16:49:12 +02:00 |
|
rabuzarus
|
0c3979720f
|
template rework: rearrange sidebar widgets for contact related pages
|
2015-10-23 00:12:00 +02:00 |
|
rabuzarus
|
2aad62190f
|
template rework: use viewcontact_template.tpl also for directory
|
2015-10-22 22:48:49 +02:00 |
|
rabuzarus
|
f9c0c1d696
|
template rework: use viewcontact_template.tpl for contact dealing pages
|
2015-10-18 17:12:48 +02:00 |
|
rabuzarus
|
4c1c614fa6
|
Merge viewcontact into template_rework
|
2015-10-17 22:28:09 +02:00 |
|
rabuzarus
|
452a3011f7
|
Merge suggest into template_rework
|
2015-10-17 22:22:52 +02:00 |
|
rabuzarus
|
dbf1f9efcd
|
Merge dirfind into template_rework
|
2015-10-17 22:22:35 +02:00 |
|
rabuzarus
|
4b8ca578d1
|
dirfind: move pagination into template
|
2015-10-17 22:09:19 +02:00 |
|
rabuzarus
|
b9d9bf8ecd
|
directory: move pagination into template
|
2015-10-17 21:45:55 +02:00 |
|
rabuzarus
|
6d559bf8a9
|
viewcontact: use section_title.tpl as headding
|
2015-10-17 21:40:41 +02:00 |
|
rabuzarus
|
9176e739a4
|
sugest.php: themeable as whole page
|
2015-10-17 21:25:21 +02:00 |
|
rabuzarus
|
72896b0f6b
|
unify directory page
|
2015-10-17 19:45:57 +02:00 |
|
rabuzarus
|
20bb16859f
|
dirfind.php: move html to templates
|
2015-10-17 00:19:01 +02:00 |
|
rabuzarus
|
6ebb21a935
|
directory.php: move html to templates
|
2015-10-16 21:44:10 +02:00 |
|
fabrixxm
|
fd8e8d005a
|
attend functionality for duepuntozero
|
2015-10-12 20:09:33 +02:00 |
|
rabuzarus
|
649578ae33
|
Merge develop-new into event-attendance-new
Conflicts:
include/conversation.php
|
2015-10-11 19:39:55 +02:00 |
|
Michael Vogel
|
efbdb57f92
|
Reworked contact relations between Friendica and Diaspora
|
2015-10-10 11:06:18 +02:00 |
|
Michael Vogel
|
607817d1b3
|
Vier: Avoid an error when calling the admin settings of "vier" when "vier" is not activated.
|
2015-10-05 17:38:57 +02:00 |
|
Michael Vogel
|
d3ac3f8490
|
Added the contact menu to the search as well.
|
2015-10-05 08:08:59 +02:00 |
|
Michael Vogel
|
72ecb9e67b
|
Bugfix: Repairing a contact was more like killing the contact ...
|
2015-10-04 19:39:55 +02:00 |
|
Michael Vogel
|
4003b9cc5d
|
Let the notification look more like the follow dialog
|
2015-10-04 17:18:58 +02:00 |
|
Michael Vogel
|
83ea4f7253
|
transfer some stuff from "follow" to the "notifications" to reduce the differences in the two dialogues.
|
2015-10-04 15:55:24 +02:00 |
|
Michael Vogel
|
d0ae5ce326
|
Show more information when following a new contact
|
2015-10-04 14:41:39 +02:00 |
|
Michael Vogel
|
42ad8c2b25
|
New template for http status messages
|
2015-10-03 23:19:09 +02:00 |
|
|
|
d6beb7db1f
|
add a header to seperate the beginning of week settings
|
2015-10-01 06:19:57 +02:00 |
|
Michael Vogel
|
389b7de451
|
Setting for the first day of the week
|
2015-09-30 19:18:13 +02:00 |
|
rabuzarus
|
7cb4ea52fd
|
port of the event attendance feature of red matrix with example implementation for vier theme.
|
2015-09-30 16:58:02 +02:00 |
|
rabuzarus
|
f5c7006f30
|
rest of the consensus porting work and integration into friendica
Credits to Mike Macgirvin for the code
|
2015-09-30 14:38:13 +02:00 |
|
Michael Vogel
|
6e981ed798
|
Merge remote-tracking branch 'upstream/develop' into 1509-i18n-events
|
2015-09-29 10:35:50 +02:00 |
|
Michael Vogel
|
c33957a6e9
|
Internationalisation of events/Move events to the navigation bar
|
2015-09-27 14:00:15 +02:00 |
|
Michael Vogel
|
25fc2c9799
|
Some changes to stay compatible to Diaspora
|
2015-09-19 14:00:33 +02:00 |
|
Michael Vogel
|
5ac38b7f99
|
There is now only one central parameter for the global directory.
|
2015-09-15 22:29:02 +02:00 |
|
Michael Vogel
|
c6d9b2da23
|
New setting for requery days
|
2015-09-05 10:54:39 +02:00 |
|
Michael Vogel
|
56ae056f1d
|
The "manage" option list is now larger.
|
2015-08-30 22:45:48 +02:00 |
|
Michael Vogel
|
6942b16ef5
|
See issue 1855. OOhembed is removed.
|
2015-08-25 19:50:23 +02:00 |
|
Michael Vogel
|
b1dddd2936
|
Only offer forum search in local mode.
|
2015-08-25 05:54:50 +02:00 |
|
|
|
26c5c7991a
|
Merge pull request #1849 from fabrixxm/issue-1841
filebrowser: link image to original picture, show error messages
|
2015-08-24 14:26:09 +02:00 |
|
fabrixxm
|
cbabac298d
|
filebrowser: link image to original picture, show error messages
|
2015-08-24 13:54:41 +02:00 |
|
Michael Vogel
|
3bca2db11b
|
Don't show search options in side bar.
|
2015-08-24 12:12:14 +02:00 |
|
