Mario Vavti
a507063174
move link to /locs to settings menu if we have more than one location and some template work on locs
2016-03-26 18:43:38 +01:00
redmatrix
77094f8d2b
make the admin side menu extensible and provide a hook for a channel "move" operation that federation plugins might use to re-establish connections after a channel move.
2016-03-19 16:17:19 -07:00
redmatrix
843cc1481a
isue #315
2016-03-08 16:46:47 -08:00
jeroenpraat
7162403292
Also make it clear with (mouse) hover text that you must click on the cover photo to show the channel/more
2016-03-06 17:02:58 +01:00
Mario Vavti
b704f977da
Merge branch 'master' of https://github.com/redmatrix/hubzilla
2016-03-03 12:08:21 +01:00
Mario Vavti
59e04aed1b
move cover-photo to template, add the ability to define a title and subtitle (defaults to channel name and addres), move js from redbasic.js to template.
2016-03-03 12:07:58 +01:00
redmatrix
436e91a1e1
rename the menu entry and page to 'Profile Fields' to maintain consistency
2016-03-02 16:39:34 -08:00
Mario Vavti
22729da2a2
Merge branch 'master' of https://github.com/redmatrix/hubzilla
2016-03-02 12:31:46 +01:00
Mario Vavti
c97cc1487c
a simple cover-photo implementation for redbasic default template
2016-03-02 12:31:25 +01:00
jeroenpraat
7206e8af3a
Small fix for deleted forum channels showing in the forum widget (had this after migration from RM on 1 or 2 channels)
2016-03-01 22:08:50 +01:00
jeroenpraat
fe392a3144
Removed export temporary from UNO. Removed 'Remove Channel' from UNO, cause a UNO member has only 1 channel, so it's logical to remove the acccount (by experience on UNO hub). Styling oauth settings.
2016-02-18 16:53:04 +01:00
redmatrix
315ce6d880
lots more zcard tweaks
2016-02-08 18:16:42 -08:00
redmatrix
7868e47643
more uno groundwork
2016-02-05 13:32:15 -08:00
redmatrix
c75f76f740
heavy lifting on admin security page
2016-02-03 20:24:46 -08:00
redmatrix
35a9a468ce
widget_item - provide ability to use the page title instead of the message_id to locate the desired item. You can use either, but the page title is often easier to use and discover.
2016-01-28 15:23:42 -08:00
redmatrix
424af13891
fix undefined variable reference in widget_item
2016-01-26 14:14:18 -08:00
Mario Vavti
97ebf9021c
bootstrapify rating and connect buttons. position the connect button more prominent right under the profile image
2016-01-21 10:42:20 +01:00
redmatrix
110ef6201e
add $deliver flag to item_store() and item_store_update() [default true]. If false, do not send any notifications or process tag_deliver. This should avoid any network activity from happening as the result of a channel (actually item) import. Other minor fixes in the handling of the $allow_exec flag and further protecting CSS passed to widgets from rogue code and XSS.
2016-01-16 14:00:22 -08:00
redmatrix
64753effd1
cover photo fetch and widget
2016-01-14 17:25:27 -08:00
Mario Vavti
e2b79c34bc
some work on connections
2016-01-14 13:50:47 +01:00
Mario Vavti
69573c6afe
some template work on follow widget
2016-01-14 10:36:45 +01:00
redmatrix
93565ea768
features management page for hubmins
2016-01-06 13:01:28 -08:00
redmatrix
374aadc97e
Provide a mechanism for a hub admin to lock features in the on or off state. Locked features will not be available in the UI on the Additional Features page to be set by members. If all features are locked, the link to the Additional Features page will not be displayed.
2016-01-04 01:02:10 -08:00
Mario Vavti
0df4f9c114
change album_id logic to make it work with ajax calls
2015-12-07 13:27:35 +01:00
Mario Vavti
69c9f4588c
make justify gallery work with more than one albums per page (eg album widget)
2015-12-07 12:13:51 +01:00
Mario Vavti
8a9d743f6f
fix rendering of unseen forum posts count
2015-12-04 10:17:13 +01:00
Mario Vavti
bcfa72ed31
move events tools to aside widget
2015-11-27 22:45:28 +01:00
Mario Vavti
ba52af786e
move today button from aside to section title
2015-11-19 11:38:34 +01:00
Mario Vavti
a17f280f7d
rename some menus
2015-11-19 00:10:32 +01:00
Mario Vavti
0c163c4d03
Merge branch 'master' of https://github.com/redmatrix/hubzilla
2015-11-18 23:51:00 +01:00
Mario Vavti
e4145deeb7
some events refacturing
2015-11-18 23:50:42 +01:00
redmatrix
106b3257e4
wsod viewing photo widget
2015-11-18 02:45:22 -08:00
redmatrix
68da4d90dc
fix admin plugin hooks
2015-11-17 20:44:57 -08:00
redmatrix
a06f7fbe2e
photo album widget permissions issue
2015-11-17 15:03:27 -08:00
redmatrix
93e5449c08
really basic photo album widget for content regions
2015-11-12 20:22:36 -08:00
Mario Vavti
43d8090182
timeago() works best with iso format. fix #118
2015-11-03 11:19:22 +01:00
Mario Vavti
26b97722c6
remove check mail - it just reloads the page. we get a notification in the panel if we get new mail
2015-10-04 13:43:16 +02:00
Mario Vavti
b97102da01
private mail: bring additional inbox/outbox views and ajaxify single message drop
2015-09-28 17:40:38 +02:00
Mario Vavti
b9723aa85b
some heavy private mail restructuring - work in progress
2015-09-24 14:07:44 +02:00
redmatrix
43e064749c
major changes to "forum mode" on the network/matrix page
2015-09-09 18:50:15 -07:00
redmatrix
4af339da63
slight hack to improve public forum detection in the forum widget
2015-09-09 18:18:27 -07:00
redmatrix
d702133ded
move mod_admin to Comanche finally
2015-09-08 20:48:35 -07:00
redmatrix
c0cb21a07c
unclosed link tags
2015-08-30 23:01:39 -07:00
redmatrix
e23f86faa9
more work on doco search
2015-08-30 22:39:33 -07:00
redmatrix
49c4aa1a54
cleanup of task widget - make jquery workflow a bit smoother
2015-08-20 20:40:42 -07:00
redmatrix
afbbc9cd72
more work on tasks
2015-08-20 18:43:01 -07:00
redmatrix
0e8991fec2
more consistent output on forum widget
2015-08-11 22:23:20 -07:00
redmatrix
b651604e8b
remove the forum limit
2015-08-11 20:58:03 -07:00
redmatrix
1932e72603
arghh
2015-08-11 20:25:52 -07:00
redmatrix
be4eb4eeb8
typo
2015-08-11 20:25:02 -07:00
redmatrix
89fa36ce2a
wrong cid
2015-08-11 20:24:06 -07:00
redmatrix
80df97e734
don't show '0' results, like notifications
2015-08-11 20:18:34 -07:00
redmatrix
8dd7fab38d
order by name
2015-08-11 20:16:17 -07:00
redmatrix
400d5790f3
make sure we only get forums attached to the channel
2015-08-11 19:58:31 -07:00
redmatrix
c8e83d6edc
set font-weight back to normal on forums widget
2015-08-11 19:27:22 -07:00
redmatrix
44dcbeaaa4
forum widget
2015-08-11 19:22:14 -07:00
redmatrix
0c23843b61
untested forum widget
2015-08-11 17:39:29 -07:00
redmatrix
15b6e8faa4
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
include/identity.php
include/widgets.php
util/messages.po
view/it/messages.po
view/it/strings.php
2015-07-19 21:08:34 -07:00
redmatrix
ec00c5b18a
the view_photos and post_photos permissions are redundant and are now mapped to view_storage and write_storage
2015-07-19 17:53:52 -07:00
redmatrix
070397ef14
make tagadelic results (including categories in wall-to-wall posts) visible to wall visitors by checking ownership rather than authorship. It is doubtful the queries will scale on redmatrix so moved forward to hubzilla tree.
2015-07-15 21:43:42 -07:00
redmatrix
964e461e09
allow plugins to provide module handlers for arbitrary modules that haven't been installed on the system.
2015-07-15 21:01:18 -07:00
redmatrix
43354ab385
inconsistent naming of block item types
2015-07-08 18:05:38 -07:00
redmatrix
6b41074396
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-07-07 16:50:25 -07:00
Mario Vavti
b50151d7bf
make directory suggest work with directory options
2015-07-07 14:46:47 +02:00
redmatrix
be0459a98b
convert the abook fields
2015-06-14 21:08:00 -07:00
redmatrix
5795e2a58b
more migration of page types
2015-05-21 22:17:17 -07:00
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
friendica
3fd2e4b716
program the affinity slider labels
2015-04-09 19:51:58 -07:00
Mario Vavti
7e7678364b
make jRange behave again
2015-04-09 10:53:37 +02:00
friendica
26a414fe4b
make network page default options work more or less universally instead of just from the navbar, and fix some saved-search weirdness related to the delete-term icon
2015-03-09 16:27:12 -07:00
friendica
22391a2437
straighten out some directory stuff, which required some Comanche structural changes
2015-03-05 18:24:49 -08:00
friendica
b4f639239f
mopping up the public site ratings
2015-02-16 11:09:12 -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
5a0ccbfcf3
forgot to add the self exclusion
2015-02-04 18:31:12 -08:00
friendica
24355430a8
allow anybody to view ratings - including oneself. Only allow authenticated folks to edit them.
2015-02-04 18:26:59 -08:00
friendica
6e84dbe493
add 'view ratings' to the widget. It's actually two stacked widgets rather than a widget with two entries. That's the only way we can keep the theming consistent with the rconnect button.
2015-02-04 18:18:04 -08:00
friendica
24b198a50c
honour the rating enable setting (which we really do need to rename since it isn't poco any more)
2015-02-04 17:34:53 -08:00
friendica
561bab4ece
remote rating and addition of rate-me to channel profile sidebar
2015-02-04 17:32:29 -08:00
friendica
3988948516
first cut at rating widget. The flaw is that it is limited because it requires local_channel() (formerly local_user()). We need to extend this to take you home like rpost does if you're logged in as remote_channel() - and/or we need zot to send the rating message to the source channel and target in addition to the directories.
2015-02-04 15:48:39 -08:00
friendica
912be23e16
Merge branch 'master' into tres
...
Conflicts:
include/group.php
include/text.php
mod/acl.php
mod/channel.php
mod/connections.php
mod/display.php
mod/group.php
mod/item.php
mod/locs.php
mod/network.php
mod/photos.php
mod/ping.php
mod/starred.php
mod/viewsrc.php
2015-01-29 15:09:35 -08:00
friendica
ff68ea6087
more message restrict conversions
2015-01-29 14:51:41 -08:00
friendica
b9a760783d
Merge https://github.com/friendica/red into pending_merge
2015-01-28 21:11:07 -08:00
friendica
e157371c39
remote_user => remote_channel
2015-01-28 20:58:59 -08:00
friendica
a496036066
local_user => local_channel
2015-01-28 20:56:04 -08:00
Habeas Codice
1a53788833
bookmarkedchats: remove extraneous group by, dupes removed on insert
...
suggestedchats: normalize to standard SQL
2015-01-28 17:37:34 -08:00
friendica
e46eba1258
heavy lifting converting item flag bits
2015-01-22 17:41:16 -08:00
friendica
ced0685d67
Change link label from Feature settings to Feature/Addon settings to more accurately describe its purpose, since we currently use it exclusively for addons (though this will not always be true).
2015-01-19 15:18:44 -08:00
Stefan Parviainen
128b0008ee
Replace jslider with jRange
2015-01-05 18:30:12 +01:00
friendica
2e990743e7
Merge https://github.com/friendica/red into pending_merge
2014-12-15 14:37:57 -08:00
friendica
f28103d595
wall tags
2014-12-15 14:37:31 -08:00
Thomas Willingham
c6d0695edf
Issue #743
2014-12-15 19:32:28 +00:00
Klaus Weidenbach
63646a1440
Some Doxygen comments and small cleanups.
2014-12-07 19:27:14 +01:00
Thomas Willingham
f1367cb9f9
Missing include if photo album widget called from not-the-photos page.
2014-12-04 21:52:22 +00:00
friendica
53dc9cf2eb
basic vcalendar formatting support
2014-11-23 20:29:34 -08:00
friendica
b16f938830
random block widget
2014-11-22 12:26:04 -08:00
friendica
f17ef6aa90
allow the photo_rand widget to access photos from any channel (useful if the widget is used in sys-generated pages). You still need permission.
2014-11-20 19:33:08 -08:00
friendica
afd8b2ddf2
random photo widget
2014-11-20 15:34:49 -08:00
Habeas Codice
ac27db22c1
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
boot.php
include/dba/dba_driver.php
include/diaspora.php
include/follow.php
include/session.php
include/zot.php
mod/photos.php
mod/ping.php
2014-11-13 13:06:31 -08:00
Habeas Codice
1a5a5c7edb
PostgreSQL support initial commit
...
There were 11 main types of changes:
- UPDATE's and DELETE's sometimes had LIMIT 1 at the end of them. This is not only non-compliant but
it would certainly not do what whoever wrote it thought it would. It is likely this mistake was just
copied from Friendica. All of these instances, the LIMIT 1 was simply removed.
- Bitwise operations (and even some non-zero int checks) erroneously rely on MySQL implicit
integer-boolean conversion in the WHERE clauses. This is non-compliant (and bad programming practice
to boot). Proper explicit boolean conversions were added. New queries should use proper conventions.
- MySQL has a different operator for bitwise XOR than postgres. Rather than add yet another dba_
func, I converted them to "& ~" ("AND NOT") when turning off, and "|" ("OR") when turning on. There
were no true toggles (XOR). New queries should refrain from using XOR when not necessary.
- There are several fields which the schema has marked as NOT NULL, but the inserts don't specify
them. The reason this works is because mysql totally ignores the constraint and adds an empty text
default automatically. Again, non-compliant, obviously. In these cases a default of empty text was
added.
- Several statements rely on a non-standard MySQL feature
(http://dev.mysql.com/doc/refman/5.5/en/group-by-handling.html ). These queries can all be rewritten
to be standards compliant. Interestingly enough, the newly rewritten standards compliant queries run
a zillion times faster, even on MySQL.
- A couple of function/operator name translations were needed (RAND/RANDOM, GROUP_CONCAT/STRING_AGG,
UTC_NOW, REGEXP/~, ^/#) -- assist functions added in the dba_
- INTERVALs: postgres requires quotes around the value, mysql requires that there are not quotes
around the value -- assist functions added in the dba_
- NULL_DATE's -- Postgres does not allow the invalid date '0000-00-00 00:00:00' (there is no such
thing as year 0 or month 0 or day 0). We use '0001-01-01 00:00:00' for postgres. Conversions are
handled in Zot/item packets automagically by quoting all dates with dbescdate().
- char(##) specifications in the schema creates fields with blank spaces that aren't trimmed in the
code. MySQL apparently treats char(##) as varchar(##), again, non-compliant. Since postgres works
better with text fields anyway, this ball of bugs was simply side-stepped by using 'text' datatype
for all text fields in the postgres schema. varchar was used in a couple of places where it actually
seemed appropriate (size constraint), but without rigorously vetting that all of the PHP code
actually validates data, new bugs might come out from under the rug.
- postgres doesn't store nul bytes and a few other non-printables in text fields, even when quoted.
bytea fields were used when storing binary data (photo.data, attach.data). A new dbescbin() function
was added to handle this transparently.
- postgres does not support LIMIT #,# syntax. All databases support LIMIT # OFFSET # syntax.
Statements were updated to be standard.
These changes require corresponding changes in the coding standards. Please review those before
adding any code going forward.
Still on my TODO list:
- remove quotes from non-reserved identifiers and make reserved identifiers use dba func for quoting
- Rewrite search queries for better results (both MySQL and Postgres)
2014-11-13 12:21:58 -08:00
friendica
b5af667985
slow progress on sys publishing, making sure all the data we need is in the places we need it but validate it anyway
2014-11-11 19:29:30 -08:00
friendica
4057e82bb4
category tagblock
2014-11-06 01:24:04 -08:00
friendica
d5d6158973
ok heads up - potentially destabilising change. I've tried to sort out all the default connection permissions for those who don't have a predefined (or therefore have a "custom") permissions role. Unfortunately this includes most people that were using this software more than a month ago. The real changes are that the SELF address book entry no longer holds "auto-permissions" but instead holds your "default permissions" (if you have a pre-defined role, the defaults will be pulled from the role table).
...
The auto permissions have moved to a pconfig (uid.system.autoperms). A DB update will move these settings into their new homes.
What used to be the "Auto-permissions settings" page is now the "default permissions settings" page and a checkbox therein decides whether or not to apply the permissions automatically. A link to this page will only be shown when you have the "custom" role selected.
With luck nobody will notice anything wrong. But at least for the next few days, please review permissions that have been assigned to new connections (either automatically or manually) and make sure they make sense (e.g. they aren't "nothing"). You still need to take action when seeing a message "permissions have changed but not yet submitted" as we always let you review and perhaps adjust the settings _before_ a connection is established (unless you have autoperms turned on).
2014-11-04 17:11:02 -08:00
friendica
a6d8c3193a
various UI issues related to having an enormous number of entries in the posted_date selector including years/months that had no posts
2014-11-03 14:49:03 -08:00
friendica
655c3e1b47
put privacy role selector in settings page. Change visibility of various permissions items accordingly.
2014-10-26 19:32:12 -07:00
marijus
21eae4df9c
porting more widgets to bs nav-pills
2014-10-07 18:11:36 +02:00
friendica
5f9c326ad7
channel export with items
2014-09-15 21:31:32 -07:00
friendica
82eb265a20
add collections widget to connections page - and some more work on realms
2014-08-17 17:48:41 -07:00
friendica
737d3f5836
don't add a birthday event if the birthday channel doesn't have permission to send you posts.
2014-06-03 19:25:59 -07:00
friendica
97a4479513
don't provide a second (actually third counting the navbar) search box on the search page if you've got saved searches turned on. This should solve some problems with duplicate html id's (and save wasn't working anyway). If you don't have saved search ability (which will provide a saved search widget in the sidebar), provide a simple search box in the main content region but without save ability.
2014-06-03 18:19:27 -07:00
friendica
17e575e1eb
don't show app editing options to non-authenticated folks
2014-06-01 22:15:21 -07:00
friendica
751fda9704
more app work
2014-05-21 20:54:09 -07:00
friendica
fc0967b84b
most of the remaining apps basic infrastructure except a form to create the things. Don't let this fool you - there is still a lot of work, but there isn't a whole lot of work to create a demo; in fact you can demo it now.
2014-05-20 18:08:49 -07:00
friendica
2fdc13e91d
some sidebar content (doesn't yet do anything)
2014-05-15 20:20:20 -07:00
friendica
2f1e4a6370
xss prevention
2014-05-14 00:55:32 -07:00
friendica
b0dc3d3b4c
add photo widget
2014-05-13 21:33:39 -07:00
friendica
b666aca5c3
bring the posted-date selector widget up to date. There are no longer two different styles.
2014-05-01 17:54:12 -07:00
friendica
506ae56385
Better handling of restricted /channel and /profile permissions. We will show the name, profile photo and a 'connect' button if appropriate on these pages regardless of permissions. A blank page makes it difficult for folks to figure out how to connect and if it is their real life friend 'x' or not. It also matches our overall policy (adopted from Facebook's lessons learned) that the channel name and default profile photo are always visible and can't really be blocked without messing up the usability of the entire network. This also makes sure that a connect button can be found somewhere besides the directory - where the entry could be blocked; and avoid somebody having to figure out the webbie and find the link to "follow" (another related issue).
2014-04-14 16:45:16 -07:00
friendica
34eb79e6ba
provide 'style' option to archive widget to choose between 'select' and 'list' format
2014-03-23 16:20:44 -07:00
friendica
d58abc0230
add clock widget and correct some doco
2014-03-05 04:28:48 -08:00
friendica
12480a13cd
item widget - displays one (webpage) item by mid. This is how you could put multiple content blobs on a page without turning them all into blocks.
2014-03-03 18:20:52 -08:00
friendica
102521844b
put schemas in Comanche (this requires theme support (!))
2014-02-27 20:48:10 -08:00
friendica
d2bc7c606a
minor fixes to suggested chatrooms
2014-02-27 17:10:26 -08:00
friendica
642da17b86
chatroom suggestions
2014-02-27 17:07:11 -08:00
friendica
e12f6f1bd9
small changes to a couple of lookup functions which we need to use a bit more
2014-02-20 17:20:24 -08:00
marijus
18b2ff9c24
whitespace
2014-02-12 21:36:20 +01:00
marijus
e06d9e97c5
make chatrooms in /chat/channel visible to observers aswell
2014-02-12 21:31:11 +01:00
friendica
080928f214
chatroom management front-end stuff
2014-01-29 21:29:48 -08:00
friendica
677f5f641e
more testing of chatroom interfaces, also corrected a function call that should have been a class instantiation in reddav
2014-01-29 16:02:02 -08:00
friendica
9f54675702
chatroom list widget backend
2014-01-29 01:52:23 -08:00
Thomas Willingham
331609cb87
vcard widget needs to include Contact if it's not included from the module that calls it.
2014-01-18 18:38:53 +00:00
friendica
0366991b45
appears that I missed a few files for Comanchification. so here's mitem.
2013-12-22 02:04:55 -08:00
friendica
d32bbaf599
split private messages into two modules - "message" is just for message lists, "mail" is for reading and writing conversations. This is so we can Comanchify it cleanly.
2013-12-21 23:47:44 -08:00
friendica
aa312f72bf
comanchify mod_directory. Two modules remaining. Actually three because message needs to be split.
2013-12-20 12:43:04 -08:00
friendica
2c0fbc508e
comanchify connedit, group
2013-12-19 23:56:37 -08:00
friendica
564f431551
comanchificate mod_photos
2013-12-19 17:36:31 -08:00
friendica
b28a37c38e
more comanche
2013-12-19 02:25:44 -08:00
friendica
125543aded
more comanche migration
2013-12-19 02:16:14 -08:00
friendica
38fd8410eb
split off mod_connections into mod_connections & mod_connedit - lots of links to fix
2013-12-18 01:00:08 -08:00
friendica
c00f0d4b28
a couple more comanche conversions
2013-12-14 13:26:40 -08:00
friendica
303324cdff
more htmlspecialchars sanitisation
2013-12-12 02:15:02 -08:00
friendica
18f0ab2605
cmax wasn't defaulting correctly
2013-12-11 19:56:57 -08:00
friendica
b4e1e8a4a4
The affinity tool is not a "traditional" widget. But it is nevertheless a widget. It just makes fewer page layout decisions which are hard-coded. If you want to shrink it down and put it on the sidebar in your theme, go for it.
2013-12-11 19:43:41 -08:00
marijus
aea1e1af82
this makes quotes appear as quotes in notes once page is reloaded. i guess thats fine since we use escape_tags() in notes.php
2013-12-11 18:57:42 +01:00
marijus
1d8c15f2df
make suggest channels a feature
2013-12-11 12:01:28 +01:00
friendica
e5ea4a009b
mod channel is now Comanchified
2013-12-10 20:36:11 -08:00
friendica
e873f6e95e
we're almost ready to turn on comanche for mod_network. All the widgets are done.
2013-12-10 00:05:31 -08:00
friendica
ed9f108722
comanchify the savedsearch widget
2013-12-09 21:20:55 -08:00
friendica
251720bfd3
turn private notes into a feature
2013-12-09 18:54:50 -08:00
friendica
f85cba10eb
notes widget
2013-12-09 15:27:46 -08:00
friendica
d8c632ada2
more comanchisation (I declare this to be a word)
2013-12-09 00:41:49 -08:00
