bitPickups/friendica_2021.01_tupambae_shared_hosting
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
4655 commits 4 branches 0 tags 133 MiB
Commit graph

4655 commits

This branch
This branch
All branches
Author SHA1 Message Date
Simon L'nu
f2e2632810 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  some reported warnings cleaned up
  network permission ids
  wrong var for notify total
  fix notification total
  improved rw notifications
  bug #349 - email notls setting
  add a searchbox to "find friends" for global search
  bugfix in diabook
  title not updated when editing post
  New parameter in html2plain for plain text exports. More compatibility in API
  API: added max_id
  API: Now threading seems to work
  API: Seesmic is now working. Optimizing text export.
  Quotes with author are now having an "open/close" link
  New bbcode element: "spoiler". Mail: Top post quotes are now embraced in "spoiler" elements

* master:
 2012-03-29 00:04:00 -04:00
friendica
4e4f7ac79f some reported warnings cleaned up 2012-03-28 20:50:09 -07:00
friendica
a946b7cea3 Merge branch 'pull' 2012-03-28 19:57:28 -07:00
friendica
60fe74ce97 network permission ids 2012-03-28 19:56:14 -07:00
friendica
3f89adfd62 wrong var for notify total 2012-03-28 17:51:43 -07:00
friendica
77715c0c65 fix notification total 2012-03-28 17:44:24 -07:00
friendica
7956c2d08e improved rw notifications 2012-03-28 17:21:56 -07:00
friendica
75f3d41da2 Merge pull request #184 from annando/master 
Enhancing the API - Preparations for a better facebook export
 2012-03-28 15:08:15 -07:00
friendica
a2b1aca27c Merge branch 'pull' 2012-03-28 14:55:06 -07:00
friendica
4fe0b56d76 bug #349 - email notls setting 2012-03-28 14:54:00 -07:00
tommy tomson
aa26517cdc add a searchbox to "find friends" for global search 2012-03-28 23:07:34 +02:00
tommy tomson
1a9bbac0be bugfix in diabook 2012-03-28 20:45:39 +02:00
Michael Vogel
bdd2754740 Merge commit 'upstream/master' 2012-03-28 19:52:30 +02:00
friendica
e894775a39 Merge branch 'pull' 2012-03-28 05:16:25 -07:00
Simon
3db94d5212 Merge pull request #183 from simonlnu/master 
final pull req for now. really fixed.
 2012-03-28 03:49:10 -07:00
Simon L'nu
57ef21295a Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  viewsrc: return only body if page is requested via ajax

* master:
 2012-03-28 06:48:05 -04:00
Simon L'nu
4a75ea2f42 really fix it this time... 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-28 06:47:38 -04:00
fabrixxm
77aeba0d12 Merge pull request #182 from fabrixxm/master 
viewsrc returns only text if page is requested via ajax
 2012-03-28 03:46:29 -07:00
Simon
8c95332753 Merge pull request #181 from simonlnu/master 
how the default.php gets read just changed from under me. not pleasant.
 2012-03-28 03:21:34 -07:00
Simon L'nu
3d5e711780 WITH is going on? 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-28 06:20:13 -04:00
friendica
b58dc43148 Merge branch 'pull' 2012-03-28 03:19:42 -07:00
friendica
b18086097e title not updated when editing post 2012-03-28 03:18:26 -07:00
Simon L'nu
2a244be9ac Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  filer: replace "file as" prompt with combobox opened in fancybox
  filer: info() on item filed
  template: field_combobox

* master:
 2012-03-28 06:05:54 -04:00
Simon
c32ee4d226 Merge pull request #180 from simonlnu/master 
duh...
 2012-03-28 03:03:47 -07:00
Simon L'nu
356e654521 doh fix 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-28 06:03:04 -04:00
fabrixxm
768326e484 Merge pull request #179 from fabrixxm/master 
new field_combobox template and some eyecandy to "file as" function
 2012-03-28 03:00:24 -07:00
Simon
40a65d38e0 Merge pull request #178 from simonlnu/master 
i fixed the worst but ...
 2012-03-28 02:55:15 -07:00
Simon L'nu
bcf8a571f9 add some icons for the newbie stuff (diabook but 24px not 32); fixes for dispy (broken last push) 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-28 05:52:28 -04:00
Simon L'nu
6bb8d42865 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  support autocomplete @-tags in plaintext mode
  vier navbar messed up after default theme template move
  profile_tabs hook
  use theme directory for page templates, not language directory
  turn on gecko spellcheck in tinymce
  small fix in diabook
  fixes in diabook
  provide a close-option for boxes in right_aside and store info via js and cookies
  provide a close-option for boxes in right_aside and store info via js and cookies
  form security error when using existing photo

* master:
 2012-03-28 05:42:47 -04:00
Fabio Comuni
767245e9ff viewsrc: return only body if page is requested via ajax 2012-03-28 11:42:04 +02:00
Fabio Comuni
0a2675d8b6 filer: replace "file as" prompt with combobox opened in fancybox 2012-03-28 10:49:34 +02:00
Fabio Comuni
7aec2fd68d filer: info() on item filed 2012-03-28 10:45:16 +02:00
Fabio Comuni
82106632f0 template: field_combobox 
a text input plus a select wich updates text input value on change.
html5 version commented out for poor browsers support.
 2012-03-28 10:43:52 +02:00
friendica
7fc57f486f support autocomplete @-tags in plaintext mode 2012-03-28 00:44:45 -07:00
friendica
f95fb2667a vier navbar messed up after default theme template move 2012-03-28 00:16:22 -07:00
friendica
0aa99acd35 profile_tabs hook 2012-03-27 20:15:15 -07:00
friendica
7ee07daf04 use theme directory for page templates, not language directory 2012-03-27 18:39:52 -07:00
friendica
47eaa97af6 Merge branch 'pull' 2012-03-27 15:21:30 -07:00
friendica
aba63f8b78 turn on gecko spellcheck in tinymce 2012-03-27 15:20:36 -07:00
tommy tomson
f30471df4f small fix in diabook 2012-03-27 23:41:19 +02:00
tommy tomson
211d00a1f5 fixes in diabook 2012-03-27 23:27:43 +02:00
tomtom84
0bf22d64f6 Merge pull request #177 from tomtom84/master 
fixes in theme diabook
 2012-03-27 10:05:32 -07:00
tommy tomson
31fbc3fde3 provide a close-option for boxes in right_aside and store info via js and cookies 2012-03-27 19:02:07 +02:00
tomtom84
fef7790762 Merge pull request #176 from tomtom84/master 
fixes in theme diabook-blue
 2012-03-27 06:32:30 -07:00
tommy tomson
9fd54de691 provide a close-option for boxes in right_aside and store info via js and cookies 2012-03-27 15:29:46 +02:00
friendica
1982184ca0 Merge branch 'pull' 2012-03-27 04:52:39 -07:00
friendica
117d2165f5 form security error when using existing photo 2012-03-27 04:51:20 -07:00
Simon
928e6c7ef7 Merge pull request #175 from simonlnu/master 
various fixes for dispys
 2012-03-27 01:43:01 -07:00
Simon L'nu
cc33a564e1 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  profile wall privacy
  don't expire filed items

* master:
 2012-03-27 04:40:42 -04:00
Simon L'nu
c3388ad813 more fixes for dispys 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-27 04:40:31 -04:00