12326 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
friendica	a0052f0176	htmlpurifier update - compatibility issue with language library autoloader	2015-01-01 22:18:27 -08:00
friendica	545e47933a	Merge https://github.com/friendica/red into pending_merge	2015-01-01 21:49:01 -08:00
friendica	0286c5a35b	revup	2015-01-01 21:48:21 -08:00
RedMatrix	9d4c4efb51	Merge pull request #808 from f03el/master ... Swedish translation of frontpage + update from Transifex	2015-01-02 12:11:20 +11:00
RedMatrix	e7081db19b	Merge pull request #807 from pafcu/dblclicknewevent ... Double click on day in calendar creates new event starting that day	2015-01-02 12:11:08 +11:00
RedMatrix	817b54688e	Merge pull request #805 from pafcu/moretpl ... Move some HTML out to templates	2015-01-02 12:10:50 +11:00
RedMatrix	db811ca975	Merge pull request #804 from pafcu/areyousure ... Warn about unsaved settings using jquery.areyousure	2015-01-02 12:10:27 +11:00
RedMatrix	b54235234f	Merge pull request #803 from pafcu/checkboxes ... Checkboxyfy settings, style checkboxes as switches in redbasic	2015-01-02 12:10:08 +11:00
Erik Lundin	ffec1444e9	Update Swedish strings from Transifex	2015-01-02 00:56:28 +01:00
Erik Lundin	81c17cffdc	Swedish translation ... Original translation provided by RedSwede, redswede@redmatrix.nl. Proof-read and complemented by Erik Lundin.	2015-01-02 00:55:22 +01:00
Stefan Parviainen	1c2dc97a4a	Double click on day in calendar creats new event starting that day	2015-01-01 18:19:17 +01:00
Stefan Parviainen	85e76773a0	Use grouped select field for role selection	2015-01-01 15:54:16 +01:00
Stefan Parviainen	686b6ee118	Use grouped select field for timezone selection	2015-01-01 14:44:50 +01:00
Stefan Parviainen	ef94747e5e	Add field template for grouped selects	2015-01-01 14:36:17 +01:00
Stefan Parviainen	9557908875	Warn about unsaved settings using jquery.areyousure	2015-01-01 12:32:15 +01:00
Stefan Parviainen	ef6680f7ad	Possibly make switches work on IE8 (untested)	2015-01-01 11:33:00 +01:00
RedMatrix	93b9470487	Merge pull request #800 from pafcu/lang ... Language names	2015-01-01 21:23:48 +11:00
Stefan Parviainen	70f0019905	Checkboxify yesno-fields, but use CSS to show them as switches in Redbasic	2015-01-01 10:08:20 +01:00
pafcu	26069e6ca1	Merge pull request #802 from friendica/revert-792-cssrefactor ... Revert "Make redbasic css more modular"	2014-12-31 12:01:51 +02:00
pafcu	a00d88bbaf	Revert "Make redbasic css more modular"	2014-12-31 12:01:42 +02:00
pafcu	8fa27efa7e	Merge pull request #801 from friendica/revert-799-cssrefactor ... Revert "Move mod_profiles.css content back into style.css, since it cont...	2014-12-31 12:01:16 +02:00
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
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
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	9b2c71a5dc	Merge https://github.com/friendica/red into pending_merge	2014-12-29 23:57:33 -08:00