pafcu
|
8c8a10b819
|
Revert "Move mod_profiles.css content back into style.css, since it contains var..."
|
2014-12-31 12:00:47 +02:00 |
|
Stefan Parviainen
|
127527f9e9
|
Add missing vendor/-directory (due to upstream .gitignore)
|
2014-12-31 10:44:37 +01:00 |
|
Stefan Parviainen
|
7bf7f8180d
|
Revert "Revert "Language names via intl library.""
This reverts commit 4f35efa0ba .
|
2014-12-31 10:42:08 +01:00 |
|
pafcu
|
24a16434bc
|
Merge pull request #799 from pafcu/cssrefactor
Move mod_profiles.css content back into style.css, since it contains var...
|
2014-12-31 11:31:15 +02:00 |
|
Stefan Parviainen
|
5e6fa5a830
|
Move mod_profiles.css content back into style.css, since it contains variables
|
2014-12-31 10:26:05 +01:00 |
|
friendica
|
c0885c81e6
|
Merge branch 'master' into trinidad
|
2014-12-30 15:47:01 -08:00 |
|
RedMatrix
|
a54f168463
|
Merge pull request #798 from friendica/revert-794-lang
Revert "Language names via intl library."
|
2014-12-31 10:44:49 +11:00 |
|
RedMatrix
|
4f35efa0ba
|
Revert "Language names via intl library."
|
2014-12-31 10:43:19 +11:00 |
|
friendica
|
abd345f80f
|
Merge branch 'master' into trinidad
|
2014-12-30 15:25:06 -08:00 |
|
RedMatrix
|
ae9d08267c
|
Merge pull request #797 from anaqreon/imagelink
Imagelink
|
2014-12-31 10:23:50 +11:00 |
|
RedMatrix
|
009b05b3b6
|
Merge pull request #796 from pafcu/profeditfix
Don't show links to edit alternate profiles if multi_profiles is disable...
|
2014-12-31 10:22:30 +11:00 |
|
RedMatrix
|
b7d758fed0
|
Merge pull request #795 from pafcu/tplcleanup
Remove some old, unused templates
|
2014-12-31 10:22:12 +11:00 |
|
RedMatrix
|
7b0b0dd76f
|
Merge pull request #794 from pafcu/lang
Language names via intl library.
|
2014-12-31 10:21:53 +11:00 |
|
RedMatrix
|
4a82967639
|
Merge pull request #791 from pafcu/notifications
Improved notifications
|
2014-12-31 10:21:38 +11:00 |
|
Andrew Manning
|
c49b521884
|
Added url tag around image for inserted links
|
2014-12-30 16:16:57 -06:00 |
|
anaqreon
|
b78a545a10
|
Merge pull request #1 from friendica/master
Pull from upstream
|
2014-12-30 16:06:35 -06:00 |
|
pafcu
|
43671a0a32
|
Merge pull request #792 from pafcu/cssrefactor
Make redbasic css more modular
|
2014-12-30 22:42:34 +02:00 |
|
pafcu
|
0623b47237
|
Merge pull request #793 from pafcu/filestorageurlfix
Encode URL offered in filestorage. Fixes #780
|
2014-12-30 22:40:53 +02:00 |
|
pafcu
|
3096ae43c3
|
Merge pull request #790 from pafcu/sortnotifications
Sort notifications
|
2014-12-30 22:39:31 +02:00 |
|
Stefan Parviainen
|
2444a3f9d9
|
Don't show links to edit alternate profiles if multi_profiles is disabled
|
2014-12-30 21:33:20 +01:00 |
|
marijus
|
4edc9a696b
|
design fixes for photos, files and random fixes
|
2014-12-30 21:04:48 +01:00 |
|
Stefan Parviainen
|
b54bbf0fb8
|
Update function doc, return language code if language is not recognized
|
2014-12-30 20:34:26 +01:00 |
|
Stefan Parviainen
|
9cab8ae58a
|
Language names via intl library. Fixes #773
|
2014-12-30 20:29:31 +01:00 |
|
Stefan Parviainen
|
f6b16e1d5a
|
Encode URL offered in filestorage. Fixes #780
|
2014-12-30 18:11:45 +01:00 |
|
Stefan Parviainen
|
e6a3ea2c95
|
Make showing wall posts, intros and private messages under Notices optional
|
2014-12-30 15:27:33 +01:00 |
|
Stefan Parviainen
|
2710510392
|
Sort notifications
|
2014-12-30 15:21:29 +01:00 |
|
Stefan Parviainen
|
12e6d98659
|
Remove some old, unused templates
|
2014-12-30 14:11:27 +01:00 |
|
marijus
|
8e034a3b6b
|
fix recursive file permissions
|
2014-12-30 13:56:27 +01:00 |
|
marijus
|
6cbbe854d5
|
css fixes
|
2014-12-30 12:12:55 +01:00 |
|
Stefan Parviainen
|
6501c4d93e
|
Make redbasic css more modular
|
2014-12-30 11:32:00 +01:00 |
|
friendica
|
2f650b74d3
|
Merge branch 'master' into trinidad
|
2014-12-29 23:58:14 -08:00 |
|
friendica
|
9b2c71a5dc
|
Merge https://github.com/friendica/red into pending_merge
|
2014-12-29 23:57:33 -08:00 |
|
friendica
|
5cfe051139
|
initial trinidad checkin
|
2014-12-29 23:48:04 -08:00 |
|
friendica
|
20356217c5
|
revup
|
2014-12-29 23:41:37 -08:00 |
|
RedMatrix
|
619733e297
|
Merge pull request #789 from pafcu/chanman
Don't show current channel separately in channel manager, highlight it i...
|
2014-12-30 08:57:37 +11:00 |
|
RedMatrix
|
d1d4cec932
|
Merge pull request #787 from pafcu/mainjsfix
Only call autotime() on the correct elements
|
2014-12-30 08:57:08 +11:00 |
|
RedMatrix
|
ca8b31b989
|
Merge pull request #786 from f03el/master
Don't trim escaped quotes
|
2014-12-30 08:56:50 +11:00 |
|
marijus
|
f2bfdf0c76
|
some work on cloud actionspanel and minor cleanup
|
2014-12-29 22:45:07 +01:00 |
|
Stefan Parviainen
|
e69e59d260
|
Don't show current channel separately in channel manager, highlight it instead
|
2014-12-29 22:07:40 +01:00 |
|
marijus
|
d801c361d6
|
css fixes and remove sloppy photos setting since it is not supported anymore in redbasic
|
2014-12-29 21:53:00 +01:00 |
|
Stefan Parviainen
|
de338b3dd7
|
Show some notification badges in red to indicate they are about you
|
2014-12-29 20:43:24 +01:00 |
|
Stefan Parviainen
|
345943d48f
|
Only call autotime() on the correct elements
|
2014-12-29 20:02:56 +01:00 |
|
Erik Lundin
|
d029d3a9f9
|
Don't trim escaped quotes
|
2014-12-29 17:24:53 +01:00 |
|
Thomas Willingham
|
a70e42edac
|
Remove link to hubloc status in admin panel. This is a potentially useful tool,
but plain doesn't work at the moment.
|
2014-12-29 14:47:41 +00:00 |
|
Paolo T
|
ca182d7024
|
Merge pull request #784 from tuscanhobbit/dev
Italian localization
|
2014-12-29 09:11:25 +01:00 |
|
Paolo Tacconi
|
bcbfc83376
|
Italian localization
|
2014-12-29 09:09:51 +01:00 |
|
friendica
|
3065650683
|
filter posts you author from unseen notifications - note there are other ways to do this, but involve some code complexity. This is easier to implement but may have a slight impact on the ping query performance. It's not horrid, just mentioning for the record.
|
2014-12-28 23:21:49 -08:00 |
|
RedMatrix
|
b7d2b9c1ef
|
Merge pull request #778 from pafcu/loginredir
Redirect to login page on failed login. Fixes #628
|
2014-12-29 09:29:23 +11:00 |
|
RedMatrix
|
7b98a6fcb0
|
Merge pull request #772 from pafcu/chanman
Some work on the channel manager
|
2014-12-29 09:29:12 +11:00 |
|
RedMatrix
|
6cdd5d1c48
|
Merge pull request #770 from pafcu/apps
More work on app icons
|
2014-12-29 09:29:00 +11:00 |
|