aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Expand)AuthorAgeFilesLines
* Merge https://github.com/friendica/red into pending_mergefriendica2014-07-251-0/+4
|\
| * Merge branch 'master' of https://github.com/friendica/redmarijus2014-07-2519-5919/+6636
| |\
| * | fixes #545marijus2014-07-251-0/+4
* | | wrong label on iconfriendica2014-07-251-1/+1
| |/ |/|
* | make profile edit pencil stand out a bit on darker backgroundsfriendica2014-07-242-1/+2
* | always provide a profile edit entry in the nav usermenufriendica2014-07-241-2/+2
* | cherry pick pull request #544friendica2014-07-242-7/+2
* | French Translationsmycocham2014-07-2418-5918/+6639
|/
* update to bootstrap-3.2 and minor css adjustmentsmarijus2014-07-242-20/+2
* Merge branch 'master' of https://github.com/mrjive/red into mrjive-masterfriendica2014-07-231-1/+1
|\
| * Just a small typomrjive2014-07-241-1/+1
* | Merge branch 'master' of https://github.com/friendica/redJeroen2014-07-234-19/+92
|\ \
| * | some backend JS support for an endless scroll directoryfriendica2014-07-221-3/+68
| * | when telling somebody that permissions have changed but not yet submitted, gi...friendica2014-07-223-16/+24
* | | update nlJeroen2014-07-232-1095/+1154
|/ /
* / IT: updated stringstuscanhobbit2014-07-1912-5961/+6200
|/
* provide a specific permission for liking profiles (reuse the obsolete bookmar...friendica2014-07-172-4/+19
* make mod_like interactive if requestedfriendica2014-07-171-4/+1
* Introducing page template Redable (sic). A template for making it easier to r...Jeroen2014-07-162-0/+128
* small fix nljeroenpraat2014-07-092-3/+3
* more event display formattingfriendica2014-07-073-10/+23
* event render improvementsfriendica2014-07-063-4/+10
* nl 100%git statusjeroenpraat2014-07-062-5969/+6173
* some initial work towards email address verificationfriendica2014-07-031-0/+25
* fix nljeroenpraat2014-07-032-62/+62
* move code out of templates - not sure how this even worked.friendica2014-07-031-9/+9
* Red Matrix default instead of global default. Is more clear. Update nl to 99%...jeroenpraat2014-07-023-6056/+5857
* Merge branch 'master' of https://github.com/friendica/redjeroenpraat2014-07-023-6074/+5878
|\
| * Merge pull request #525 from tuscanhobbit/masterPaolo T2014-07-022-6074/+5875
| |\
| | * IT: strings updatedPaolo Tacconi2014-07-022-6074/+5875
| * | minor adjustmentsfriendica2014-07-011-0/+3
* | | Changed Default to Light (global default). So if hub owners want to change th...jeroenpraat2014-07-021-1/+1
|/ /
* | fix 1 error in nl that somehow sneaked injeroenpraat2014-07-012-3/+3
* | update/approve nl to 98%git statusjeroenpraat2014-07-012-99/+99
* | update nljeroenpraat2014-07-012-117/+117
* | Merge pull request #520 from pixelroot/masterRedMatrix2014-07-012-694/+769
|\ \
| * | Updated Russian translationpixelroot2014-06-302-694/+769
* | | Merge pull request #521 from tuscanhobbit/masterRedMatrix2014-07-011-22/+30
|\ \ \ | | |/ | |/|
| * | Changed the lock icon behaviourPaolo Tacconi2014-06-301-22/+30
* | | update nljeroenpraat2014-06-302-35/+35
* | | update nljeroenpraat2014-06-292-566/+641
* | | Merge pull request #516 from dawnbreak/masterRedMatrix2014-06-301-14/+9
|\ \ \
| * | | Fixed some more timestamp bugs in RedDAV.Klaus Weidenbach2014-06-291-14/+9
* | | | Remove Remove Account link from account settingsChristian Vogeley2014-06-292-4/+4
|/ / /
* | | Merge pull request #515 from tuscanhobbit/masterPaolo T2014-06-292-488/+563
|\| |
| * | IT:updated stringstuscanhobbit2014-06-292-488/+563
* | | Merge pull request #513 from dawnbreak/masterRedMatrix2014-06-291-0/+23
|\ \ \
| * | | Some documentation for include/reddav.php and a new tpl-file.Klaus Weidenbach2014-06-291-0/+23
* | | | Merge pull request #514 from tuscanhobbit/masterRedMatrix2014-06-294-37/+27
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Checkboxes were not aligned in connedit, added a tabletuscanhobbit2014-06-284-37/+27