Merge branch '1.0.x' into people_tags_rebase

[quix0rs-gnu-social.git] / lib / framework.php

diff --git a/lib/framework.php b/lib/framework.php
index 70987e086c025090634078ef7b4938cceee3d7e3..4b99d296a205a89107dee681264dca785a074794 100644 (file)
--- a/lib/framework.php
+++ b/lib/framework.php
@@ -19,10 +19,13 @@
 
 if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
-define('STATUSNET_VERSION', '0.9.6');
+define('STATUSNET_BASE_VERSION', '1.0.0');
+define('STATUSNET_LIFECYCLE', 'dev'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release'
+define('STATUSNET_VERSION', STATUSNET_BASE_VERSION . STATUSNET_LIFECYCLE);
+
 define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility
 
-define('STATUSNET_CODENAME', 'Man on the Moon');
+define('STATUSNET_CODENAME', 'The Sounds of Science');
 
 define('AVATAR_PROFILE_SIZE', 96);
 define('AVATAR_STREAM_SIZE', 48);
@@ -30,6 +33,7 @@ define('AVATAR_MINI_SIZE', 24);
 
 define('NOTICES_PER_PAGE', 20);
 define('PROFILES_PER_PAGE', 20);
+define('MESSAGES_PER_PAGE', 20);
 
 define('FOREIGN_NOTICE_SEND', 1);
 define('FOREIGN_NOTICE_RECV', 2);
@@ -42,6 +46,7 @@ define('NOTICE_INBOX_SOURCE_SUB', 1);
 define('NOTICE_INBOX_SOURCE_GROUP', 2);
 define('NOTICE_INBOX_SOURCE_REPLY', 3);
 define('NOTICE_INBOX_SOURCE_FORWARD', 4);
+define('NOTICE_INBOX_SOURCE_PROFILE_TAG', 5);
 define('NOTICE_INBOX_SOURCE_GATEWAY', -1);
 
 # append our extlib dir as the last-resort place to find libs