Tupambae_Org/friendica_2021-01
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
4534 commits 2 branches 0 tags 132 MiB
Commit graph

4534 commits

This branch
This branch
All branches
Author SHA1 Message Date
friendica 873a55e918 enotify plugin hook 2012-03-25 05:06:11 -07:00
friendica 5bb7303408 NOTIFY_SYSTEM 2012-03-25 04:37:09 -07:00
Simon 2e797a6243 Merge pull request #166 from simonlnu/master 
fpostit; up versions to 1.0;
 2012-03-25 00:32:55 -07:00
Simon L'nu 2c43120129 dispy-dark not experimental. start implementing fpostit 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-25 03:22:16 -04:00
Simon L'nu 84686a2698 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  move community_pages to right_aside, fixes in css
  improved the inivitations and added a bit of sales pitch.

* master:
 2012-03-25 03:18:21 -04:00
tomtom84 1b8ac30fae Merge pull request #165 from tomtom84/master 
fixes in diabook-derivates
 2012-03-24 23:50:05 -07:00
tommy tomson 329a26d62e move community_pages to right_aside, fixes in css 2012-03-25 08:47:17 +02:00
friendica ea29a26059 Merge branch 'pull' 2012-03-24 23:05:33 -07:00
friendica 6780b76b0c improved the inivitations and added a bit of sales pitch. 2012-03-24 23:04:18 -07:00
Simon L'nu 1d56224b08 increase version to 1.0 for dispys \o/ 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-25 01:12:28 -04:00
Simon f0b08290fc Merge pull request #164 from simonlnu/master 
implement filer/file-as
 2012-03-24 22:04:23 -07:00
Simon L'nu 8fe77e5b86 implement filer/file-as 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-25 01:01:59 -04:00
Simon L'nu 5bd4f62210 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  bug #329 - compress the plugin list on the friendica info page
  bug #346 - add oembed maxwidth to oembed request

* master:
 2012-03-25 00:59:25 -04:00
friendica f1cb287742 bug #329 - compress the plugin list on the friendica info page 2012-03-24 21:50:04 -07:00
friendica d06ddeb1cc bug #346 - add oembed maxwidth to oembed request 2012-03-24 21:26:50 -07:00
Simon L'nu 8a6c407282 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  prevent duplicate friend suggestions
  block filed items from deletion
  add the bang
  network filter is now a permission group
  small fix in css
  add right_aside to diabook-blue
  add connectable services to right_aside
  add PostIt to right_aside, fixes in css

* master:
 2012-03-24 19:38:54 -04:00
friendica 3ae43c2448 prevent duplicate friend suggestions 2012-03-24 15:53:53 -07:00
friendica 3aacc119a1 block filed items from deletion 2012-03-24 04:16:27 -07:00
friendica 8c4fbc3b4d add the bang 2012-03-24 03:11:45 -07:00
friendica 72c2386edf Merge branch 'pull' 2012-03-24 02:32:15 -07:00
friendica db5ec58863 network filter is now a permission group 2012-03-24 01:33:50 -07:00
tommy tomson 8451b22d42 small fix in css 2012-03-24 08:56:26 +01:00
tomtom84 b23ad806ec Merge pull request #163 from tomtom84/master 
fixes in diabook-derivates
 2012-03-24 00:15:31 -07:00
tommy tomson ba027f174d add right_aside to diabook-blue 2012-03-24 08:13:48 +01:00
tomtom84 64397ff09f Merge pull request #162 from tomtom84/master 
fixes in theme diabook
 2012-03-23 22:20:25 -07:00
tommy tomson 378762fed2 add connectable services to right_aside 2012-03-24 06:17:14 +01:00
tomtom84 ef27af623e Merge pull request #161 from tomtom84/master 
fixes in theme diabook
 2012-03-23 20:06:48 -07:00
tommy tomson d76b052f90 add PostIt to right_aside, fixes in css 2012-03-24 04:05:21 +01:00
Simon L'nu 803f79e091 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master: (25 commits)
  diabook: theme.php remove code duplication last photos check for user "hidewall" remove unneeded regex move js code to close popup in main.js (missing stop event propagation in popup links)
  user settings: don't show emoticons
  fix in css right_aside
  small fix
  fix 1024resolution
  add right_aside to theme diabook
  ability to change tags in edited posts
  normalise comparison link on delegation page
  quattro(-green) styling the 'filed under: remove' text
  it's only item.filer ;-)
  non static filer text
  new lines removed
  removed some new lines to cut down number of changed files
  removed unneccessary stuff
  removed problem from previous commit
  tests for the template engine
  adding filer functionality to quattro(-green)
  missing tooltip for "file as"
  prevent re-registrations using a deleted username - not an issue with Friendica but could create a serious privacy issue with federated platforms
  add file_as-option to diabook-derivates
  ...

* master:
 2012-03-23 10:41:55 -04:00
tomtom84 ce8cfb7b05 Merge pull request #160 from fabrixxm/master 
work on diabook theme and settings
 2012-03-23 07:41:32 -07:00
Fabio Comuni 1780fff161 diabook: theme.php 
remove code duplication
last photos check for user "hidewall"
remove unneeded regex
move js code to close popup in main.js (missing stop event propagation in popup links)
 2012-03-23 14:09:06 +01:00
Fabio Comuni 82cc86a41a user settings: don't show emoticons 2012-03-23 12:07:22 +01:00
Fabio Comuni 6f79cde024 Merge remote-tracking branch 'friendica/master' 2012-03-23 10:45:10 +01:00
tommy tomson c35b9ec24f fix in css right_aside 2012-03-23 10:16:11 +01:00
tommy tomson 7706a8f9d8 small fix 2012-03-23 07:28:48 +01:00
tomtom84 149b3f3018 Merge pull request #159 from tomtom84/master 
fixes in theme diabook
 2012-03-22 23:03:55 -07:00
tommy tomson 687fa80094 fix 1024resolution 2012-03-23 07:02:21 +01:00
friendica 42d231f8bf Merge pull request #158 from tomtom84/master 
add right_aside to theme diabook ... need author
 2012-03-22 20:19:44 -07:00
tommy tomson bf4dd8ad17 add right_aside to theme diabook 2012-03-23 02:36:34 +01:00
friendica 528d795fb6 ability to change tags in edited posts 2012-03-22 16:17:10 -07:00
Fabio Comuni d5a6e7b176 Merge remote-tracking branch 'friendica/master' 2012-03-22 14:56:23 +01:00
friendica 622b25df5f Merge branch 'pull' 2012-03-22 06:20:32 -07:00
friendica 40d19d5b8c normalise comparison link on delegation page 2012-03-22 06:19:27 -07:00
Tobias Diekershoff 586c07681b Merge branch 'master' of https://github.com/friendica/friendica 2012-03-22 14:10:53 +01:00
Tobias Diekershoff 07c5b0af5a quattro(-green) styling the 'filed under: remove' text 2012-03-22 14:09:21 +01:00
friendica c7dcc58673 Merge pull request #157 from campino/master 
Tests for the template engine
 2012-03-22 05:49:08 -07:00
Tobias Diekershoff 1e86e3fb26 it's only item.filer ;-) 2012-03-22 13:46:05 +01:00
Tobias Diekershoff 5babf5c8b4 Merge branch 'quattrofiler' 2012-03-22 13:42:10 +01:00
Tobias Diekershoff 6df7fae4b5 non static filer text 2012-03-22 13:41:41 +01:00
Tobias Diekershoff 19eaed60d5 Merge branch 'master' of https://github.com/friendica/friendica 2012-03-22 13:38:59 +01:00