james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
4,413 Commits 3 Branches 36 Tags
Commit Graph

4413 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daku
32dbdccd00 has_children uses Y/N, not TRUE/FALSE 2016-05-10 21:15:50 +01:00
Shish
4609549a4b Merge pull request #538 from dali99/Material_-_Home 
Material - home extension
 2016-04-04 11:37:44 +01:00
Shish
dc8efcb680 Merge pull request #543 from sanmadjack/develop 
Fixes for bulk add results
 2016-04-01 10:47:13 +01:00
Matthew Barbour
c0fb36e4c8 Merge remote-tracking branch 'sanmadjack/develop' into develop 2016-03-21 18:17:53 -05:00
Matthew Barbour
898bcfae94 Fixes for bulk add results 2016-03-21 18:14:48 -05:00
Shish
cfad6087ab Merge pull request #541 from DakuTree/patch-constraints 
Fix constraint violations when mass-editing an image that already contains the new tag
 2016-01-25 11:16:25 +00:00
Daku
9235025165 fix integrity constraint violations when mass-editting an image that already contains the new tag 2016-01-24 09:56:47 +00:00
Daniel Løvbrøtte Olsen
ba66f653d6 Removes data-clink-sel="" in the sidebar links 
It's unused as far as I can see
 2016-01-08 10:22:58 +01:00
Daniel Løvbrøtte Olsen
2cd649b719 That's what I get for copiying and pasting 2016-01-07 13:13:50 +01:00
Daniel Løvbrøtte Olsen
ac264c4040 Stylesheet and js not from other hosts anymore 2016-01-06 23:21:55 +01:00
Daniel Løvbrøtte Olsen
a9a3af9a88 It works!!!!1!!!111!one111!!! 2016-01-06 22:58:27 +01:00
Daniel Løvbrøtte Olsen
8da4d73d82 Online tool says this should work 2016-01-06 15:27:53 +01:00
Daniel Løvbrøtte Olsen
f2af07e3d1 O.o why didn't that work? 2016-01-06 15:22:38 +01:00
Daniel Løvbrøtte Olsen
0b74b5630f How to regex 2016-01-06 15:14:33 +01:00
Daniel Løvbrøtte Olsen
7a0cb4bddc Oooops, that's kiiiinda important 2016-01-06 15:10:26 +01:00
Daniel Løvbrøtte Olsen
c36cc25cd5 This should add the correct class 2016-01-06 15:00:54 +01:00
Daniel Løvbrøtte Olsen
f8a7156371 derp 2015-12-30 13:29:14 +01:00
Daniel Løvbrøtte Olsen
05656618db Updated mdl and added license 2015-12-29 19:27:32 +01:00
Daniel Løvbrøtte Olsen
a267516b77 Made navgation links reside inside nav - "I identify as navbarkin" 2015-12-28 18:42:55 +01:00
Daniel Løvbrøtte Olsen
90b306184f weird –es 2015-12-28 18:12:37 +01:00
Daniel Løvbrøtte Olsen
ddc3b844d1 Olds CSS rules begone! 2015-12-28 18:09:06 +01:00
Daniel Løvbrøtte Olsen
eceef2a56f Added links 2015-12-28 03:22:42 +01:00
Daniel Løvbrøtte Olsen
5761148d0a fixed search - wow i was stoopid 2015-12-28 03:01:12 +01:00
Daniel Løvbrøtte Olsen
2afdbfc2d1 fixed search 2015-12-28 02:51:10 +01:00
Daniel Løvbrøtte Olsen
d8f18df3ec more testing 2015-12-28 02:45:24 +01:00
Daniel Løvbrøtte Olsen
d21e86aeb0 Cheated a bit to test it out ;) 2015-12-28 02:37:05 +01:00
Daniel Løvbrøtte Olsen
a8ca54db0b ported search, counter, foot and title to php 2015-12-27 16:10:45 +01:00
Daniel Løvbrøtte Olsen
de87bdbb0d Merge pull request #1 from shish/develop 
MERGE ALL THE THINGS
 2015-12-17 11:26:51 +01:00
Shish
b328196d94 Merge pull request #534 from DakuTree/patch-sqlspeed 
Subquery optimization on MySQL < 5.6
 2015-12-04 14:52:35 +00:00
Daku
6d1c7c414b mysql < 5.6 has terrible subquery optimization, using EXISTS / JOIN fixes this 2015-12-04 11:38:44 +00:00
Shish
57e5d8e538 Merge pull request #519 from terokorp/feature/apache2.4_htaccess 
Adding support for apache 2.4
 2015-10-26 19:23:28 +00:00
Shish
ac9dc1b8d8 Merge pull request #523 from DakuTree/patch-tagevent 
Move tag sanitization, alias resolving & tag parsing from set_tags > TagSetEvent
 2015-10-26 19:22:08 +00:00
Shish
c946daf152 Merge pull request #530 from CrandellWS/hotfix-chatbox-relative-urls 
hotfix-chatbox-relative-urls
 2015-10-26 19:19:11 +00:00
William Crandell
7b8d8c2a2d chatbox bugfix 
might cause new bugs checking into this now
 2015-10-26 11:22:57 -04:00
Shish
ffac680588 Merge pull request #529 from CrandellWS/hotfix-bad-blotter-id 
Hotfix block id character stripping
 2015-10-26 13:51:01 +00:00
Shish
28e1cb30ea Merge pull request #528 from CrandellWS/develop 
merge start of material theme
 2015-10-26 13:49:56 +00:00
William Crandell
5ebd11717f Hotfix block id character stripping 
Example problem is ext/blotter uses:

  $page->add_block(
     new Block(
     "Welcome to the Blotter Editor!", <-- SEE --> !
      $html, "main", 10));
 2015-10-26 09:44:01 -04:00
William Crandell
b7114a142e Hotfix for better block id character filtering 2015-10-26 09:20:09 -04:00
William Crandell
4af1199ff3 Hotfix flash message 
maybe other issues not sure
 2015-10-26 09:10:32 -04:00
William Crandell
6fb43eab19 On Develop branch 
Sorry about that
 2015-10-26 08:51:02 -04:00
Shish
b9f6b44301 bump 2015-10-26 12:14:36 +00:00
Shish
7b0933ea54 merge develop, fix conflicts, bump 2015-10-26 12:13:17 +00:00
Shish
f8cb2e96e4 only check min < val < max if min and max are defined 2015-10-19 07:19:53 +01:00
Shish
0855c7e9c4 Merge branch 'develop' of https://github.com/shish/shimmie2 into develop 2015-10-19 07:11:47 +01:00
Shish
4971fa9337 empty bool = false 2015-10-19 07:11:41 +01:00
Shish
e9a1bebe76 how did this ever not break everything? x_x 2015-10-19 06:58:47 +01:00
Shish
3e0dc69766 Merge pull request #524 from DanielOaks/fix-notes-for-sqlite 
Fix the notes extension to work properly on SQLite
 2015-10-15 09:26:50 -07:00
Daniel Oaks
144ac6bd89 Fix the notes extension to work properly on dbs other than MySQL 2015-10-15 19:31:39 +10:00
Shish
3aed2abec7 don't complain if one image in a bulk revert doesn't exist 2015-10-12 19:17:16 +01:00
Daku
600011219f update docs 2015-10-08 19:25:38 +01:00