Commit Graph

281 Commits

Author SHA1 Message Date
Bart Visscher e1b9b65e41 Use correct appid for lostpassword email preference 2011-12-18 23:10:43 +01:00
Georg Ehrke e5a3ab8aad Merge branch 'master' into fullcalendar 2011-11-12 15:09:37 +01:00
Robin Appelman 2c68aab198 Merge branch 'master' into newbutton 2011-11-04 03:00:03 +01:00
Brice Maron c7d1737d47 attempt to manage some special chars in file list
Added a jquery function to filter by attributes.
Add more logging in rename file
Use the new function to avoid errors
2011-11-01 22:35:13 +01:00
Bart Visscher 9832a0817d Merge branch 'master' into fullcalendar
Conflicts:
	apps/calendar/index.php
2011-10-24 22:40:22 +02:00
Jan-Christoph Borchardt abf33d32b9 use existing correct info icons 2011-10-23 21:53:00 +02:00
Jan-Christoph Borchardt 0c890a501c upgraded the new new button. Didn't and doesn't work in Firefox though 2011-10-23 21:51:56 +02:00
Jan-Christoph Borchardt 4140a75a5e corrected position of in-field labels a bit 2011-10-23 11:46:34 +02:00
Jan-Christoph Borchardt c28504deca textfield is now less obtrusive / opaque 2011-10-23 11:46:34 +02:00
Jan-Christoph Borchardt 93c18e9ae3 added all logo source SVGs 2011-10-23 11:46:34 +02:00
Robin Appelman d46288b0ab 'New' button, needs some css work 2011-10-23 11:40:40 +02:00
Bart Visscher 92fa6f0a48 Fix size calculation with css styling of tipsy popup 2011-10-21 22:08:55 +02:00
Georg Ehrke 9ce15667d5 Merge branch 'calendar' of gitorious.org:owncloud/owncloud 2011-10-16 15:41:00 +02:00
Brice Maron 5d09a5e37e Add some color in error messages + img for hints 2011-10-16 13:12:11 +02:00
Georg Ehrke 323a98adb7 Merge branch 'master' of gitorious.org:owncloud/owncloud into calendar 2011-10-15 17:16:00 +02:00
Brice Maron 8d4039b678 Add loading message to image lightbox and tweak events 2011-10-14 23:51:51 +02:00
Brice Maron 169dd7da77 Prevent category in jquery-ui on cal. to overflow 2011-10-14 19:09:07 +02:00
Brice Maron c0b011e714 Initialise hasOtherDB var when not true in installation 2011-10-14 18:04:50 +02:00
Georg Ehrke a01d10e57d Merge branch 'master' into calendar 2011-10-13 21:59:16 +02:00
Robin Appelman d7fa2a0f77 mimetype icon improvements 2011-10-13 16:33:39 +02:00
Tom Needham deaeab3d92 Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2011-10-08 15:47:03 +01:00
Marvin Thomas Rabe bbd96fdd39 webkit searchfield bug fixed 2011-10-08 16:02:43 +02:00
Jan-Christoph Borchardt 71caa4a20c added code and license links next to version number 2011-10-08 10:10:29 +02:00
Tom Needham 538abb99f1 Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2011-10-07 17:10:50 +01:00
Robin Appelman 1f562a2e83 fixes for the mimetype icons 2011-10-07 18:09:49 +02:00
Tom Needham 65a491eabd Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2011-10-07 17:02:56 +01:00
Jan-Christoph Borchardt ab5e26dd32 renamed icons 2011-10-07 16:30:37 +02:00
Jan-Christoph Borchardt fa72f1c3cc some icon corrections 2011-10-07 16:18:47 +02:00
Jan-Christoph Borchardt 0aaa1fb64e added Silk icons by Mark James (CC-BY) 2011-10-07 16:05:39 +02:00
Bart Visscher 980a0893f0 Change colorselector to use border for selected color 2011-10-07 16:03:26 +02:00
Marvin Thomas Rabe e345fbd386 conflicts solved 2011-10-06 22:40:11 +02:00
Bart Visscher 3cc7212c82 Add icon for calendar color selector 2011-10-06 21:22:55 +02:00
Marvin Thomas Rabe 7579fc7bc9 updated margins 2011-10-04 21:39:13 +02:00
Tom Needham 2d9c3d75f3 Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2011-10-04 19:17:23 +01:00
Marvin Thomas Rabe d1518f2901 updated calendar settings 2011-10-04 19:37:26 +02:00
Marvin Thomas Rabe 33f24a42b8 redirect url fixed 2011-10-04 19:27:57 +02:00
Marvin Thomas Rabe 314e84716b changed shadow transparency to 50% 2011-10-04 18:58:38 +02:00
Marvin Thomas Rabe de21378291 fixed scrollbar issues 2011-10-04 18:54:07 +02:00
Tom Needham 5c9b069fe5 Updated saving feedback to use loading.gif 2011-10-04 17:43:13 +01:00
Marvin Thomas Rabe b60f755f4f fixed height of infield labels 2011-10-04 18:42:53 +02:00
Bart Visscher e8c6252a4c Move lostpassword to core dir 2011-10-03 20:44:01 +02:00
Marvin Thomas Rabe 6d8985ceb2 added infield labels. readded fade in of login button. updated label on install page. 2011-10-03 14:41:55 +02:00
Marvin Thomas Rabe 481a37fcf3 Show database only in advanced 2011-10-03 13:32:16 +02:00
Marvin Thomas Rabe d249e30714 Removed jquery ui files and added own cross image to css. 2011-10-03 01:44:49 +02:00
Marvin Thomas Rabe 41dfce150d problem with previous selected groups fixed 2011-10-02 15:38:07 +02:00
Marvin Thomas Rabe c943f48547 fixed link to password recovery. removed duplicated and unused code out of index.php. 2011-10-01 11:08:49 +02:00
Bart Visscher 21a88613a1 Merge branch 'lostpassword'
Conflicts:
	core/templates/login.php
	index.php
	lib/util.php
2011-09-30 23:48:20 +02:00
Marvin Thomas Rabe ddd3599899 added jquery ui icons. otherwise its for casual users impossible to close the new event dialog in the calendar 2011-09-30 20:48:26 +02:00
Marvin Thomas Rabe e2251a4b38 show typed in username when log in has failed 2011-09-30 20:27:31 +02:00
Marvin Thomas Rabe 0541728404 added text to localisation 2011-09-30 20:23:59 +02:00