Commit graph

5449 commits

Author SHA1 Message Date
friendica 8c26640835 reset permissions to forum default when adding forum delivery chain 2012-05-06 23:06:21 -07:00
Simon fb05cd6f18 Merge pull request #291 from simonlnu/master
minor css tweaks
2012-05-06 22:22:29 -07:00
Simon L'nu e554530430 more css tweaks. nothing major
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-07 01:20:32 -04:00
Simon L'nu c36e39b18e Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  I'll leave the private mail recipient autocomplete partially done. Need a good UI/JS person to finish it off.
  mail autcomplete testing
  email recip autocomplete
  rev update
  diabook-theme: small fix
  diabook-theme: add "Earth Layers"-box at right_side
  diabook-theme: twitterbox-bugfix
  diabook: small fix
  diabook-theme: bugfix

* master:
2012-05-07 00:55:53 -04:00
friendica b3b303f037 Merge branch 'ac' 2012-05-06 20:08:20 -07:00
friendica b74a776162 I'll leave the private mail recipient autocomplete partially done. Need a good UI/JS person to finish it off. 2012-05-06 20:06:39 -07:00
friendica 8a10af3bce Merge https://github.com/friendica/friendica into pull 2012-05-06 19:56:27 -07:00
friendica 851264161f mail autcomplete testing 2012-05-06 19:55:39 -07:00
friendica 57920849c4 email recip autocomplete 2012-05-06 19:53:34 -07:00
friendica 8e46c43ee1 rev update 2012-05-06 19:52:22 -07:00
tommy tomson e417f083b5 diabook-theme: small fix 2012-05-07 02:49:44 +02:00
tommy tomson 3d0a0b6abf diabook-theme: add "Earth Layers"-box at right_side 2012-05-07 02:24:43 +02:00
tommy tomson 66b9b60792 diabook-theme: twitterbox-bugfix 2012-05-06 23:26:44 +02:00
tommy tomson f09b3cfbf8 diabook: small fix 2012-05-06 12:25:09 +02:00
tommy tomson 8bdbfdc853 Merge remote-tracking branch 'origin/master' 2012-05-06 12:09:22 +02:00
tommy tomson abbb4c2f36 diabook-theme: bugfix 2012-05-06 12:08:46 +02:00
Simon b4bd8258e2 Merge pull request #290 from simonlnu/master
font and width tweaking
2012-05-06 03:08:08 -07:00
Simon L'nu f32c3d74a4 fixing widths to be more dynamic where possible. font size fixes. add README.md
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-06 06:05:31 -04:00
Simon L'nu 7e7372fc5a Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  bad sql left after the mailbox in/out merge

* master:
2012-05-06 04:51:15 -04:00
friendica 47c3b43afd Merge https://github.com/friendica/friendica into pull 2012-05-05 17:54:19 -07:00
friendica 49ccefd6c7 bad sql left after the mailbox in/out merge 2012-05-05 17:53:23 -07:00
Simon L'nu 0c4099966a Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  diabook-theme: small fix
  diabook-theme: twitter-box-update at right_aside
  diabook-theme: can now set the twitter search term in theme-settings & small fixes
  consolidate item deletion so we can fix orphaned categories and file_as tags.
  DE: new email templates translated
  workaround to clean up orphaned filetags
  only show remove category to item owner
  Option to set theme width added. Minor layout changes

* master:
2012-05-05 20:08:19 -04:00
tommy tomson e1ab3a93cc diabook-theme: small fix 2012-05-06 00:36:46 +02:00
tommy tomson c421f35da7 diabook-theme: twitter-box-update at right_aside 2012-05-06 00:10:35 +02:00
tommy tomson f297751437 diabook-theme: can now set the twitter search term in theme-settings & small fixes 2012-05-05 20:01:38 +02:00
friendica 8ae83201cf consolidate item deletion so we can fix orphaned categories and file_as tags. 2012-05-05 07:05:32 -07:00
friendica 8f26e698e6 Merge pull request #289 from cvogeley/master
Option to set theme width added. Minor layout changes
2012-05-05 05:04:05 -07:00
Tobias Diekershoff f9f62ee7ec DE: new email templates translated 2012-05-05 09:11:25 +02:00
friendica d0dd22af57 workaround to clean up orphaned filetags 2012-05-04 17:43:47 -07:00
friendica 7c6e8b30b2 only show remove category to item owner 2012-05-04 16:45:10 -07:00
Christian Vogeley 7f061c255c Option to set theme width added. Minor layout changes 2012-05-05 00:45:35 +02:00
Simon L'nu 250bf57e1e Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:

* master:
2012-05-04 17:43:04 -04:00
Simon 62ea9130fe Merge pull request #288 from simonlnu/master
multiple fixes
2012-05-04 14:13:03 -07:00
Simon L'nu 20ea1b7d4b fix lightbox; finished dark, now on to light
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-04 17:06:17 -04:00
Simon L'nu 5830c32dce Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  category removal
  Esperanto 100%
  "show more" friends in common

* master:
2012-05-04 17:03:23 -04:00
friendica 37d4181fde Merge https://github.com/friendica/friendica into pull 2012-05-04 06:43:24 -07:00
friendica 10754ced3e category removal 2012-05-04 06:42:56 -07:00
friendica 2a987356c6 Merge pull request #287 from mschmitt/master
Update Esperanto to 100%
2012-05-04 03:27:48 -07:00
Martin Schmitt 52f4563f30 Esperanto 100% 2012-05-04 12:02:05 +02:00
friendica 9ecd128e5e "show more" friends in common 2012-05-04 01:46:36 -07:00
Simon L'nu 00190b7faa Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  DE strings
  implement max load average before queuing/deferring delivery and poller processes
  yet another bug in remote_friends_in_common
  string update
  use html symbols for double quotes
  string update
  proofreading the mail templates in fr fixed typo, grammar, spelling…
  validate_url() and validate_email() validate also IP address.

* master:
2012-05-04 02:31:21 -04:00
Tobias Diekershoff 22c8fe46a5 DE strings 2012-05-04 07:30:49 +02:00
friendica 421acee65b implement max load average before queuing/deferring delivery and poller processes 2012-05-03 21:50:48 -07:00
friendica 15542a8690 yet another bug in remote_friends_in_common 2012-05-03 20:47:04 -07:00
friendica f2d3039aed string update 2012-05-03 17:20:24 -07:00
friendica 2818cb28e9 use html symbols for double quotes 2012-05-03 17:19:53 -07:00
friendica f3e18df55d string update 2012-05-03 16:55:03 -07:00
friendica ff75dc4e40 Merge pull request #284 from fabrixxm/master
validate_url() and validate_email() validate also IP address.
2012-05-03 16:45:30 -07:00
friendica 6a5e5096db Merge pull request #286 from grossard/french_proofreading
proofreading the mail templates in fr
2012-05-03 14:01:06 -07:00
Ludovic Grossard 1f86205ee8 proofreading the mail templates in fr
fixed typo, grammar, spelling…
2012-05-03 22:35:59 +02:00