9832a0817d
Merge branch 'master' into fullcalendar
...
Conflicts:
apps/calendar/index.php
2011-10-24 22:40:22 +02:00
abf33d32b9
use existing correct info icons
2011-10-23 21:53:00 +02:00
4140a75a5e
corrected position of in-field labels a bit
2011-10-23 11:46:34 +02:00
c28504deca
textfield is now less obtrusive / opaque
2011-10-23 11:46:34 +02:00
93c18e9ae3
added all logo source SVGs
2011-10-23 11:46:34 +02:00
92fa6f0a48
Fix size calculation with css styling of tipsy popup
2011-10-21 22:08:55 +02:00
9ce15667d5
Merge branch 'calendar' of gitorious.org:owncloud/owncloud
2011-10-16 15:41:00 +02:00
5d09a5e37e
Add some color in error messages + img for hints
2011-10-16 13:12:11 +02:00
323a98adb7
Merge branch 'master' of gitorious.org:owncloud/owncloud into calendar
2011-10-15 17:16:00 +02:00
8d4039b678
Add loading message to image lightbox and tweak events
2011-10-14 23:51:51 +02:00
169dd7da77
Prevent category in jquery-ui on cal. to overflow
2011-10-14 19:09:07 +02:00
c0b011e714
Initialise hasOtherDB var when not true in installation
2011-10-14 18:04:50 +02:00
a01d10e57d
Merge branch 'master' into calendar
2011-10-13 21:59:16 +02:00
d7fa2a0f77
mimetype icon improvements
2011-10-13 16:33:39 +02:00
deaeab3d92
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-10-08 15:47:03 +01:00
bbd96fdd39
webkit searchfield bug fixed
2011-10-08 16:02:43 +02:00
71caa4a20c
added code and license links next to version number
2011-10-08 10:10:29 +02:00
538abb99f1
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-10-07 17:10:50 +01:00
1f562a2e83
fixes for the mimetype icons
2011-10-07 18:09:49 +02:00
65a491eabd
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-10-07 17:02:56 +01:00
ab5e26dd32
renamed icons
2011-10-07 16:30:37 +02:00
fa72f1c3cc
some icon corrections
2011-10-07 16:18:47 +02:00
0aaa1fb64e
added Silk icons by Mark James (CC-BY)
2011-10-07 16:05:39 +02:00
980a0893f0
Change colorselector to use border for selected color
2011-10-07 16:03:26 +02:00
e345fbd386
conflicts solved
2011-10-06 22:40:11 +02:00
3cc7212c82
Add icon for calendar color selector
2011-10-06 21:22:55 +02:00
7579fc7bc9
updated margins
2011-10-04 21:39:13 +02:00
2d9c3d75f3
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-10-04 19:17:23 +01:00
d1518f2901
updated calendar settings
2011-10-04 19:37:26 +02:00
33f24a42b8
redirect url fixed
2011-10-04 19:27:57 +02:00
314e84716b
changed shadow transparency to 50%
2011-10-04 18:58:38 +02:00
de21378291
fixed scrollbar issues
2011-10-04 18:54:07 +02:00
5c9b069fe5
Updated saving feedback to use loading.gif
2011-10-04 17:43:13 +01:00
b60f755f4f
fixed height of infield labels
2011-10-04 18:42:53 +02:00
e8c6252a4c
Move lostpassword to core dir
2011-10-03 20:44:01 +02:00
6d8985ceb2
added infield labels. readded fade in of login button. updated label on install page.
2011-10-03 14:41:55 +02:00
481a37fcf3
Show database only in advanced
2011-10-03 13:32:16 +02:00
d249e30714
Removed jquery ui files and added own cross image to css.
2011-10-03 01:44:49 +02:00
41dfce150d
problem with previous selected groups fixed
2011-10-02 15:38:07 +02:00
c943f48547
fixed link to password recovery. removed duplicated and unused code out of index.php.
2011-10-01 11:08:49 +02:00
21a88613a1
Merge branch 'lostpassword'
...
Conflicts:
core/templates/login.php
index.php
lib/util.php
2011-09-30 23:48:20 +02:00
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
e2251a4b38
show typed in username when log in has failed
2011-09-30 20:27:31 +02:00
0541728404
added text to localisation
2011-09-30 20:23:59 +02:00
5775421f78
user list has descriptions now
2011-09-30 19:35:25 +02:00
ccfa2dd24c
Error when only oc_remember_login cookie set fixed.
...
Filled username field when oc_username is set repaired.
Problems with "advanced settings" button in installation wizard fixed.
CSS improved - login and installation now looks more clean.
Request password link removed (email feature not implemented yet).
Database radio button bugs removed.
It is possible to have an empty database password, now ownCloud will support this "security issue".
Ignore Mac OS X ".DSstore" files.
Fade in/out of login button and remember checkbox removed due to some display errors.
2011-09-30 18:25:34 +02:00
516517dc3c
add margin
2011-09-29 15:55:18 +02:00
8d14c489eb
changed short description and styled unobtrusively
2011-09-28 17:14:37 +02:00
3fcc7b5949
Use correct name for function state for addScript/addStyle in js
2011-09-26 21:18:56 +02:00
950d4e1da4
Move lostpassword code to own app
2011-09-26 21:17:26 +02:00
Bart Visscher
Jan-Christoph Borchardt
Georg Ehrke
Brice Maron
Robin Appelman
Tom Needham
Marvin Thomas Rabe
Thomas Schmidt
Jan-Christoph Borchardt