2466 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
El RIDO	177c9d7114	Merge branch 'js-unit-testing'	2017-01-29 14:50:31 +01:00
El RIDO	cae5a71151	fix missing class renaming	2017-01-29 14:48:56 +01:00
El RIDO	efcfb80129	Merge branch 'master' of github.com:PrivateBin/PrivateBin	2017-01-29 14:39:34 +01:00
El RIDO	d678f5dada	fixing inconsistency found in unit test	2017-01-29 14:32:55 +01:00
El RIDO	fdef8bc5be	starting to work on JSVerify & Mocha based unit tests for our JS code base	2017-01-29 14:31:44 +01:00
rugk	065f5e53b3	Remove composer-lock from .gitignore ... As per https://github.com/PrivateBin/PrivateBin/issues/84#issuecomment-275065350 Thanks, @jelhan.	2017-01-26 16:40:33 +01:00
El RIDO	4a7a3ab76d	Merge branch 'nolsen42-master'	2017-01-24 19:28:18 +01:00
El RIDO	abaf8e96a6	updated page template	2017-01-24 19:27:35 +01:00
Nils Kenneweg	81fd971777	fix exports missing in SOURCES list ... (cherry picked from commit 63eed58b9dc395afb3c03df8d70d7e7bf4c88b1b)	2017-01-24 19:23:00 +01:00
Nathaniel Olsen	a005b1128b	Updated showdown	2017-01-23 22:49:03 -06:00
Nathaniel Olsen	47e4478e17	Updated sjcl, bootstrap, and the hashes	2017-01-23 22:42:05 -06:00
Nathaniel Olsen	c5f7c1a3c9	Progress on updating bootstrap	2017-01-23 22:24:24 -06:00
El RIDO	8029c2819f	implementing JS module pattern to expose functions for unit testing	2017-01-22 10:42:11 +01:00
El RIDO	5f09264625	fixing documentation inconsitencies found by Scrutinizer CI	2017-01-14 16:13:22 +01:00
El RIDO	151005e6b8	imported changes from the wiki by @Based-Skid and @rugk	2017-01-14 15:32:14 +01:00
El RIDO	db2778c64f	introduced JSDoc: changes for JSDoc compatibility and resolving inconsistencies in documentation, both semantic and in the logic	2017-01-14 15:29:12 +01:00
rugk	b06dfa2f07	Merge pull request #162 from idarlund/patch-3 ... Update no.json	2017-01-11 15:53:54 +01:00
idarlund	6c523b31aa	Update no.json	2017-01-11 15:22:16 +01:00
idarlund	9acb121e67	Update no.json ... missbruker should be misbruker	2017-01-11 15:19:40 +01:00
El RIDO	d6fd2b0e89	updated norwegian translation to new translation file convention	2017-01-10 20:43:49 +01:00
El RIDO	2e8412dbaa	Merge branch 'idarlund-norwegian-translation'	2017-01-10 20:38:13 +01:00
El RIDO	a7de0e095b	added supported language, updated credits and changelog	2017-01-10 20:37:14 +01:00
El RIDO	4a49613b47	improvements suggested by @atluxity	2017-01-10 20:28:15 +01:00
idarlund	fd2cd29267	Create no.json ... norwegian translation first commit	2017-01-10 14:56:21 +01:00
El RIDO	7f4ed739de	moved images to img folder	2017-01-08 10:13:12 +01:00
El RIDO	67f6c4eb61	turned bootstrap template variants into logic	2017-01-08 10:02:07 +01:00
El RIDO	87fad1fb77	DRYed templates	2017-01-08 09:40:13 +01:00
El RIDO	06496f2ede	updated View test to test every available template instead of just the page one	2017-01-08 08:28:05 +01:00
El RIDO	228280e3d6	Updated credits and changelog for Occitan	2017-01-08 08:27:14 +01:00
El RIDO	f79c00378b	Choosing correct Occitan plural formula, added unit tests for Occitan and Chinese, corrected casing of languages in unit test	2017-01-08 07:56:56 +01:00
rugk	20fea819cb	Update SRI hashes	2017-01-07 20:35:47 +01:00
rugk	d76ccc0969	Merge pull request #155 from jcjordyn130/patch-1 ... Fixed a spelling error in conf.ini	2017-01-07 20:35:43 +01:00
rugk	f5aefa5513	Update for correct spelling	2017-01-07 20:35:23 +01:00
rugk	afbb0a631d	Merge pull request #158 from Quent-in/patch-2 ... oc added to supported languages	2017-01-07 20:19:32 +01:00
rugk	6cfd232daf	Merge pull request #157 from Quent-in/patch-1 ... Occitan locale file	2017-01-07 20:19:13 +01:00
Quent-in	427facc456	oc added to supported languages ... in order to show occitan translations	2017-01-07 15:48:42 +01:00
Quent-in	9faa7b2682	Occitan locale file ... Just made an occitan version, in its lengadocian dialecte.	2017-01-07 15:43:46 +01:00
rugk	eb6d994672	Add Facebook to robot block list ... https://github.com/PrivateBin/PrivateBin/issues/156 https://www.facebook.com/externalhit_uatext.php	2017-01-03 17:46:26 +01:00
Jordyn Carattini	36f70cad48	Fixed a spelling error in conf.ini ... Changed "Mibibytes" to "Megabytes"	2017-01-01 17:47:07 -06:00
El RIDO	a5d91298ff	add an option to change the site name, solves #154	2017-01-01 16:33:11 +01:00
El RIDO	f5dd327488	Merge branch 'Ahuahuachi-master'	2017-01-01 14:37:31 +01:00
El RIDO	4a036aea80	updated SRI hashes, added missing formula for slowene plurals and unit test for it, updated credits and changelog	2017-01-01 14:35:39 +01:00
Alfredo Fabián Altamirano Tena	910c3b3f9d	Add Spanish to supported languages	2016-12-30 20:40:23 -06:00
Alfredo Fabián Altamirano Tena	6f8f4076dc	Create es.json ... Added translation file for spanish support	2016-12-30 20:37:58 -06:00
El RIDO	e505f8ab71	excluding some development files from being packaged	2016-12-26 12:19:33 +01:00
El RIDO	1426d4e371	tagging 1.1 release and updating documentation	2016-12-26 12:13:50 +01:00
El RIDO	1badd5e542	applying HTML entity cleanup to raw paste, too, fixing #137	2016-12-25 13:04:06 +01:00
El RIDO	97cbcb0aab	Merge branch 'PunKeel-add-dockerfile'	2016-12-25 12:35:07 +01:00
El RIDO	eca37c2184	Merge branch 'add-dockerfile' of https://github.com/PunKeel/PrivateBin into PunKeel-add-dockerfile	2016-12-25 12:32:14 +01:00
El RIDO	f6b8ee3e20	add missing check for non-expiring pastes, fixes #149	2016-12-25 12:15:29 +01:00