Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'upstream/master' | Michael Vogel | 2012-05-25 | 33 | -1173/+1697 |
|\ | |||||
| * | Merge https://github.com/friendica/friendica into pull | friendica | 2012-05-25 | 9 | -442/+446 |
| |\ | |||||
| | * | DE update to strings and templates | Tobias Diekershoff | 2012-05-25 | 3 | -397/+419 |
| | | | |||||
| | * | Merge pull request #313 from fabrixxm/master | Simon | 2012-05-24 | 2 | -3/+3 |
| | |\ | | | | | | | | | install wizard: fix php executable path | ||||
| | | * | fix small js error when user not logged in | root | 2012-05-24 | 1 | -1/+1 |
| | | | | |||||
| | | * | install wizard: fix php executable path | root | 2012-05-24 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | - php executable not required - "check again" button submit form instead of reload page via js - checks form submit to install module without redirect | ||||
| | * | | update dark a bit. i messed up some buttons | Simon L'nu | 2012-05-24 | 4 | -42/+24 |
| | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | | | rev update | friendica | 2012-05-25 | 1 | -1/+1 |
| |/ / | |||||
| * | | slackr: improve interactivity | friendica | 2012-05-23 | 1 | -0/+14 |
| | | | |||||
| * | | slackr: hide calendar when posting | friendica | 2012-05-23 | 1 | -0/+8 |
| | | | |||||
| * | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-05-23 | 4 | -39/+70 |
| |\ \ | |||||
| | * | | clean up and more fixing | Simon L'nu | 2012-05-23 | 4 | -39/+70 |
| | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | | | more theme stuff | friendica | 2012-05-23 | 3 | -1/+56 |
| |/ / | |||||
| * | | slackr - better highlighting of current selections | friendica | 2012-05-23 | 1 | -1/+6 |
| | | | |||||
| * | | slackr - knock the sharp edges off the events calendar | friendica | 2012-05-23 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #309 from fabrixxm/master | Simon | 2012-05-23 | 2 | -3/+4 |
| |\| | | | | | | | Update install wizard | ||||
| | * | Update install wizard | root | 2012-05-23 | 2 | -3/+4 |
| | | | | | | | | | | | | | | | | | | - writable .htconfig.php not required - add test for working .htaccess/mod_rewrite configuration - fix last pass: create tables, eventually show config text and print a "What next" section | ||||
| * | | clean up and make nice the dispy photo edit stuff | Simon L'nu | 2012-05-23 | 5 | -64/+164 |
| | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | | add a placeholder attribute on search-text; dispy fixes | Simon L'nu | 2012-05-23 | 6 | -34/+57 |
| |/ | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | photo rotation | friendica | 2012-05-23 | 2 | -3/+12 |
| | | |||||
| * | event calendar theming | friendica | 2012-05-22 | 1 | -0/+3 |
| | | |||||
| * | import quattro event reminder | friendica | 2012-05-22 | 2 | -0/+40 |
| | | |||||
| * | mark bubbles unsupported | friendica | 2012-05-22 | 2 | -0/+0 |
| | | |||||
| * | keep FB out of private notes | friendica | 2012-05-22 | 1 | -0/+1 |
| | | |||||
| * | Merge https://github.com/friendica/friendica into pull | friendica | 2012-05-22 | 2 | -4/+8 |
| |\ | |||||
| | * | Oops - but lets commit the right revision, sorry. There's a spare line in ↵ | Thomas Willingham | 2012-05-22 | 1 | -6/+1 |
| | | | | | | | | | | | | the last one. | ||||
| | * | Fix darkzero/ns BB icon background colours. | Thomas Willingham | 2012-05-22 | 2 | -4/+13 |
| | | | |||||
| * | | if identity (uid) changes - reload any other open browser windows on next ping. | friendica | 2012-05-22 | 1 | -0/+1 |
| |/ | |||||
| * | add queue totals to admin summary page | friendica | 2012-05-22 | 1 | -0/+4 |
| | | |||||
| * | DE: update to the strings and some mail templates | Tobias Diekershoff | 2012-05-22 | 4 | -483/+535 |
| | | |||||
| * | fix (min-)search-text text | Simon L'nu | 2012-05-21 | 2 | -2/+2 |
| | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | updates to dispy family; fix typo in INSTALL.txt | Simon L'nu | 2012-05-21 | 8 | -211/+225 |
| | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | Merge https://github.com/friendica/friendica into pull | friendica | 2012-05-21 | 2 | -8/+8 |
| |\ | |||||
| | * | more light fixes | Simon L'nu | 2012-05-21 | 2 | -2/+2 |
| | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * | fix dumb mistake in light | Simon L'nu | 2012-05-21 | 2 | -6/+6 |
| | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | | rev update, bug 428, 429, and ability to block globaldir submissions from ↵ | friendica | 2012-05-21 | 5 | -12/+82 |
| |/ | | | | | | | demo sites | ||||
| * | fix dispy light | Simon L'nu | 2012-05-20 | 2 | -2/+2 |
| | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | Darkzero-NS + 'Friendicaland' countries. | Thomas Willingham | 2012-05-20 | 1 | -9/+66 |
| | | |||||
| * | Darkzero, another missing part of "everything" | Thomas Willingham | 2012-05-19 | 1 | -0/+1 |
| | | |||||
| * | Diabook-dark - some more cleaning up | Thomas Willingham | 2012-05-19 | 2 | -4/+5 |
| | | |||||
| * | Okay, so maybe not *everything* | Thomas Willingham | 2012-05-19 | 1 | -2/+11 |
| | | |||||
| * | Give Darkzero some loving. | Thomas Willingham | 2012-05-19 | 1 | -1/+18 |
| | | | | | | | | Everything that used to be hidden with light text on light backgrounds is legible now. | ||||
* | | Performance tests | Michael Vogel | 2012-05-20 | 1 | -0/+5 |
|/ | |||||
* | fix -desc again | Simon L'nu | 2012-05-19 | 4 | -5/+5 |
| | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | apply max-width to images in posts, duepuntozero | friendica | 2012-05-18 | 1 | -0/+5 |
| | |||||
* | theming for default group selector | friendica | 2012-05-18 | 2 | -2/+4 |
| | |||||
* | more private forums, default privacy group for new contacts | friendica | 2012-05-17 | 3 | -0/+14 |
| | |||||
* | fix admin links... | Simon L'nu | 2012-05-16 | 2 | -2/+2 |
| | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | *sigh*. fix dark *again* | Simon L'nu | 2012-05-16 | 2 | -2/+2 |
| | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | get rid of the monstrosity for .button. need to find alternate solution | Simon L'nu | 2012-05-16 | 4 | -16/+19 |
| | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> |