db490fbc8f
Merge branch 'master' into calendar
2012-01-05 21:02:58 +01:00
cb445deb5f
fix login check in ajax files
2012-01-05 21:02:11 +01:00
486694c2ec
fix js for repeating events
2012-01-05 20:54:44 +01:00
a01a3d412c
fix autodetection for the week of the month
2012-01-05 17:53:13 +01:00
edc9a150aa
fix editeventdialog for monthly repeating events with a specific weekday and weeknumber combination
2012-01-05 17:49:09 +01:00
d3a0c7354c
fix repeat rule for every weekday
2012-01-05 17:09:01 +01:00
a88cc91ad9
fix end for repeating events
2012-01-05 17:05:30 +01:00
e0a058c732
remove error output if symlink already exists. this can happen if a user removed config.php to trigger the setup wizzard
2012-01-03 17:23:50 +01:00
fe59015126
Merge branch 'master' into calendar
2012-01-03 13:51:55 +01:00
30857b24ea
Merge branch 'master' into calendar
2012-01-02 11:41:18 +01:00
5ccd26959f
remove unused js
2012-01-02 11:39:23 +01:00
e6739d230e
add function to detect always the timezone
2012-01-02 11:35:50 +01:00
fb4c3bd9ce
Merge git://gitorious.org/owncloud/owncloud into oc_image
2012-01-02 01:09:22 +01:00
536bc3d3c5
add jplayer source
2012-01-01 23:48:38 +01:00
853d1730c7
Merge git://gitorious.org/owncloud/owncloud into oc_image
2012-01-01 20:07:01 +01:00
64a24191a3
Fix return for empty Shared folder in opendir()
2012-01-01 14:04:16 -05:00
1b146b85d2
Removed redundant DB queries.
2011-12-31 01:34:22 +01:00
97471b5c2a
Thumbnails was overwriting default style so hover and active didn't work. Moved them to the 'a' element instead.
2011-12-30 23:39:31 +01:00
830a34a10a
Merge git://gitorious.org/owncloud/owncloud into tanghus_contacts
2011-12-30 21:09:42 +01:00
4793d25c57
Added license and waiver of conditions for jquery.inview.
...
CSS fix on contact list.
Query contacts from multiple address books.
2011-12-30 21:07:16 +01:00
31663cfff5
contacts entry duplication fix
2011-12-30 17:47:14 +01:00
96dc279e8e
Merge branch 'master' of gitorious.org:owncloud/owncloud
2011-12-30 17:06:48 +01:00
2ea20862fc
gallery fixes
2011-12-30 17:06:29 +01:00
3bb11db943
Merge branch 'master' into calendar
2011-12-29 19:16:33 +01:00
a70fbcea28
More missing js.
2011-12-28 10:31:45 +01:00
5a99310cdf
Merge git://gitorious.org/owncloud/owncloud into contact_thumbnails
...
Fixed some conflicts.
Conflicts:
apps/contacts/css/styles.css
apps/contacts/templates/index.php
2011-12-28 10:14:59 +01:00
16e4e6dcc3
Contacts: small merge cleanups
2011-12-27 22:44:52 +01:00
3e2e5196d2
Merge branch 'tanghus_remote_backup' of git://gitorious.org/~tanghus/owncloud/tanghus-owncloud
...
Conflicts:
apps/calendar/export.php
apps/contacts/index.php
2011-12-27 22:18:01 +01:00
5fd595c0bf
Calendar: add loading indicator
2011-12-27 21:50:31 +01:00
5bff1c8ad1
some coding style fixes for the pdf viewer
2011-12-27 14:19:07 +01:00
f009ede753
some styling changes for the pdf viewer
2011-12-27 14:09:22 +01:00
1efb4a0c61
remove debug messages in console
2011-12-27 13:41:22 +01:00
f7674d06d3
pdf viewer from Google Code-In program
2011-12-27 12:36:51 +01:00
ffa835c56f
fix the default setting for yearly repeating events
2011-12-26 19:59:15 +01:00
16c8f62658
Merge git://gitorious.org/owncloud/owncloud into contact_thumbnails
2011-12-26 13:27:53 +01:00
9eef57faed
make repeating events editable
2011-12-25 23:19:49 +01:00
8ee53708ae
use pre-decrement instead of post-decrement
2011-12-25 15:07:53 +01:00
5e6fa608eb
use OC_JSON::checkLoggedIn() in all ajax files
2011-12-22 16:31:01 +01:00
469e983a02
fix merge conflicts
2011-12-21 22:16:46 +01:00
1383cb51e7
removing and renaming albums
2011-12-21 21:55:52 +01:00
6a1a7fcd26
merged with stash
2011-12-21 18:40:43 +01:00
25fa9bf8ec
merged with stash
2011-12-21 18:37:17 +01:00
3c42867109
merged
2011-12-21 18:35:29 +01:00
d5e9c7d572
Gallery: fix calculation of folder thumbnail selection
2011-12-18 23:10:43 +01:00
fbad1da9e2
Contacts: check if PREF parameter is set before useing it
2011-12-18 23:10:43 +01:00
dff9585f64
Contacts: add missing property_options template var
2011-12-18 23:10:43 +01:00
ff346ad135
Calendar: small for loop fix
2011-12-18 23:10:43 +01:00
4eb36b0ecf
Calendar: refactor common ajax functions to OC_Calendar_App
2011-12-18 23:10:42 +01:00
9e50cecf27
Fix shared status for files inside a shared folder
2011-12-17 21:13:54 -05:00
092c41f375
Added missing files and tried to revert the wrong commit of app/contacts/js/interfaces.js
2011-12-17 20:38:52 +01:00
a7b048dc05
Added thumbnails to contact list. The contacts have a default thumbnail when the page is
...
first loaded. Once the page is loaded the thumbnails will be lazy-loaded to the contacts
viewable.
2011-12-17 20:05:54 +01:00
f6ed7a19be
Merge branch 'master' into calendar
2011-12-16 21:21:34 +01:00
f3e8776dc6
Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup
2011-12-16 17:43:06 +01:00
feeb0c742a
Misc. changes after review by bartv.
2011-12-16 17:42:07 +01:00
65214bed0c
make the sharing app return the corrrect result for is_writable on the shared folder
2011-12-16 17:31:31 +01:00
59ad0a6c9c
Update README
2011-12-13 10:39:31 +01:00
d55e689261
Added readme.tanghus
2011-12-11 21:17:10 +01:00
39430c837f
Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup
2011-12-11 16:29:53 +01:00
c7b7758816
Updating of contact list when activating/adding/deleting address books now works.
2011-12-11 16:26:00 +01:00
56f12cbfb1
delete unused files
2011-12-10 17:54:42 +01:00
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
b7c754cb32
Merge branch 'master' into calendar
2011-12-10 15:03:33 +01:00
1746cba249
Some small changes
2011-12-09 22:36:39 +01:00
a3cb04013e
Update OC_VObject
2011-12-09 21:56:03 +01:00
2e951c0ce5
Gallary: Fix alignment of album thumbnails
2011-12-09 21:44:13 +01:00
5cb10548b3
Resolved conflict
2011-12-09 15:28:51 +01:00
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
b3661adf02
Various fixes to multiple address books handling
2011-12-09 15:10:51 +01:00
ac8177d83e
Merge branch 'master' into calendar
2011-12-09 14:45:41 +01:00
bd68cee8cf
add resettimezone file for testing timezone detection
2011-12-09 14:36:43 +01:00
add48b2657
optimize timezone detection
2011-12-09 14:35:59 +01:00
eeaf539a44
Gallery: splitout model code
2011-12-08 20:05:12 +01:00
2103c331a0
Merge branch 'master' into calendar
2011-12-08 14:03:14 +01:00
d4546cdf37
bump version number to force db rebuild
2011-12-08 17:19:38 +07:00
a389d94e2b
Imageviewer: fix fancybox.png image url in fancybox css
2011-12-07 20:41:00 +01:00
546b7279a3
Contacts: Add "Preferred" before phone label for preferred numbers
2011-12-07 20:40:59 +01:00
1220edd4df
Contacts: Add direct link to details of a contact
2011-12-07 20:40:59 +01:00
36abf22a48
Contacts: Fix postname var spelling
2011-12-07 20:40:59 +01:00
7e990a8e5c
Contacts: refactor common ajax functions to OC_Contacts_App
2011-12-07 20:40:59 +01:00
247146f703
Contacts: refactor rendering of part.details template
2011-12-07 20:40:58 +01:00
c67ac46b6c
Use a proxy class to interface with Sabre_VObject classes
2011-12-07 20:40:58 +01:00
b9e6f5e42d
compliance with http://www.w3.org/community/unhosted/wiki/remoteStorage
2011-12-07 21:51:47 +07:00
830efdccac
Fixed adding, editing and deleting address books. One minor UI flaw remains.
2011-12-05 03:38:06 +01:00
2b48b733a3
Merge gitorious.org:~tanghus/owncloud/tanghus-owncloud into tanghus_remote_backup
2011-12-04 20:42:30 +01:00
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
361d4ac13b
fix merge conflicts
2011-12-03 17:25:17 +01:00
31846141b0
Contacts: make name editable again
2011-12-02 21:24:48 +01:00
58d1a3516a
Removed some debug statements.
...
Changed double quotes to single quotes.
2011-12-01 16:06:27 +01:00
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
0bbeb13e26
Calendar: Also check if the enddate is in the requested range for events
2011-11-30 21:13:26 +01:00
e5fdc6013a
Calendar: Use the default timezone that is set in lib/base.php
2011-11-30 21:13:04 +01:00
1d312cf070
Correct ldap check in dependencies_chk app
2011-11-25 23:43:24 +01:00
53ff85e2ad
Contacts: layout updates
2011-11-24 21:36:35 +01:00
6ce6cbf489
Contacts: better label for saving a property
2011-11-24 21:36:35 +01:00
9701145f83
Contacts: make type of phone property also multiselect in addproperty
2011-11-24 21:36:34 +01:00
4a57728ddd
Bookmarks: make a soft-requirement of php-curl
2011-11-24 21:36:34 +01:00
c945989a70
Total rewite of fix.
...
This now re-looks up the username and returns that for use.
Signed-off-by: Insanemal <insanemal@gmail.com>
2011-11-24 02:57:53 +01:00
8d092434ed
Adjusted the check user function to lowercase the return.
...
Signed-off-by: Insanemal <insanemal@gmail.com>
2011-11-24 02:57:53 +01:00
18d8dc4757
Added option to lowercase all usernames.
...
This resolves bug with Windows AD servers as LDAP server.
Windows is case insensitve on logon requests.
If users are stored camel case and logon using all lower it causes issues
as OwnCloud is configured to be case sensitive.
Signed-off-by: Insanemal <insanemal@gmail.com>
2011-11-24 02:57:53 +01:00
93502b3ef8
Music - Fix album and artist expand layout.
2011-11-24 02:55:51 +01:00
Georg Ehrke
Frank Karlitschek
Georg Ehrke
Thomas Tanghus
Robin Appelman
Michael Gapczynski
Bartek Przybylski
Bart Visscher
Michiel de Jong
Thomas Olsen
Brice Maron
Insanemal
Ignacio Daniel Rostagno