rabuzarus
|
fdda4be452
|
manage-selector: use an easier sql querry
|
2015-10-26 00:19:55 +01:00 |
|
rabuzarus
|
87c559d605
|
manage-selector: sql - check for same baseurl
|
2015-10-25 18:04:20 +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 |
|
|
|
bb4efb01a7
|
Merge pull request #1980 from annando/1510-coord-ostatus
OStatus: send the coordinates in an additional field
|
2015-10-25 16:53:17 +01:00 |
|
|
|
12d9c46ec5
|
Merge pull request #1979 from annando/1510-gnusocial
Statusnet is now GNU Social
|
2015-10-25 16:52:38 +01:00 |
|
|
|
4e78d439e2
|
Merge pull request #1978 from annando/1510-bad-servers
Workaround for bad configured servers
|
2015-10-25 16:52:10 +01:00 |
|
|
|
f84aaaea4d
|
Merge pull request #1983 from annando/1510-ejabberd-auth
Bugfix: Authorization at ejabberd only worked for uid=1
|
2015-10-25 16:51:36 +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
|
5b93bff6da
|
poke template: make use of global.css
|
2015-10-25 14:40:56 +01:00 |
|
rabuzarus
|
e0e6762ed8
|
some inital work to have profile pics on manage page
|
2015-10-25 14:00:08 +01:00 |
|
Michael Vogel
|
c7205ea705
|
Bugfix: Authorization at ejabberd only worked for uid=1
|
2015-10-25 10:17:23 +01:00 |
|
Michael Vogel
|
65403973c1
|
Merge pull request #1977 from rabuzarus/crepair
move html from crepair.php to template
|
2015-10-25 09:44:12 +01:00 |
|
Michael Vogel
|
4dd2a748b9
|
Merge pull request #1976 from rabuzarus/tabs-id
tabs have now an ID
|
2015-10-25 09:42:48 +01:00 |
|
Michael Vogel
|
4631c13d08
|
Profile data are now reduced to only the most important fields
|
2015-10-25 09:15:36 +01:00 |
|
Michael Vogel
|
a11833e248
|
Statusnet is now GNU Social
|
2015-10-24 20:44:18 +02:00 |
|
Michael Vogel
|
ecf65e52ee
|
OStatus: send the coordinates in an additional field
|
2015-10-24 20:42:47 +02:00 |
|
Michael Vogel
|
ddc8f069f2
|
Workaround for bad configured servers
|
2015-10-24 20:41:21 +02: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
|
87ecd8f658
|
tabs have now an ID
|
2015-10-24 15:04:27 +02:00 |
|
|
|
64a5b33e77
|
Merge pull request #1973 from annando/1510-ejabberd-auth
Support for additional passwords for ejabberd
|
2015-10-20 07:11:47 +02:00 |
|
Michael Vogel
|
891ad5b39d
|
Support for additional passwords for ejabberd
|
2015-10-19 19:03:11 +02:00 |
|
Michael Vogel
|
59559e7452
|
Merge pull request #1971 from tobiasd/20151019-docs
Updates to the documentations
|
2015-10-19 10:10:24 +02:00 |
|
|
|
c652aec970
|
Updates to the documentations
|
2015-10-19 07:58:13 +02:00 |
|
|
|
5317c0b28f
|
Merge pull request #1968 from annando/1510-directory-configuration
Set the new configuration for the global directory when updating
|
2015-10-18 16:08:48 +02:00 |
|
Michael Vogel
|
b75a3c8943
|
Automatically set the new configuration for the global directory when updating.
|
2015-10-17 15:26:11 +02:00 |
|
|
|
ddaacc1e53
|
Merge pull request #1965 from rabuzarus/event-attendance
fix translation bug for likers
|
2015-10-17 12:51:19 +02:00 |
|
|
|
d640128dc9
|
Merge pull request #1966 from annando/1510-event-guid
Issue 1561: Deleting events (And some other event stuff)
|
2015-10-17 12:51:09 +02:00 |
|
Michael Vogel
|
8a79e1afb3
|
The datepicker is now localised
|
2015-10-17 10:48:13 +02:00 |
|
Michael Vogel
|
8395f67351
|
Events on Diaspora now looking okay.
|
2015-10-17 09:41:58 +02:00 |
|
Michael Vogel
|
2070c96dd1
|
Changing the acl does not work when editing posts - so it is disabled for events.
|
2015-10-17 08:46:45 +02:00 |
|
Michael Vogel
|
2178be9863
|
Merge branch '1510-event-guid' of github.com:annando/friendica into 1510-event-guid
|
2015-10-17 08:29:22 +02:00 |
|
Michael Vogel
|
316276cb6d
|
Editing an item with an event is now opeing the event edit form.
|
2015-10-17 08:27:33 +02:00 |
|
Michael Vogel
|
485e65871e
|
Avoid wrong birthdays
|
2015-10-17 02:36:16 +02:00 |
|
Michael Vogel
|
7f9711ffe6
|
Delete event when the item is deleted
|
2015-10-17 01:25:25 +02:00 |
|
Michael Vogel
|
dd46a6ff68
|
Store the event when a summary or a description is set
|
2015-10-17 00:58:22 +02:00 |
|
Michael Vogel
|
fcc185a182
|
Unsure to store the guid with new events
|
2015-10-16 23:50:34 +02:00 |
|
rabuzarus
|
642f3fca1a
|
fix translation bug for likers
|
2015-10-14 19:48:57 +02:00 |
|
|
|
7ae884f132
|
Merge pull request #1964 from rebeka-catalina/FAQignoreDescr
FaQignoreDescr
|
2015-10-14 18:11:36 +02:00 |
|
rebeka-catalina
|
9817104ebc
|
Clarified description of ignore
|
2015-10-14 17:48:26 +02:00 |
|
|
|
c855c9ba67
|
Merge pull request #1963 from annando/1510-feed-warning
Avoid a warning when a feed contains no items.
|
2015-10-14 08:49:02 +02:00 |
|
Michael Vogel
|
65228e37bb
|
Avoid a warning when a feed contains no items.
|
2015-10-14 08:10:06 +02:00 |
|
|
|
a961c29d05
|
Merge pull request #1962 from annando/1510-attend-vier
Vier: Some small changes in the template for events
|
2015-10-14 06:42:50 +02:00 |
|
Michael Vogel
|
f3e1d12643
|
Merge pull request #1961 from tobiasd/20151013-typo
typo in markdown syntax
|
2015-10-13 21:42:01 +02:00 |
|
Michael Vogel
|
66ea33623b
|
Vier: Some small changes in the template for events
|
2015-10-13 20:15:01 +02:00 |
|
|
|
e47acf83d2
|
typo in markdown syntax
|
2015-10-13 18:22:45 +02:00 |
|
|
|
1e0aa4b22e
|
Merge pull request #1960 from tobiasd/20151013-deA
DE: update to the strings
|
2015-10-13 17:37:01 +02:00 |
|
