clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
4,739 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

4739 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
friendica c37ffd2999 can_write_wall documentation 2012-03-05 15:04:43 -08:00
Simon 4b456e2273 Merge pull request #89 from simonlnu/master 
implement more changes
 2012-03-05 14:57:51 -08:00
Simon L'nu 50824bddd0 implement more of the changes requested 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-05 17:57:04 -05:00
Simon L'nu 6a0729d5a4 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  revup

* master:
 2012-03-05 17:56:38 -05:00
friendica 0d9c2ca06f Merge branch 'pull' 2012-03-05 13:38:06 -08:00
friendica c6dce8dd6b revup 2012-03-05 13:37:32 -08:00
tommy tomson a406c16581 fixes 2012-03-05 22:31:03 +01:00
Alexander Kampmann fbc017cdba added test blueprints, fixed? encoding issues 2012-03-05 22:22:10 +01:00
Simon 092115ca44 Merge pull request #88 from simonlnu/master 
multiple ui fixes
 2012-03-05 12:57:30 -08:00
Simon L'nu 9d461846e2 multiple fixes; the jot-header works as standalone, not sure what's up. 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-05 15:55:17 -05:00
Simon L'nu 7f894794e4 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:

* master:
 2012-03-05 13:17:40 -05:00
Simon 1772037c98 Merge pull request #87 from simonlnu/master 
contact_block.tpl link fix and dispy page parts
 2012-03-05 10:17:26 -08:00
Simon L'nu 02f825ca3c tweak sizing of <section> and <aside> more; fix link in 'view contacts' in sidebar 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-05 13:16:28 -05:00
Simon L'nu e05313f88f Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:

* master:
 2012-03-05 12:23:16 -05:00
Simon fd240687b9 Merge pull request #86 from simonlnu/master 
more dispy
 2012-03-05 09:23:01 -08:00
Simon L'nu ef1d02e7bd still working on jot-header. amending <aside> and other elements 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-05 12:21:57 -05:00
Simon L'nu 8cce12f28a Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:

* master:
 2012-03-05 10:56:58 -05:00
Simon e786e4253d Merge pull request #85 from simonlnu/master 
hopefully fix overflow issue now
 2012-03-05 07:56:43 -08:00
Simon L'nu 65b6ec79ed hopefully fix the overflow issue everywhere this time 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-05 10:55:26 -05:00
Simon L'nu 3ab7132b64 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  $name appearing on testbubble items
  testbubble notifications

* master:
 2012-03-05 10:17:34 -05:00
friendica 965e657c20 $name appearing on testbubble items 2012-03-05 03:10:45 -08:00
friendica 31f192bb57 Merge branch 'pull' 2012-03-05 00:54:25 -08:00
friendica 0d97799324 testbubble notifications 2012-03-05 00:53:42 -08:00
Simon 49d9dd374c Merge pull request #84 from simonlnu/master 
more ui bugs fixed \o/
 2012-03-04 22:09:56 -08:00
Simon L'nu 7de79a8c49 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  like dislike button
  fixes in diabook

* master:
 2012-03-05 01:08:54 -05:00
Simon L'nu fe7a6b070d yet more ui things, and bug fixing 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-05 01:08:45 -05:00
tomtom84 9c541dbd67 Merge pull request #83 from tomtom84/master 
fixes in diabook theme
 2012-03-04 20:15:26 -08:00
tommy tomson fe614b4e7c like dislike button 2012-03-05 05:14:08 +01:00
Simon L'nu 290fdefa82 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  wrap title and text for editplain in zero and TB themes
  correct owner info from misconfigured installs, duepuntozero title block misplaced in editplain mode
  improved contrast in acl selector, and preview (darkzero)

* master:
 2012-03-04 22:20:42 -05:00
Simon 04527bd0b1 Merge pull request #80 from unary/darkzero 
improved contrast in acl selector, and preview (darkzero)
 2012-03-04 19:19:45 -08:00
Simon 3b95171824 Merge pull request #82 from simonlnu/master 
say hello to dispy's younger brother
 2012-03-04 19:19:08 -08:00
Simon L'nu 58cdf776b6 more ui thingies with dispy - we'll get you well dispy, we promise 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-04 22:16:10 -05:00
friendica b57247d6a6 Merge branch 'pull' 2012-03-04 19:15:42 -08:00
Simon L'nu b34dd1ca71 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  fixes in diabook
  unused replacement variable displays %1 in all html2bbcode 'code' blocks
  revup
  style.css fix

* master:
 2012-03-04 22:15:28 -05:00
friendica b9bea3a549 wrap title and text for editplain in zero and TB themes 2012-03-04 19:14:03 -08:00
friendica fba089012a correct owner info from misconfigured installs, duepuntozero title block misplaced in editplain mode 2012-03-04 18:50:32 -08:00
tommy tomson e52891d8ab fixes in diabook 2012-03-05 03:08:58 +01:00
tomtom84 d369fcc994 Merge pull request #81 from tomtom84/master 
fixes in diabook theme
 2012-03-04 17:46:48 -08:00
tommy tomson 1653e5a615 fixes in diabook 2012-03-05 02:45:24 +01:00
friendica 4134fd3dce unused replacement variable displays %1 in all html2bbcode 'code' blocks 2012-03-04 16:26:16 -08:00
Simon L'nu efb60e603c Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:

* master:
 2012-03-04 17:47:17 -05:00
Michael Johnston b2035ae0c6 improved contrast in acl selector, and preview (darkzero) 2012-03-04 17:29:00 -05:00
friendica 4b1f3555f1 Merge branch 'pull' 2012-03-04 13:39:53 -08:00
friendica cd5a11bb0f revup 2012-03-04 13:39:17 -08:00
Simon 7d8ed95e78 Merge pull request #79 from simonlnu/master 
more UI fixes
 2012-03-04 12:54:57 -08:00
Simon L'nu 2441babbe9 removed extra padding/border on tread-wrapper (heh, tea read :P) 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-04 15:52:50 -05:00
Simon L'nu 6b8cb80ea3 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:

* master:
 2012-03-04 15:27:10 -05:00
Simon 550a98aaae Merge pull request #78 from simonlnu/master 
fix ui issue with toolbar and notification icons
 2012-03-04 11:56:19 -08:00
Simon L'nu 25510453bf fix up toolbar so the notifications line up better together 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-04 14:55:09 -05:00
Simon L'nu e3ad02d0dd Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:

* master:
 2012-03-04 14:53:57 -05:00