harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,990 Commits 6 Branches 36 Tags
3d55134953cf94a5b320404e9a5a8af1acadaf19
Commit Graph

208 Commits

Author SHA1 Message Date
redmatrix
7b695aa684 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-10-01 16:56:38 -07:00
redmatrix
de4b5978c3 update cert authorities 2015-10-01 16:55:15 -07:00
redmatrix
928fa44154 more work on the notifier 2015-09-29 21:08:12 -07:00
redmatrix
74827133b2 Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	util/messages.po
 2015-09-18 22:46:21 -07:00
Mario Vavti
b7e953f50e fix calculation of content height with margins 2015-09-17 14:14:01 +02:00
redmatrix
f2397c942c Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-09-01 20:21:43 -07:00
redmatrix
eb2df761d5 cert updates 2015-09-01 20:20:45 -07:00
redmatrix
1a5898bf80 sync abook entries from redmatrix 
Merge branch 'master' of https://github.com/redmatrix/redmatrix

Conflicts:
	include/items.php
 2015-07-02 21:58:28 -07:00
Mario Vavti
f54688a547 since we can now use plain upstream justifiedGallery library - switch to minified version 2015-07-01 11:42:17 +02:00
Mario Vavti
9c4e9f8759 update justifiedGallery to versio 3.6.0 2015-07-01 11:34:36 +02:00
redmatrix
70975dda4a remove all QR-code stuff from core - now in qrator addon 2015-06-25 19:05:49 -07:00
redmatrix
851f2f64df Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	index.php
	mod/setup.php
 2015-05-24 15:50:05 -07:00
Mario Vavti
f575ef551d use $a->data instead of $a->page for $content and ad another library for use with webpages - foundation 2015-05-23 22:19:02 +02:00
redmatrix
9de88c49c3 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-05-14 20:10:45 -07:00
Klaus Weidenbach
c62e75d789 Add sprintf.js v1.0.2. 
This script provides sprintf() for JavaScript. It can be used for
example for translating strings used in JavaScript with variables.

It is licensed under BSD-3-Clause and can be found on GitHub:
https://github.com/alexei/sprintf.js
 2015-05-14 10:39:56 +02:00
redmatrix
a3c37f1458 first pass name change 2015-05-05 03:56:10 -07:00
Mario Vavti
d6152d809a revert some changes in justified gallery 2015-04-28 22:06:09 +02:00
Mario Vavti
7e7678364b make jRange behave again 2015-04-09 10:53:37 +02:00
friendica
184f8d42ea jRange: width is innacurate depending on box model, padding and margins. Using css width instead. 2015-04-08 21:10:47 -07:00
Mario Vavti
9472d0a683 move bootbox out of bootstrap 2015-03-17 23:16:22 +01:00
Mario Vavti
7966c2db4c update bootstrap-3.3.4 and bootbox-4.4.0 2015-03-17 23:07:08 +01:00
friendica
f507a5cd5a prepare for demise of google code 2015-03-12 16:05:56 -07:00
friendica
ca3eb27505 first cut openid server. Mostly just getting it architecturally prepared - as there may be a few twists and turns ahead. 2015-03-10 18:29:42 -07:00
friendica
7ae14a1bf9 jrange update 2015-02-20 00:14:43 -08:00
RedMatrix
4a75d2d754 Merge pull request #900 from einervonvielen/doc_dev_beginner_corrections 
Changed bbcode [toc] and changed doc for beginning deveopers
 2015-02-19 13:40:23 +11:00
marijus
db7b4ea2bf update justifiedGallery to version 3.5.4 and add ignoreElement option which will hopefully be accepted upstream 2015-02-14 22:18:50 +01:00
Einer von Vielen
6ed8fb30b8 Changed bb code [toc] to make it more flexible 
This usage is know closer to the original usage of
http://ndabas.github.io/toc/

Changed:
- jquery.toc.js: Do not check for empty headings
- bbcode.php: Added processing of [toc] with parameters
- main.js: Use the default params for jquery.toc.js
- bbcode.html: Added more help for [toc] and corrected some html
 2015-02-14 20:33:51 +01:00
friendica
fce51876c9 bring some styling back to the colorbox and improve the event preview ability 2015-02-09 18:58:43 -08:00
Stefan Parviainen
84833ca15e Update to latest version of jRange (fixes issue #867) 2015-01-21 12:34:01 +01:00
Stefan Parviainen
6ea5b57715 Update to latest version of jquery-textcomplete. 2015-01-21 12:28:45 +01:00
Habeas Codice
7420896693 allow system-loaded (i.e. pecl-oauth) to coexist 2015-01-18 18:41:11 -08:00
Einer von Vielen
123ca1d403 Fixed bbode element toc for webpages 
- At the moment webpages can contain empty headings if the textarea
"Title" 
is left empty in the webpage creator
(https://hostname/webpages/username)
 2015-01-18 14:21:26 +01:00
pafcu
f9f23bd6c9 Merge pull request #854 from pafcu/fixcollapse 
Actually fix problem with post collapsing in webkit-based browsers
 2015-01-15 23:17:06 +02:00
Stefan Parviainen
478a612aeb Actually fix problem with post collapsing in webkit-based browsers 2015-01-15 22:08:50 +01:00
09129cbe5f Added a table of content as bbcode element [toc] for webpages 
- Included jquery.toc.js (http://www.apache.org/licenses/LICENSE-2.0)
- Modified jquery.toc.js to work with the webpages of the red#matrix
- Added info to the help
 2015-01-14 22:47:54 +01:00
Einer von Vielen
43b877caa1 Test 
...with table of content.
jquery.tableofconent.js works bunt not properly
 2015-01-13 00:06:44 +01:00
Stefan Parviainen
cce51f5a49 Possibly fix issue with readmore.js collapse 2015-01-12 17:11:03 +01:00
Stefan Parviainen
7176eb8845 Merge autocomplete caching, show more results in navbar search 2015-01-07 22:07:11 +01:00
Stefan Parviainen
e3d064ff22 Allow textcomplete to work on inputs (PR also filed upstream) 2015-01-07 18:42:57 +01:00
friendica
11ec8d865c Merge branch 'mainjsoptimize' of git://github.com/pafcu/red into pafcu-mainjsoptimize 
Conflicts:
	view/js/main.js
 2015-01-06 11:37:48 -08:00
Stefan Parviainen
29e0bfee2f Fix bug in readmore.js 2015-01-06 15:54:58 +01:00
Stefan Parviainen
ae821efbf1 Update jquery.timeago.js to add support for dispose action 2015-01-06 11:43:59 +01:00
Stefan Parviainen
5ce5de7305 Remove unneeded divgrow library 2015-01-05 22:11:24 +01:00
Stefan Parviainen
749aef7172 Remove some unneeded libraries 2015-01-05 20:27:01 +01:00
Stefan Parviainen
b320b8cbf3 Replace fancybox with colorbox 2015-01-05 19:49:20 +01:00
Stefan Parviainen
c9f26c8b7b Update jGrowl 2015-01-05 18:36:24 +01:00
Stefan Parviainen
128b0008ee Replace jslider with jRange 2015-01-05 18:30:12 +01:00
Stefan Parviainen
7791d28a5d Replace divgrow with more modern readmore.js 2015-01-05 17:10:08 +01:00
friendica
a0052f0176 htmlpurifier update - compatibility issue with language library autoloader 2015-01-01 22:18:27 -08:00
Stefan Parviainen
9557908875 Warn about unsaved settings using jquery.areyousure 2015-01-01 12:32:15 +01:00