From: Banana Date: Thu, 5 Jan 2017 08:17:11 +0000 (+0100) Subject: prepare for release 2.0alpha X-Git-Tag: 2.1-alpha-2019-0-29~45 X-Git-Url: http://91.132.146.200/gitweb/?a=commitdiff_plain;h=a463aaa612a4bd32d2122ca1071ff552cb98c310;p=insipid.git prepare for release 2.0alpha --- diff --git a/AUTHORS b/AUTHORS index f3417de..07cd851 100755 --- a/AUTHORS +++ b/AUTHORS @@ -8,7 +8,7 @@ creator: Luke Reeves Contributors: -jumpin.banana https://github.com/jumpin-banana +jumpin.banana https://www.bananas-playground.net Manuel de la Torre Artur Marques Danny Miles diff --git a/documentation/features.txt b/documentation/features.txt new file mode 100644 index 0000000..f82acf7 --- /dev/null +++ b/documentation/features.txt @@ -0,0 +1,8 @@ +Insipid is a web-based bookmark manager similar to the Delicious service. + +It lets you manage and host your own bookmarks. No talking to other servervices or agencies. +Your data is your data. + +Bookmarks are put into categories and should have tags. + +New links will be checked and tried to get as much as possible information automatically. \ No newline at end of file diff --git a/documentation/insipid-edit-me.sql b/documentation/insipid-edit-me.sql new file mode 100644 index 0000000..ce567e4 --- /dev/null +++ b/documentation/insipid-edit-me.sql @@ -0,0 +1,164 @@ + +SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO"; +SET time_zone = "+00:00"; + + +/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; +/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; +/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; +/*!40101 SET NAMES utf8mb4 */; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `#REPLACEME#_category` +-- + +DROP TABLE IF EXISTS `#REPLACEME#_category`; +CREATE TABLE `#REPLACEME#_category` ( + `id` int(10) NOT NULL, + `name` varchar(128) COLLATE utf8mb4_bin NOT NULL +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=COMPACT; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `#REPLACEME#_categoryrelation` +-- + +DROP TABLE IF EXISTS `#REPLACEME#_categoryrelation`; +CREATE TABLE `#REPLACEME#_categoryrelation` ( + `linkid` int(10) NOT NULL, + `categoryid` int(10) NOT NULL +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=COMPACT; + +-- -------------------------------------------------------- + +-- +-- Stand-in structure for view `#REPLACEME#_combined` +-- (See below for the actual view) +-- +DROP VIEW IF EXISTS `#REPLACEME#_combined`; +CREATE TABLE `#REPLACEME#_combined` ( +`id` int(10) +,`link` mediumtext +,`created` datetime +,`status` int(2) +,`description` varchar(255) +,`title` varchar(255) +,`image` varchar(255) +,`hash` char(32) +,`tag` varchar(64) +,`category` varchar(128) +); + +-- -------------------------------------------------------- + +-- +-- Table structure for table `#REPLACEME#_link` +-- + +DROP TABLE IF EXISTS `#REPLACEME#_link`; +CREATE TABLE `#REPLACEME#_link` ( + `id` int(10) NOT NULL, + `link` mediumtext COLLATE utf8mb4_bin NOT NULL, + `created` datetime NOT NULL, + `status` int(2) NOT NULL, + `description` varchar(255) COLLATE utf8mb4_bin NOT NULL, + `title` varchar(255) COLLATE utf8mb4_bin NOT NULL, + `image` varchar(255) COLLATE utf8mb4_bin NOT NULL, + `hash` char(32) COLLATE utf8mb4_bin NOT NULL, + `search` text COLLATE utf8mb4_bin NOT NULL, +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=COMPACT; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `#REPLACEME#_tag` +-- + +DROP TABLE IF EXISTS `#REPLACEME#_tag`; +CREATE TABLE `#REPLACEME#_tag` ( + `id` int(10) NOT NULL, + `name` varchar(64) COLLATE utf8mb4_bin NOT NULL +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=COMPACT; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `#REPLACEME#_tagrelation` +-- + +DROP TABLE IF EXISTS `#REPLACEME#_tagrelation`; +CREATE TABLE `#REPLACEME#_tagrelation` ( + `linkid` int(10) NOT NULL, + `tagid` int(10) NOT NULL +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=COMPACT; + +-- -------------------------------------------------------- + +-- +-- Structure for view `#REPLACEME#_combined` +-- +DROP TABLE IF EXISTS `#REPLACEME#_combined`; + +CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`%` SQL SECURITY DEFINER VIEW `#REPLACEME#_combined` AS select `#REPLACEME#_link`.`id` AS `id`,`#REPLACEME#_link`.`link` AS `link`,`#REPLACEME#_link`.`created` AS `created`,`#REPLACEME#_link`.`status` AS `status`,`#REPLACEME#_link`.`description` AS `description`,`#REPLACEME#_link`.`title` AS `title`,`#REPLACEME#_link`.`image` AS `image`,`#REPLACEME#_link`.`hash` AS `hash`,`#REPLACEME#_tag`.`name` AS `tag`,`#REPLACEME#_category`.`name` AS `category` from ((((`#REPLACEME#_link` left join `#REPLACEME#_tagrelation` on((`#REPLACEME#_tagrelation`.`linkid` = `#REPLACEME#_link`.`id`))) left join `#REPLACEME#_tag` on((`#REPLACEME#_tag`.`id` = `#REPLACEME#_tagrelation`.`tagid`))) left join `#REPLACEME#_categoryrelation` on((`#REPLACEME#_categoryrelation`.`linkid` = `#REPLACEME#_link`.`id`))) left join `#REPLACEME#_category` on((`#REPLACEME#_category`.`id` = `#REPLACEME#_categoryrelation`.`categoryid`))) ; + +-- +-- Indexes for dumped tables +-- + +-- +-- Indexes for table `#REPLACEME#_category` +-- +ALTER TABLE `#REPLACEME#_category` + ADD PRIMARY KEY (`id`); + +-- +-- Indexes for table `#REPLACEME#_categoryrelation` +-- +ALTER TABLE `#REPLACEME#_categoryrelation` + ADD UNIQUE KEY `linkid` (`linkid`,`categoryid`); + +-- +-- Indexes for table `#REPLACEME#_link` +-- +ALTER TABLE `#REPLACEME#_link` + ADD PRIMARY KEY (`id`), + FULLTEXT KEY `search` (`search`), + ADD UNIQUE KEY `hash` (`hash`); + +-- +-- Indexes for table `#REPLACEME#_tag` +-- +ALTER TABLE `#REPLACEME#_tag` + ADD PRIMARY KEY (`id`); + +-- +-- Indexes for table `#REPLACEME#_tagrelation` +-- +ALTER TABLE `#REPLACEME#_tagrelation` + ADD UNIQUE KEY `linkid` (`linkid`,`tagid`); + +-- +-- AUTO_INCREMENT for dumped tables +-- + +-- +-- AUTO_INCREMENT for table `#REPLACEME#_category` +-- +ALTER TABLE `#REPLACEME#_category` + MODIFY `id` int(10) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=1; +-- +-- AUTO_INCREMENT for table `#REPLACEME#_link` +-- +ALTER TABLE `#REPLACEME#_link` + MODIFY `id` int(10) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=1; +-- +-- AUTO_INCREMENT for table `#REPLACEME#_tag` +-- +ALTER TABLE `#REPLACEME#_tag` + MODIFY `id` int(10) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=1; +/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; +/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; +/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; diff --git a/documentation/installation.txt b/documentation/installation.txt index 360ff49..b0d480a 100644 --- a/documentation/installation.txt +++ b/documentation/installation.txt @@ -1 +1,26 @@ -See the installation folder. \ No newline at end of file +1. +Check the requirements first. + +2. +Read this first!! + +3. +Unpack the archive + +4. +Modify webroot/config.php + +5. +Copy and modify documentation/insipid-edit-me.sql and replace the placeholder. +Open the file and make a search and replace: + +search for: `#REPLACEME# +replace with: `tableprefix + +The value tableprefix has to match with the value for DB_PREFIX in config.php + +6. +Import the sql file into your MySQL database + +7. +Copy the content of the webroot folder into your webserver folder \ No newline at end of file diff --git a/documentation/installation/README b/documentation/installation/README deleted file mode 100644 index c78ac88..0000000 --- a/documentation/installation/README +++ /dev/null @@ -1,8 +0,0 @@ -The inspid-edit-me.sql NEEDS to be edited. -Open the file and make a search and replace: - -search for: `#REPLACEME# -replace with: `tableprefix - -The value tableprefix has to match with the value for DB_PREFIX in config.php - diff --git a/documentation/installation/insipid-edit-me.sql b/documentation/installation/insipid-edit-me.sql deleted file mode 100644 index 3c156c8..0000000 --- a/documentation/installation/insipid-edit-me.sql +++ /dev/null @@ -1,162 +0,0 @@ - -SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO"; -SET time_zone = "+00:00"; - - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8mb4 */; - --- -------------------------------------------------------- - --- --- Table structure for table `#REPLACEME#_category` --- - -DROP TABLE IF EXISTS `#REPLACEME#_category`; -CREATE TABLE `#REPLACEME#_category` ( - `id` int(10) NOT NULL, - `name` varchar(128) COLLATE utf8mb4_bin NOT NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=COMPACT; - --- -------------------------------------------------------- - --- --- Table structure for table `#REPLACEME#_categoryrelation` --- - -DROP TABLE IF EXISTS `#REPLACEME#_categoryrelation`; -CREATE TABLE `#REPLACEME#_categoryrelation` ( - `linkid` int(10) NOT NULL, - `categoryid` int(10) NOT NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=COMPACT; - --- -------------------------------------------------------- - --- --- Stand-in structure for view `#REPLACEME#_combined` --- (See below for the actual view) --- -DROP VIEW IF EXISTS `#REPLACEME#_combined`; -CREATE TABLE `#REPLACEME#_combined` ( -`id` int(10) -,`link` mediumtext -,`created` datetime -,`status` int(2) -,`description` varchar(255) -,`title` varchar(255) -,`image` varchar(255) -,`hash` char(32) -,`tag` varchar(64) -,`category` varchar(128) -); - --- -------------------------------------------------------- - --- --- Table structure for table `#REPLACEME#_link` --- - -DROP TABLE IF EXISTS `#REPLACEME#_link`; -CREATE TABLE `#REPLACEME#_link` ( - `id` int(10) NOT NULL, - `link` mediumtext COLLATE utf8mb4_bin NOT NULL, - `created` datetime NOT NULL, - `status` int(2) NOT NULL, - `description` varchar(255) COLLATE utf8mb4_bin NOT NULL, - `title` varchar(255) COLLATE utf8mb4_bin NOT NULL, - `image` varchar(255) COLLATE utf8mb4_bin NOT NULL, - `hash` char(32) COLLATE utf8mb4_bin NOT NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=COMPACT; - --- -------------------------------------------------------- - --- --- Table structure for table `#REPLACEME#_tag` --- - -DROP TABLE IF EXISTS `#REPLACEME#_tag`; -CREATE TABLE `#REPLACEME#_tag` ( - `id` int(10) NOT NULL, - `name` varchar(64) COLLATE utf8mb4_bin NOT NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=COMPACT; - --- -------------------------------------------------------- - --- --- Table structure for table `#REPLACEME#_tagrelation` --- - -DROP TABLE IF EXISTS `#REPLACEME#_tagrelation`; -CREATE TABLE `#REPLACEME#_tagrelation` ( - `linkid` int(10) NOT NULL, - `tagid` int(10) NOT NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=COMPACT; - --- -------------------------------------------------------- - --- --- Structure for view `#REPLACEME#_combined` --- -DROP TABLE IF EXISTS `#REPLACEME#_combined`; - -CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`%` SQL SECURITY DEFINER VIEW `#REPLACEME#_combined` AS select `#REPLACEME#_link`.`id` AS `id`,`#REPLACEME#_link`.`link` AS `link`,`#REPLACEME#_link`.`created` AS `created`,`#REPLACEME#_link`.`status` AS `status`,`#REPLACEME#_link`.`description` AS `description`,`#REPLACEME#_link`.`title` AS `title`,`#REPLACEME#_link`.`image` AS `image`,`#REPLACEME#_link`.`hash` AS `hash`,`#REPLACEME#_tag`.`name` AS `tag`,`#REPLACEME#_category`.`name` AS `category` from ((((`#REPLACEME#_link` left join `#REPLACEME#_tagrelation` on((`#REPLACEME#_tagrelation`.`linkid` = `#REPLACEME#_link`.`id`))) left join `#REPLACEME#_tag` on((`#REPLACEME#_tag`.`id` = `#REPLACEME#_tagrelation`.`tagid`))) left join `#REPLACEME#_categoryrelation` on((`#REPLACEME#_categoryrelation`.`linkid` = `#REPLACEME#_link`.`id`))) left join `#REPLACEME#_category` on((`#REPLACEME#_category`.`id` = `#REPLACEME#_categoryrelation`.`categoryid`))) ; - --- --- Indexes for dumped tables --- - --- --- Indexes for table `#REPLACEME#_category` --- -ALTER TABLE `#REPLACEME#_category` - ADD PRIMARY KEY (`id`); - --- --- Indexes for table `#REPLACEME#_categoryrelation` --- -ALTER TABLE `#REPLACEME#_categoryrelation` - ADD UNIQUE KEY `linkid` (`linkid`,`categoryid`); - --- --- Indexes for table `#REPLACEME#_link` --- -ALTER TABLE `#REPLACEME#_link` - ADD PRIMARY KEY (`id`), - ADD UNIQUE KEY `hash` (`hash`); - --- --- Indexes for table `#REPLACEME#_tag` --- -ALTER TABLE `#REPLACEME#_tag` - ADD PRIMARY KEY (`id`); - --- --- Indexes for table `#REPLACEME#_tagrelation` --- -ALTER TABLE `#REPLACEME#_tagrelation` - ADD UNIQUE KEY `linkid` (`linkid`,`tagid`); - --- --- AUTO_INCREMENT for dumped tables --- - --- --- AUTO_INCREMENT for table `#REPLACEME#_category` --- -ALTER TABLE `#REPLACEME#_category` - MODIFY `id` int(10) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=1; --- --- AUTO_INCREMENT for table `#REPLACEME#_link` --- -ALTER TABLE `#REPLACEME#_link` - MODIFY `id` int(10) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=1; --- --- AUTO_INCREMENT for table `#REPLACEME#_tag` --- -ALTER TABLE `#REPLACEME#_tag` - MODIFY `id` int(10) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=1; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; diff --git a/documentation/requirements.txt b/documentation/requirements.txt new file mode 100644 index 0000000..7476b11 --- /dev/null +++ b/documentation/requirements.txt @@ -0,0 +1,3 @@ +Apache (2 and up) with PHP extension +PHP (5 and up) with MySQL extension -> mysqli; curl enabled +MySQL database 5.6.x and up \ No newline at end of file