aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge https://github.com/friendica/red into pending_mergefriendica2015-01-0155-5091/+6715
|\
| * Merge pull request #808 from f03el/masterRedMatrix2015-01-023-4948/+5069
| |\ | | | | | | Swedish translation of frontpage + update from Transifex
| | * Update Swedish strings from TransifexErik Lundin2015-01-022-4947/+4991
| | |
| | * Swedish translationErik Lundin2015-01-021-1/+78
| | | | | | | | | | | | | | | Original translation provided by RedSwede, redswede@redmatrix.nl. Proof-read and complemented by Erik Lundin.
| * | Merge pull request #807 from pafcu/dblclickneweventRedMatrix2015-01-021-0/+5
| |\ \ | | | | | | | | Double click on day in calendar creates new event starting that day
| | * | Double click on day in calendar creats new event starting that dayStefan Parviainen2015-01-011-0/+5
| | |/
| * | Merge pull request #805 from pafcu/moretplRedMatrix2015-01-0212-92/+53
| |\ \ | | | | | | | | Move some HTML out to templates
| | * | Use grouped select field for role selectionStefan Parviainen2015-01-018-48/+28
| | | |
| | * | Use grouped select field for timezone selectionStefan Parviainen2015-01-015-44/+13
| | | |
| | * | Add field template for grouped selectsStefan Parviainen2015-01-011-0/+12
| | |/
| * | Merge pull request #804 from pafcu/areyousureRedMatrix2015-01-0215-0/+1442
| |\ \ | | | | | | | | Warn about unsaved settings using jquery.areyousure
| | * | Warn about unsaved settings using jquery.areyousureStefan Parviainen2015-01-0115-0/+1442
| | |/
| * | Merge pull request #803 from pafcu/checkboxesRedMatrix2015-01-0227-51/+146
| |\ \ | | |/ | |/| Checkboxyfy settings, style checkboxes as switches in redbasic
| | * Possibly make switches work on IE8 (untested)Stefan Parviainen2015-01-0121-18/+28
| | |
| | * Checkboxify yesno-fields, but use CSS to show them as switches in RedbasicStefan Parviainen2015-01-0113-35/+120
| | |
* | | revupfriendica2015-01-011-1/+1
|/ /
* | Merge pull request #800 from pafcu/langRedMatrix2015-01-011000-7/+499188
|\ \ | |/ |/| Language names
| * Add missing vendor/-directory (due to upstream .gitignore)Stefan Parviainen2014-12-317-1/+472
| |
| * Revert "Revert "Language names via intl library.""Stefan Parviainen2014-12-31994-7/+498717
| | | | | | | | This reverts commit 4f35efa0bad4ae6489b63f3eebafe6542d654094.
* | Merge pull request #802 from friendica/revert-792-cssrefactorpafcu2014-12-316-146/+144
|\ \ | | | | | | Revert "Make redbasic css more modular"
| * | Revert "Make redbasic css more modular"pafcu2014-12-316-146/+144
|/ /
* | Merge pull request #801 from friendica/revert-799-cssrefactorpafcu2014-12-312-41/+39
|\ \ | |/ |/| Revert "Move mod_profiles.css content back into style.css, since it cont...
| * Revert "Move mod_profiles.css content back into style.css, since it contains ↵pafcu2014-12-312-41/+39
|/ | | | var..."
* Merge pull request #799 from pafcu/cssrefactorpafcu2014-12-312-39/+41
|\ | | | | Move mod_profiles.css content back into style.css, since it contains var...
| * Move mod_profiles.css content back into style.css, since it contains variablesStefan Parviainen2014-12-312-39/+41
| |
* | Merge pull request #798 from friendica/revert-794-langRedMatrix2014-12-31994-498717/+7
|\ \ | | | | | | Revert "Language names via intl library."
| * | Revert "Language names via intl library."RedMatrix2014-12-31994-498717/+7
|/ /
* | Merge pull request #797 from anaqreon/imagelinkRedMatrix2014-12-316-116/+163
|\ \ | | | | | | Imagelink
| * | Added url tag around image for inserted linksAndrew Manning2014-12-306-116/+163
| | |
| * | Merge pull request #1 from friendica/masteranaqreon2014-12-30471-23780/+36276
| |\ \ | | | | | | | | Pull from upstream
* | \ \ Merge pull request #796 from pafcu/profeditfixRedMatrix2014-12-311-1/+4
|\ \ \ \ | | | | | | | | | | Don't show links to edit alternate profiles if multi_profiles is disable...
| * | | | Don't show links to edit alternate profiles if multi_profiles is disabledStefan Parviainen2014-12-301-1/+4
| | | | |
* | | | | Merge pull request #795 from pafcu/tplcleanupRedMatrix2014-12-3117-201/+0
|\ \ \ \ \ | | | | | | | | | | | | Remove some old, unused templates
| * | | | | Remove some old, unused templatesStefan Parviainen2014-12-3017-201/+0
| | | | | |
* | | | | | Merge pull request #794 from pafcu/langRedMatrix2014-12-31994-7/+498717
|\ \ \ \ \ \ | | | | | | | | | | | | | | Language names via intl library.
| * | | | | | Update function doc, return language code if language is not recognizedStefan Parviainen2014-12-301-3/+7
| | | | | | |
| * | | | | | Language names via intl library. Fixes #773Stefan Parviainen2014-12-30994-5/+498711
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #791 from pafcu/notificationsRedMatrix2014-12-314-2/+36
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Improved notifications
| * | | | | Make showing wall posts, intros and private messages under Notices optionalStefan Parviainen2014-12-303-2/+22
| | | | | |
| * | | | | Show some notification badges in red to indicate they are about youStefan Parviainen2014-12-291-0/+14
| | | | | |
* | | | | | Merge pull request #792 from pafcu/cssrefactorpafcu2014-12-306-144/+146
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | Make redbasic css more modular
| * | | | | Make redbasic css more modularStefan Parviainen2014-12-306-144/+146
| | |_|/ / | |/| | |
* | | | | Merge pull request #793 from pafcu/filestorageurlfixpafcu2014-12-301-1/+5
|\ \ \ \ \ | | | | | | | | | | | | Encode URL offered in filestorage. Fixes #780
| * | | | | Encode URL offered in filestorage. Fixes #780Stefan Parviainen2014-12-301-1/+5
| | |_|/ / | |/| | |
* | | | | Merge pull request #790 from pafcu/sortnotificationspafcu2014-12-301-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Sort notifications
| * | | | | Sort notificationsStefan Parviainen2014-12-301-2/+2
| |/ / / /
* / / / / design fixes for photos, files and random fixesmarijus2014-12-303-33/+51
|/ / / /
* | | | fix recursive file permissionsmarijus2014-12-302-2/+2
| | | |
* | | | css fixesmarijus2014-12-304-7/+9
| | | |
* | | | Merge https://github.com/friendica/red into pending_mergefriendica2014-12-2915-4624/+4621
|\ \ \ \