harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,831 Commits 6 Branches 36 Tags
20d47c44782e27f9930c49ddd59a2abc12f79a07
Commit Graph

9831 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
marijus
20d47c4478 bootstrapify common tabs and make show aside/tabs buttons only appear if there is something to show 2014-03-19 09:43:23 +01:00
friendica
8c177fbc4b cleanup 2014-03-18 16:50:46 -07:00
Thomas Willingham
c8fb979ed8 oops 2014-03-18 02:43:36 +00:00
Thomas Willingham
1446cc8096 Missed one 2014-03-18 02:41:58 +00:00
friendica
aa07edbdd1 sprintf error 2014-03-17 18:44:01 -07:00
friendica
e7981c8a03 remove mysql dependencies from cache api 2014-03-16 21:34:51 -07:00
friendica
e57bf86a27 mail notification goes to old link 2014-03-16 20:49:29 -07:00
friendica
ecb2e52a74 little fixes of hopefully nil significance 2014-03-16 20:34:21 -07:00
friendica
6f9fde997b this is the correct fix 2014-03-16 15:20:04 -07:00
friendica
bc467205a2 Merge https://github.com/friendica/red into zpull 2014-03-16 14:56:37 -07:00
friendica
074d2839c0 doc update 2014-03-16 14:56:04 -07:00
friendica
548960ffa0 Merge pull request #367 from cvogeley/master 
API: statusnet_html:trim was trimming too much
 2014-03-16 08:42:15 +11:00
Christian Vogeley
521b091779 merge 2014-03-15 21:54:10 +01:00
Christian Vogeley
f0736fc955 API: statusnet_html:trim was trimming too much 2014-03-15 21:52:20 +01:00
friendica
3cb179aff1 contact_block() not being shown to unauthenticated visitors - even if perms allow. Also separate the permissions logic for this function so that we can have a mini-profile widget and a separate contact_block widget instead of always lumping them together. We probably also should move contact_block() outside of include/text.php as it doesn't really belong there. Just not sure where it belongs - perhaps contact_widgets wouold be a good place. 2014-03-13 17:13:36 -07:00
friendica
254885c5ee Merge https://github.com/friendica/red into zpull 2014-03-13 15:37:29 -07:00
friendica
a8ea919765 remove allowed friend domains and allowed email domains from admin settings - as they are not implemented 2014-03-13 15:36:35 -07:00
marijus
a8de28cc16 Merge branch 'master' of https://github.com/friendica/red 2014-03-13 19:50:28 +01:00
marijus
b32f8f0ba7 move region_1 to off instead of removing it and dont squelch region_2 when region_1 moves in again 2014-03-13 19:50:22 +01:00
Thomas Willingham
5a8be68900 json_return_and_dir isn't a thing 2014-03-13 02:09:45 +00:00
friendica
74b8a38645 json_return_and_dir is a typo 2014-03-12 19:04:20 -07:00
friendica
40b54410b3 Merge https://github.com/friendica/red into zpull 2014-03-12 16:22:50 -07:00
friendica
b30ddfaaf9 fix colors on input elements which bootstrap set to "inherit" and doesn't play nicely with dark themes. 2014-03-12 16:21:20 -07:00
friendica
b2e831ce98 Merge pull request #366 from beardy-unixer/master 
Stick help in a template
 2014-03-13 10:15:53 +11:00
Thomas Willingham
031b888e2c Stick help in a template 2014-03-12 17:13:58 +00:00
friendica
3f337dad2c file had wrong extension 2014-03-11 21:45:20 -07:00
friendica
d7dcf463ed update acl internal list whenever there is a change - the submit handler seems to be unreliable or is getting into a race condition. 2014-03-11 20:17:14 -07:00
friendica
5e41ef9219 protect filed conversations from expiration - we check the parent to see if it is filed, but one may have filed a comment and that will vanish when the parent expires unless the parent is protected. 2014-03-11 17:41:56 -07:00
friendica
c903ff7aab get rid of fancybox for photos upload, not just photo edit 2014-03-11 17:09:02 -07:00
friendica
7733be7b58 norwegian strings update 2014-03-11 15:53:06 -07:00
friendica
25901a7bc4 revert recent changes to cmtBbClose which removed the ability to insert quotes into an empty comment box 2014-03-11 15:43:51 -07:00
friendica
55fe471ce8 version update 2014-03-11 15:29:26 -07:00
friendica
09dde2810c failed experiment - revert the directory to 80 results per page until somebody implements endless scroll on the thing. 300 takes far too long to load all the images. 2014-03-10 23:47:45 -07:00
friendica
403a0fa158 nb-no language update 2014-03-10 18:14:33 -07:00
friendica
bb64e82858 Merge pull request #363 from git-marijus/master 
this commit is an attempt to make conv items better scalable on smaller screens. also save some horizontal space.
 2014-03-11 07:18:45 +11:00
marijus
f78c4f485c 10px is probably to close 2014-03-10 19:25:38 +01:00
marijus
313240488a fix lock position 2014-03-10 18:08:44 +01:00
marijus
3f20debf5e fixes locations with a link 2014-03-10 17:47:53 +01:00
marijus
34fd387438 this commit is an attempt to make conv items better scalable on smaller screens. also save some horizontal space. 2014-03-10 17:17:49 +01:00
friendica
a5cb47c3d2 The README is getting a bit tired and really needs a re-write, but in the meanitme there's a link to donations that had to be cleaned up until we figure out how to do that without paypal. 2014-03-10 01:33:54 -07:00
friendica
a79072ce47 update cacert.pem , don't hide url link for rmagic 2014-03-09 13:53:55 -07:00
friendica
8b04db794f describe the known flaws 2014-03-08 23:45:26 -08:00
friendica
e1e107e424 advanced directory search help file 2014-03-08 23:18:34 -08:00
friendica
58f307676b Merge https://github.com/friendica/red into zpull 2014-03-08 21:15:52 -08:00
friendica
66dc228be8 HOWTO create a derived theme lesson 1. Do not attempt to do anything more complicated until you have successfully completed this exercise. 2014-03-08 21:13:42 -08:00
friendica
32f288bb59 Merge pull request #361 from cvogeley/master 
allow again zrl and zmg in api
 2014-03-09 15:18:48 +11:00
Christian Vogeley
8be35d60cf zrl and zmg are back 2014-03-09 04:18:03 +01:00
Christian Vogeley
76ab9403af merge 2014-03-09 04:15:11 +01:00
Christian Vogeley
e8e980c817 . 2014-03-09 04:11:45 +01:00
Christian Vogeley
27197e5b50 allow again zrl and zmg in api 
the problem was that the values weren’t returned and so the android
client received a null value
 2014-03-09 04:08:22 +01:00