Georg Ehrke
|
f6ed7a19be
|
Merge branch 'master' into calendar
|
2011-12-16 21:21:34 +01:00 |
|
Thomas Tanghus
|
f3e8776dc6
|
Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup
|
2011-12-16 17:43:06 +01:00 |
|
Thomas Tanghus
|
feeb0c742a
|
Misc. changes after review by bartv.
|
2011-12-16 17:42:07 +01:00 |
|
Robin Appelman
|
dc641943d9
|
fix some display issues for readonly folders
|
2011-12-16 17:39:15 +01:00 |
|
Robin Appelman
|
65214bed0c
|
make the sharing app return the corrrect result for is_writable on the shared folder
|
2011-12-16 17:31:31 +01:00 |
|
Robin Appelman
|
a862fec9a3
|
make remember login token also dependent on password to protect against some brute force attacks on this token
|
2011-12-14 13:26:34 +01:00 |
|
Thomas Tanghus
|
59ad0a6c9c
|
Update README
|
2011-12-13 10:39:31 +01:00 |
|
Thomas Tanghus
|
ec12dec106
|
Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup
|
2011-12-13 10:35:10 +01:00 |
|
Georg Ehrke
|
1ab0adec46
|
Merge branch 'master' into calendar
|
2011-12-12 14:21:51 +01:00 |
|
Robin Appelman
|
5e711f37ca
|
make filesize parsing case insensitive
|
2011-12-11 23:34:27 +01:00 |
|
Robin Appelman
|
9c6d3a83fd
|
also update the data attribute holding the quota
|
2011-12-11 23:34:20 +01:00 |
|
Robin Appelman
|
ccd9b56609
|
after editing a user quota, set the value of the quota field to how the server parsed the input, not the user input
this way the user can see when an invalid input is given
|
2011-12-11 23:34:13 +01:00 |
|
Thomas Tanghus
|
d55e689261
|
Added readme.tanghus
|
2011-12-11 21:17:10 +01:00 |
|
Thomas Tanghus
|
39430c837f
|
Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup
|
2011-12-11 16:29:53 +01:00 |
|
Thomas Tanghus
|
c7b7758816
|
Updating of contact list when activating/adding/deleting address books now works.
|
2011-12-11 16:26:00 +01:00 |
|
Georg Ehrke
|
56f12cbfb1
|
delete unused files
|
2011-12-10 17:54:42 +01:00 |
|
Georg Ehrke
|
33caa64cce
|
check for php version is greater than 5.3.0 - we make extensive use of Date Time Libs
|
2011-12-10 15:11:41 +01:00 |
|
Georg Ehrke
|
b7c754cb32
|
Merge branch 'master' into calendar
|
2011-12-10 15:03:33 +01:00 |
|
Bart Visscher
|
1746cba249
|
Some small changes
|
2011-12-09 22:36:39 +01:00 |
|
Bart Visscher
|
a3cb04013e
|
Update OC_VObject
|
2011-12-09 21:56:03 +01:00 |
|
Bart Visscher
|
2e951c0ce5
|
Gallary: Fix alignment of album thumbnails
|
2011-12-09 21:44:13 +01:00 |
|
Thomas Tanghus
|
5cb10548b3
|
Resolved conflict
|
2011-12-09 15:28:51 +01:00 |
|
Thomas Tanghus
|
7aa8eb3427
|
Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup
Conflicts:
apps/contacts/ajax/deletebook.php
apps/contacts/index.php
|
2011-12-09 15:25:26 +01:00 |
|
Thomas Tanghus
|
b3661adf02
|
Various fixes to multiple address books handling
|
2011-12-09 15:10:51 +01:00 |
|
Georg Ehrke
|
ac8177d83e
|
Merge branch 'master' into calendar
|
2011-12-09 14:45:41 +01:00 |
|
Georg Ehrke
|
bd68cee8cf
|
add resettimezone file for testing timezone detection
|
2011-12-09 14:36:43 +01:00 |
|
Georg Ehrke
|
add48b2657
|
optimize timezone detection
|
2011-12-09 14:35:59 +01:00 |
|
Bart Visscher
|
eeaf539a44
|
Gallery: splitout model code
|
2011-12-08 20:05:12 +01:00 |
|
Georg Ehrke
|
2103c331a0
|
Merge branch 'master' into calendar
|
2011-12-08 14:03:14 +01:00 |
|
Michiel de Jong
|
d4546cdf37
|
bump version number to force db rebuild
|
2011-12-08 17:19:38 +07:00 |
|
Bart Visscher
|
9ba59aee36
|
Sort apps on name and enabled status
|
2011-12-07 20:41:00 +01:00 |
|
Bart Visscher
|
0342b5fc43
|
Fix filename of log icon
|
2011-12-07 20:41:00 +01:00 |
|
Bart Visscher
|
a389d94e2b
|
Imageviewer: fix fancybox.png image url in fancybox css
|
2011-12-07 20:41:00 +01:00 |
|
Bart Visscher
|
546b7279a3
|
Contacts: Add "Preferred" before phone label for preferred numbers
|
2011-12-07 20:40:59 +01:00 |
|
Bart Visscher
|
1220edd4df
|
Contacts: Add direct link to details of a contact
|
2011-12-07 20:40:59 +01:00 |
|
Bart Visscher
|
36abf22a48
|
Contacts: Fix postname var spelling
|
2011-12-07 20:40:59 +01:00 |
|
Bart Visscher
|
7e990a8e5c
|
Contacts: refactor common ajax functions to OC_Contacts_App
|
2011-12-07 20:40:59 +01:00 |
|
Bart Visscher
|
247146f703
|
Contacts: refactor rendering of part.details template
|
2011-12-07 20:40:58 +01:00 |
|
Bart Visscher
|
c67ac46b6c
|
Use a proxy class to interface with Sabre_VObject classes
|
2011-12-07 20:40:58 +01:00 |
|
Michiel de Jong
|
b9e6f5e42d
|
compliance with http://www.w3.org/community/unhosted/wiki/remoteStorage
|
2011-12-07 21:51:47 +07:00 |
|
Robin Appelman
|
a0548a416a
|
Don't trigger file action when renaming, stupid fix for stupid firefox behaviour
|
2011-12-05 23:52:14 +01:00 |
|
Thomas Tanghus
|
830efdccac
|
Fixed adding, editing and deleting address books. One minor UI flaw remains.
|
2011-12-05 03:38:06 +01:00 |
|
Thomas Tanghus
|
2b48b733a3
|
Merge gitorious.org:~tanghus/owncloud/tanghus-owncloud into tanghus_remote_backup
|
2011-12-04 20:42:30 +01:00 |
|
Thomas Tanghus
|
95ae0f23f1
|
Added UI for selecting/editing address books.
Export, CardDAV link and activation/deactivation of address books done.
|
2011-12-04 20:25:46 +01:00 |
|
Georg Ehrke
|
361d4ac13b
|
fix merge conflicts
|
2011-12-03 17:25:17 +01:00 |
|
Bart Visscher
|
31846141b0
|
Contacts: make name editable again
|
2011-12-02 21:24:48 +01:00 |
|
Thomas Tanghus
|
58d1a3516a
|
Removed some debug statements.
Changed double quotes to single quotes.
|
2011-12-01 16:06:27 +01:00 |
|
Thomas Olsen
|
21d613cbc6
|
Added export.php for contacts app. Works the same way as the one in the calendar app, except there is no UI for it.
Fixed indentation in /index.php
|
2011-12-01 02:02:45 +01:00 |
|
Bart Visscher
|
0bbeb13e26
|
Calendar: Also check if the enddate is in the requested range for events
|
2011-11-30 21:13:26 +01:00 |
|
Bart Visscher
|
e5fdc6013a
|
Calendar: Use the default timezone that is set in lib/base.php
|
2011-11-30 21:13:04 +01:00 |
|