455 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Botanic	9af33d9156	Merge with quitta-gsoc-2013	2013-06-18 21:53:18 -07:00
Botanic	da7046e383	removed old file	2013-06-18 21:53:08 -07:00
Quitta	0fd279875f	register refactoring + small bug fixes that went unnoticed before	2013-06-19 06:50:08 +02:00
Quitta	fd471307bb	Merge with rc-botanic-webdev	2013-06-18 19:50:11 +02:00
Botanic	33a416cd62	add_user example	2013-06-18 10:48:54 -07:00
Botanic	041c1a6256	Merge with quitta-gsoc-2013	2013-06-18 10:22:43 -07:00
Quitta	e643b6274c	show error message + tooltips while registering	2013-06-18 16:27:57 +02:00
Quitta	540f1bf9b1	Damn its early in the morning :D Oh well! Register works with a callback function. shows which fields are correctly filled in and which not yet. It runs quite smooth. Off to bed now!	2013-06-18 07:22:24 +02:00
Quitta	4f5c75fd00	Changed register form + tried getting messages passed	2013-06-17 21:42:33 +02:00
Quitta	37b93d3099	Select automatically if it should load with no_visible_elements on or off + minor updates	2013-06-17 16:29:20 +02:00
Quitta	8e100fd011	Merge with rc-botanic-webdev	2013-06-17 16:03:24 +02:00
Botanic	105fe55ac6	fix top menu	2013-06-17 06:57:22 -07:00
Botanic	3925aa5c55	Merge with quitta-gsoc-2013	2013-06-17 06:41:45 -07:00
Quitta	fd762176c8	Trying to intigrate the home template in the inheritance structure of smarty	2013-06-17 15:39:55 +02:00
Quitta	df6330a40c	Merge with rc-botanic-webdev	2013-06-17 12:09:55 +02:00
Botanic	29d976f9f3	fixed js issue	2013-06-17 03:08:45 -07:00
Botanic	4fdee0b373	Merge with quitta-gsoc-2013	2013-06-17 02:24:41 -07:00
Botanic	a12890a376	reverted to tour	2013-06-17 02:24:18 -07:00
Quitta	2a68b01d7d	Tour seems to work here, not sure though	2013-06-17 11:03:31 +02:00
Quitta	6b14f646ca	Merge with rc-botanic-webdev	2013-06-17 09:29:37 +02:00
Botanic	09bf26dbd1	working on help tips	2013-06-17 00:25:04 -07:00
Botanic	7c8664925f	changed default skin to cerulean and constrained proportions in css	2013-06-16 23:28:58 -07:00
Botanic	0487fc0c53	changed index.php to correct file and created charisma index for backup	2013-06-16 23:13:38 -07:00
Botanic	9dd168220e	cleaned up formatting and added custom.css	2013-06-16 22:57:09 -07:00
Botanic	31a6e62cf5	changed to default will override with custom.css	2013-06-16 22:46:50 -07:00
Botanic	a7320cc1ee	updated the index pages with home register and login	2013-06-16 20:11:11 -07:00
Botanic	ffe60f1790	Merge with quitta-gsoc-2013	2013-06-16 00:59:10 -07:00
Quitta	89f187a04f	Fixed layout for register.tpl and login.tpl, it now uses also layout.tpl but with a parameter 'no_visible_elements' => 'TRUE'	2013-06-16 01:40:13 +02:00
Botanic	2180be89d7	added .tpl.php and removed extra files	2013-06-15 15:20:16 -07:00
Botanic	40fefe1df2	Merge with quitta-gsoc-2013	2013-06-15 15:16:57 -07:00
Quitta	76096267f9	Basic template integration with css	2013-06-16 00:13:13 +02:00
Quitta	b13b72f629	Merge with rc-botanic-webdev	2013-06-15 16:14:50 +02:00
Botanic	36e39d599b	fixed to proper path	2013-06-15 07:11:03 -07:00
Botanic	c2598c9673	changed to use .php not html	2013-06-15 07:08:38 -07:00
Botanic	c056507f25	added charisma	2013-06-15 07:01:11 -07:00
Quitta	f25442cbc9	Merge with rc-botanic-webdev	2013-06-13 23:43:58 +02:00
Botanic	621301aaf2	forgot global	2013-06-13 14:41:58 -07:00
Quitta	cbf5b8cbdc	Merge with rc-botanic-webdev	2013-06-13 23:36:07 +02:00
Botanic	943266e341	auto create folders	2013-06-13 14:33:23 -07:00
Quitta	a2df5f36a5	Merge with rc-botanic-webdev	2013-06-10 13:20:42 +02:00
Botanic	765a26a90e	latest changes to work on getting registration working	2013-06-10 04:17:55 -07:00
Botanic	ef8d9129c4	updated template for registration and setting up add_user functions	2013-06-07 04:05:28 -07:00
Botanic	47887e000c	added base drupal module and removed old phtml file	2013-06-06 23:07:47 -07:00
Botanic	6340a3da36	cleaned up templates and got languages working	2013-06-06 22:59:11 -07:00
Botanic	99967baefd	added in smarty, still need to finish making it load the correct template properly	2013-06-06 21:43:11 -07:00
Quitta	eecb35c42f	Merge with default	2013-06-06 23:55:04 +02:00
Quitta	2f072fb60b	Merge with rc-botanic-webdev	2013-06-06 23:54:41 +02:00
Quitta	932c23646e	initial branch creation	2013-06-06 23:53:34 +02:00
Botanic	7a8d47922f	updated files that were not merged	2013-06-06 03:38:24 -07:00
Botanic	c9811a9804	fixed thanks kervala	2013-06-06 01:28:12 -07:00