Tim Almdal f2ed1eeab2 Merge branch 'master' into talmdal_dev ...

Conflicts:
	modules/rest/controllers/rest.php

2010-03-31 07:14:06 -07:00

..

controllers

Merge branch 'master' into talmdal_dev

2010-03-31 07:14:06 -07:00

helpers

Rename "access_token" to "access_key" in the code for consistency.

2010-03-30 14:01:40 -07:00

libraries

Update the copyright to 2010. It's only 3 months into the year :-)

2010-03-03 10:15:34 -08:00

models

Rename "user_access_tokens" table to "user_access_keys" as step 1 of a

2010-03-30 13:53:14 -07:00

tests

Rename "access_token" to "access_key" in the code for consistency.

2010-03-30 14:01:40 -07:00

views

Do all the html::clean|purify calls in the views and not the controller. Also clean the subject line and email message body of the contact user email.

2010-01-28 07:44:58 -08:00

module.info

Rename "user_access_tokens" table to "user_access_keys" as step 1 of a

2010-03-30 13:53:14 -07:00