friendica
|
6679734135
|
Merge branch 'master' into tres
Conflicts:
include/Contact.php
include/ItemObject.php
include/api.php
include/attach.php
include/diaspora.php
include/dir_fns.php
include/enotify.php
include/event.php
include/expire.php
include/items.php
include/notifier.php
include/notify.php
include/photos.php
include/taxonomy.php
include/text.php
include/widgets.php
include/zot.php
mod/admin.php
mod/channel.php
mod/dirsearch.php
mod/display.php
mod/editwebpage.php
mod/events.php
mod/home.php
mod/item.php
mod/manage.php
mod/mood.php
mod/network.php
mod/page.php
mod/photos.php
mod/ping.php
mod/post.php
mod/thing.php
mod/viewsrc.php
view/css/mod_events.css
|
2015-04-23 19:49:41 -07:00 |
|
Mario Vavti
|
b59e2870ab
|
Move bootstrap dependencies (tagsinput) to theme redbasic (we only have it there). Comment out some most probably deprecated js includes. Some css cleanup.
|
2015-03-27 11:52:59 +01:00 |
|
friendica
|
0837e67a53
|
minor tweak on event form
|
2015-03-26 21:03:54 -07:00 |
|
friendica
|
b1f2c29a96
|
bring event form into line with other forms
|
2015-03-26 20:56:05 -07:00 |
|
friendica
|
ed810a360f
|
event form - provide map ability for location field and add preview ability
|
2015-02-09 15:57:22 -08:00 |
|
friendica
|
08b757a22c
|
Merge branch 'master' into tres
Conflicts:
mod/events.php
view/css/mod_events.css
|
2015-02-08 20:57:37 -08:00 |
|
friendica
|
69894e28c4
|
we still need an event preview but this looks a lot better.
|
2015-02-08 20:23:02 -08:00 |
|
friendica
|
4b348d2489
|
Merge branch 'master' into tres
Conflicts:
view/css/mod_events.css
view/theme/redbasic/css/style.css
|
2015-02-05 19:38:43 -08:00 |
|
friendica
|
abcc70722c
|
event form cleanup backported from trinidad - still need to style the checkboxes
|
2015-02-05 19:37:55 -08:00 |
|
friendica
|
4ead2cd79d
|
final cleanup on ratings feature
|
2015-02-03 21:19:29 -08:00 |
|
friendica
|
4a243b63f7
|
cleanup event form and various required indicators on inputs
|
2015-01-29 20:09:48 -08:00 |
|
friendica
|
ed847a91f6
|
add categories to events
|
2014-09-07 22:14:28 -07:00 |
|
friendica
|
22b79207f9
|
event form hard-wired tinymce=on, made selectable
|
2014-05-08 19:59:26 -07:00 |
|