aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://github.com/friendica/friendicaVasudev Kamath2012-06-045-6/+380
|\
| * quattro: added editor buttons to commentsTobias Diekershoff2012-06-045-6/+380
* | Merge branch 'master' of git://github.com/friendica/friendicaVasudev Kamath2012-06-0470-2656/+3911
|\|
| * quattro: cleanup the less fileTobias Diekershoff2012-06-043-38/+50
| * fix mini photo-menu bugSimon L'nu2012-06-034-6/+6
| * Fix bugs in the retraction codeZach Prezkuta2012-06-032-3/+3
| * Implement relaying of relayable_retractionsZach Prezkuta2012-06-032-0/+21
| * quattro: admin panel styling and 1st buttons for addon/theme overviewTobias Diekershoff2012-06-036-65/+281
| * privacy settings: make submit button translateableTobias Diekershoff2012-06-031-1/+1
| * DE: update to the stringsTobias Diekershoff2012-06-032-845/+909
| * prv messages: make submit translateableTobias Diekershoff2012-06-031-1/+1
| * add hometown to profilesfriendica2012-06-023-2/+17
| * "howlong" added to marital status.friendica2012-06-022-1/+4
| * some zero theming on settings pagefriendica2012-05-303-5/+18
| * transition to beta for private forumsfriendica2012-05-301-2/+0
| * private group tests, cont.friendica2012-05-291-0/+1
| * hide private group if desiredfriendica2012-05-291-0/+4
| * Merge pull request #316 from annando/masterSimon2012-05-291-0/+5
| |\
| | * Merge remote branch 'upstream/master'Michael Vogel2012-05-2915-300/+205
| | |\
| | * \ Merge remote branch 'upstream/master'Michael Vogel2012-05-2533-1173/+1697
| | |\ \
| | * | | Performance testsMichael Vogel2012-05-201-0/+5
| * | | | fix toolbar. more size dynamicismSimon L'nu2012-05-295-28/+38
| | |_|/ | |/| |
| * | | 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
| * | | slackr - tone down the shadows a smidginfriendica2012-05-271-4/+9
| | |/ | |/|
| * | 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
| | |\ \
| | | * | fix small js error when user not logged inroot2012-05-241-1/+1
| | | * | install wizard: fix php executable pathroot2012-05-241-2/+2
| | * | | update dark a bit. i messed up some buttonsSimon L'nu2012-05-244-42/+24
| * | | | 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
| * | | | 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 wizardroot2012-05-232-3/+4
| * | | clean up and make nice the dispy photo edit stuffSimon L'nu2012-05-235-64/+164
| * | | add a placeholder attribute on search-text; dispy fixesSimon L'nu2012-05-236-34/+57
| |/ /
| * | 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
| |\ \