aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'upstream/master'Michael Vogel2012-05-2915-300/+205
|\
| * ability to only expire contacts, not selffriendica2012-05-291-0/+1
| |
| * more theme cleanupfriendica2012-05-283-2/+23
| |
| * fixed font-size/line-height stuffsSimon L'nu2012-05-2811-294/+172
| | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * slackr - tone down the shadows a smidginfriendica2012-05-271-4/+9
| |
* | Merge remote branch 'upstream/master'Michael Vogel2012-05-2533-1173/+1697
|\|
| * Merge https://github.com/friendica/friendica into pullfriendica2012-05-259-442/+446
| |\
| | * DE update to strings and templatesTobias Diekershoff2012-05-253-397/+419
| | |
| | * Merge pull request #313 from fabrixxm/masterSimon2012-05-242-3/+3
| | |\ | | | | | | | | install wizard: fix php executable path
| | | * fix small js error when user not logged inroot2012-05-241-1/+1
| | | |
| | | * install wizard: fix php executable pathroot2012-05-241-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 buttonsSimon L'nu2012-05-244-42/+24
| | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * | | rev updatefriendica2012-05-251-1/+1
| |/ /
| * | slackr: improve interactivityfriendica2012-05-231-0/+14
| | |
| * | slackr: hide calendar when postingfriendica2012-05-231-0/+8
| | |
| * | Merge https://github.com/friendica/friendica into pullfriendica2012-05-234-39/+70
| |\ \
| | * | clean up and more fixingSimon L'nu2012-05-234-39/+70
| | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * | | more theme stufffriendica2012-05-233-1/+56
| |/ /
| * | slackr - better highlighting of current selectionsfriendica2012-05-231-1/+6
| | |
| * | slackr - knock the sharp edges off the events calendarfriendica2012-05-231-1/+1
| | |
| * | Merge pull request #309 from fabrixxm/masterSimon2012-05-232-3/+4
| |\| | | | | | | Update install wizard
| | * Update install wizardroot2012-05-232-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 stuffSimon L'nu2012-05-235-64/+164
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * | add a placeholder attribute on search-text; dispy fixesSimon L'nu2012-05-236-34/+57
| |/ | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * photo rotationfriendica2012-05-232-3/+12
| |
| * event calendar themingfriendica2012-05-221-0/+3
| |
| * import quattro event reminderfriendica2012-05-222-0/+40
| |
| * mark bubbles unsupportedfriendica2012-05-222-0/+0
| |
| * keep FB out of private notesfriendica2012-05-221-0/+1
| |
| * Merge https://github.com/friendica/friendica into pullfriendica2012-05-222-4/+8
| |\
| | * Oops - but lets commit the right revision, sorry. There's a spare line in ↵Thomas Willingham2012-05-221-6/+1
| | | | | | | | | | | | the last one.
| | * Fix darkzero/ns BB icon background colours.Thomas Willingham2012-05-222-4/+13
| | |
| * | if identity (uid) changes - reload any other open browser windows on next ping.friendica2012-05-221-0/+1
| |/
| * add queue totals to admin summary pagefriendica2012-05-221-0/+4
| |
| * DE: update to the strings and some mail templatesTobias Diekershoff2012-05-224-483/+535
| |
| * fix (min-)search-text textSimon L'nu2012-05-212-2/+2
| | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * updates to dispy family; fix typo in INSTALL.txtSimon L'nu2012-05-218-211/+225
| | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * Merge https://github.com/friendica/friendica into pullfriendica2012-05-212-8/+8
| |\
| | * more light fixesSimon L'nu2012-05-212-2/+2
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * fix dumb mistake in lightSimon L'nu2012-05-212-6/+6
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * | rev update, bug 428, 429, and ability to block globaldir submissions from ↵friendica2012-05-215-12/+82
| |/ | | | | | | demo sites
| * fix dispy lightSimon L'nu2012-05-202-2/+2
| | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * Darkzero-NS + 'Friendicaland' countries.Thomas Willingham2012-05-201-9/+66
| |
| * Darkzero, another missing part of "everything"Thomas Willingham2012-05-191-0/+1
| |
| * Diabook-dark - some more cleaning upThomas Willingham2012-05-192-4/+5
| |
| * Okay, so maybe not *everything*Thomas Willingham2012-05-191-2/+11
| |
| * Give Darkzero some loving.Thomas Willingham2012-05-191-1/+18
| | | | | | | | Everything that used to be hidden with light text on light backgrounds is legible now.
* | Performance testsMichael Vogel2012-05-201-0/+5
|/
* fix -desc againSimon L'nu2012-05-194-5/+5
| | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
* apply max-width to images in posts, duepuntozerofriendica2012-05-181-0/+5
|