Commit graph

3949 commits

Author SHA1 Message Date
tommy tomson 8e49b4332c style.css fix 2012-03-04 14:19:53 +01:00
tommy tomson e0e0224fa6 some fixes in diabook 2012-03-04 05:48:06 +01:00
tommy tomson 25d6ca3b73 tag fix 2012-03-04 00:10:03 +01:00
tommy tomson b3eeb22401 fix 2012-03-03 23:43:15 +01:00
tommy tomson 173fb983c5 navbar fix 2012-03-03 23:12:03 +01:00
tommy tomson 42b9887693 fixed apps css 2012-03-03 21:45:59 +01:00
tommy tomson d4ac1f2a9c fixed star/unstar 2012-03-03 19:07:55 +01:00
tommy tomson 83e9f57459 fixed admin
fixed editor
2012-03-03 16:49:48 +01:00
tommy tomson b3ba2eb4d0 fix editor 2012-03-03 15:01:25 +01:00
tommy tomson 60adef2463 fix text-editor in theme 2012-03-03 13:27:39 +01:00
tommy tomson 83c25b4386 small fix in style.css 2012-03-03 06:00:46 +01:00
tommy tomson 89f667ff76 fix star/unstar 2012-03-03 04:45:34 +01:00
tommy tomson d138d07c05 fixes in wall_item.tpl and style.css in theme diabook 2012-03-03 04:27:06 +01:00
tommy tomson 8f72d95b0e fix in wall_item.tpl
new icon link.png
2012-03-03 01:52:53 +01:00
tommy tomson d3f83c9375 fixed broken tags and notifications in theme 2012-03-03 00:41:02 +01:00
tommy tomson 64a85b2507 deleted readme.txt from folder diabook 2012-03-02 18:01:21 +01:00
tommy tomson ac1d758f6e github finally working 2012-03-02 17:47:45 +01:00
tommy tomson d72520f5f1 adjust3 2012-03-02 17:45:21 +01:00
tommy tomson cb46e4a11f Merge remote-tracking branch 'tomtom84_friendica/master' into master-2 2012-03-02 17:21:06 +01:00
tommy tomson c26787ab94 adjust2 2012-03-02 17:18:11 +01:00
tommy tomson e2798cee16 adjust 2012-03-02 16:01:20 +01:00
tommy tomson 1fac47a247 Merge remote-tracking branch 'upstream/master' 2012-03-02 04:58:37 +01:00
friendica 8207272fbc Merge branch 'pull' 2012-03-01 18:54:50 -08:00
friendica 58e3372b23 probe for very old (0.97 or 1.0) RSS feed with an incorrect or generic content-type 2012-03-01 18:49:23 -08:00
friendica a5256b7996 Merge pull request #54 from campino/master
Build documentation

This looks good. It may take me some time to get up to speed - and I'm not sure I have all the utilities available via my hosting provider.
2012-03-01 17:54:41 -08:00
tommy tomson 5183e737d0 diabook commit 2012-03-02 02:05:35 +01:00
Alexander Kampmann dd9432903d Merge remote-tracking branch 'upstream/master' 2012-03-01 11:49:22 +01:00
Alexander Kampmann e0c659b34b Enabled automated doc building. Changes:
-build.xml, phing build file
-@package tags at acl_selector.php and db_update.php
-added documentation and some IDE files to .gitignore
-automated tool to find files that corrupt the doc build process
-removed ansi characters from SSH1.php, docBlox could not handle them
2012-03-01 11:44:33 +01:00
friendica bd2c8c92f1 yet more work on notifications 2012-02-29 19:23:01 -08:00
friendica bbebb4c2a0 notification enhancements 2012-02-29 18:19:08 -08:00
friendica 84d5f495e6 better handling of multiple notifications for same item, and old notifications 2012-02-29 16:26:07 -08:00
friendica fb33b4f2bc Update LICENSE 2012-02-29 21:09:20 +11:00
friendica aedb7c5f69 Update README 2012-02-29 21:07:33 +11:00
friendica 60ae0d8974 cleaned up mess created when both people request friendship and one approves as duplex 2012-02-28 17:32:44 -08:00
friendica 21803e0cd3 call time pass by reference deprecated 2012-02-28 14:54:17 -08:00
friendica f40ef1bf46 Merge branch 'pull' 2012-02-28 14:53:41 -08:00
friendica 4dd4a22582 From Tobias H - catch some irregularities caused by cut/paste code 2012-02-28 14:52:23 -08:00
fabrixxm 733f830be4 fix url and network display 2012-02-28 19:10:27 +01:00
friendica 53412dacd4 update globaldir when page-type changes, add spam date field 2012-02-27 23:27:16 -08:00
friendica 2b730ae86d clicking contact on contacts page broken link 2012-02-27 18:46:11 -08:00
friendica 6c0fa7a166 Merge branch 'pull' 2012-02-27 17:18:53 -08:00
friendica d7407f8daa cleanup notify subject lines 2012-02-27 17:18:19 -08:00
fabrixxm e11b51aca1 Merge pull request #53 from fabrixxm/master
remove template filters support
2012-02-27 10:05:27 -08:00
Fabio Comuni 42d591d257 revert 01a2791e3a to avoid random preg internal errors. fix contact_template 2012-02-27 18:48:59 +01:00
Simon a33031634e Merge pull request #52 from campino/master
Corrected syntax error
2012-02-27 06:07:46 -08:00
Alexander Kampmann 9986fc1910 fixed syntax errors 2012-02-27 14:12:44 +01:00
friendica 153e7beb19 add plugin hooks to enotify 2012-02-26 23:54:04 -08:00
Simon 6e76d9d3a3 Merge pull request #51 from simonlnu/master
RFC, request for comments: about the https for html5shiv
2012-02-26 22:20:46 -08:00
Simon L'nu 72e78046af minor typographical fixes. need to do something about the http on https sites for html5shiv. changed to https on mine
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-02-27 01:04:41 -05:00
Simon L'nu 36d173ca98 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: (29 commits)
  spam db
  fix tag icon size
  typo in css
  tagging missing from wallwall and a couple of themes, star missing from dispy
  Mail: New options for actions after importing mails.
  relative link redirects
  Avoid some notices
  Bugfix
  is not always defined; but if defined, then always of type integer
  1 Bugfix (missing $ character) and avoid some notices
  necessare fields not loaded from DB
  should probably be a->user['hidewall'] instead of profile['hidewall']
  "Vier-Theme" Some more design stuff.
  some revision to the German strings
  German strings
  Wrong variable name
  show experimental and unsupported theme status on theme admin page
  jumping divs with no scrolling
  imrpove contrast on darkzero blockquotes
  darkzero-NS theme
  ...

* master:
2012-02-27 00:56:41 -05:00